blob: 89a32272620f2b9e93102039204c72c7886306b3 [file] [log] [blame]
Junio C Hamanocfc57892009-12-25 00:30:51 -08001#ifndef RESOLVE_UNDO_H
2#define RESOLVE_UNDO_H
3
Elijah Newrenb7b189c2023-04-11 00:42:03 -07004struct cache_entry;
5struct index_state;
6struct pathspec;
7struct string_list;
8
Patrick Steinhardt8a676bd2024-06-14 08:50:32 +02009#include "hash.h"
Elijah Newrenef3ca952018-08-15 10:54:05 -070010
Junio C Hamanocfc57892009-12-25 00:30:51 -080011struct resolve_undo_info {
12 unsigned int mode[3];
brian m. carlson5ac913c2018-03-12 02:27:25 +000013 struct object_id oid[3];
Junio C Hamanocfc57892009-12-25 00:30:51 -080014};
15
Denton Liu55454422019-04-29 04:28:14 -040016void record_resolve_undo(struct index_state *, struct cache_entry *);
17void resolve_undo_write(struct strbuf *, struct string_list *);
18struct string_list *resolve_undo_read(const char *, unsigned long);
19void resolve_undo_clear_index(struct index_state *);
Junio C Hamano5bdedac2023-07-31 15:44:09 -070020int unmerge_index_entry(struct index_state *, const char *, struct resolve_undo_info *, unsigned);
21void unmerge_index(struct index_state *, const struct pathspec *, unsigned);
Junio C Hamanocfc57892009-12-25 00:30:51 -080022
23#endif