Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 1 | #ifndef RESOLVE_UNDO_H |
| 2 | #define RESOLVE_UNDO_H |
| 3 | |
Elijah Newren | b7b189c | 2023-04-11 00:42:03 -0700 | [diff] [blame] | 4 | struct cache_entry; |
| 5 | struct index_state; |
| 6 | struct pathspec; |
| 7 | struct string_list; |
| 8 | |
Patrick Steinhardt | 8a676bd | 2024-06-14 08:50:32 +0200 | [diff] [blame] | 9 | #include "hash.h" |
Elijah Newren | ef3ca95 | 2018-08-15 10:54:05 -0700 | [diff] [blame] | 10 | |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 11 | struct resolve_undo_info { |
| 12 | unsigned int mode[3]; |
brian m. carlson | 5ac913c | 2018-03-12 02:27:25 +0000 | [diff] [blame] | 13 | struct object_id oid[3]; |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 14 | }; |
| 15 | |
Denton Liu | 5545442 | 2019-04-29 04:28:14 -0400 | [diff] [blame] | 16 | void record_resolve_undo(struct index_state *, struct cache_entry *); |
| 17 | void resolve_undo_write(struct strbuf *, struct string_list *); |
| 18 | struct string_list *resolve_undo_read(const char *, unsigned long); |
| 19 | void resolve_undo_clear_index(struct index_state *); |
Junio C Hamano | 5bdedac | 2023-07-31 15:44:09 -0700 | [diff] [blame] | 20 | int unmerge_index_entry(struct index_state *, const char *, struct resolve_undo_info *, unsigned); |
| 21 | void unmerge_index(struct index_state *, const struct pathspec *, unsigned); |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 22 | |
| 23 | #endif |