combine-diff: convert diff_tree_combined to struct object_id
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
bd25f28876
commit
b9acf54dbd
2
diff.h
2
diff.h
@ -236,7 +236,7 @@ struct combine_diff_path {
|
||||
extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
|
||||
int dense, struct rev_info *);
|
||||
|
||||
extern void diff_tree_combined(const unsigned char *sha1, const struct oid_array *parents, int dense, struct rev_info *rev);
|
||||
extern void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
|
||||
|
||||
extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user