merge-recursive: check for directory level conflicts
[git/git-svn.git] / patch-ids.h
blobbec0f727a7bc4345e524ff04d9569c68fabd2209
1 #ifndef PATCH_IDS_H
2 #define PATCH_IDS_H
4 struct patch_id {
5 struct hashmap_entry ent;
6 struct object_id patch_id;
7 struct commit *commit;
8 };
10 struct patch_ids {
11 struct hashmap patches;
12 struct diff_options diffopts;
15 int commit_patch_id(struct commit *commit, struct diff_options *options,
16 struct object_id *oid, int);
17 int init_patch_ids(struct patch_ids *);
18 int free_patch_ids(struct patch_ids *);
19 struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);
20 struct patch_id *has_commit_patch_id(struct commit *, struct patch_ids *);
22 #endif /* PATCH_IDS_H */