mirror of
https://github.com/git/git.git
synced 2024-05-19 14:06:37 +02:00
b7b189cd5a
We had a handful of headers including cache.h that didn't need to anymore. Drop those includes and replace them with includes of smaller files, or forward declarations. However, note that two .c files now need to directly include cache.h, though they should have been including it all along given they are directly using structs defined in it. Signed-off-by: Elijah Newren <newren@gmail.com> Acked-by: Calvin Wan <calvinwan@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
25 lines
658 B
C
25 lines
658 B
C
#ifndef RESOLVE_UNDO_H
|
|
#define RESOLVE_UNDO_H
|
|
|
|
struct cache_entry;
|
|
struct index_state;
|
|
struct pathspec;
|
|
struct string_list;
|
|
|
|
#include "hash.h"
|
|
|
|
struct resolve_undo_info {
|
|
unsigned int mode[3];
|
|
struct object_id oid[3];
|
|
};
|
|
|
|
void record_resolve_undo(struct index_state *, struct cache_entry *);
|
|
void resolve_undo_write(struct strbuf *, struct string_list *);
|
|
struct string_list *resolve_undo_read(const char *, unsigned long);
|
|
void resolve_undo_clear_index(struct index_state *);
|
|
int unmerge_index_entry_at(struct index_state *, int);
|
|
void unmerge_index(struct index_state *, const struct pathspec *);
|
|
void unmerge_marked_index(struct index_state *);
|
|
|
|
#endif
|