summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2011-12-17 10:20:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-18 02:22:29 (GMT)
commit82889295e76200714d76e0f7beb07b6b9e3b5a88 (patch)
tree87524b426e19ded411d2c42b44a5b49a24ace97e /diff.h
parent0041f09de6e62efc31c860487f04e8b08bce68c8 (diff)
downloadgit-82889295e76200714d76e0f7beb07b6b9e3b5a88.zip
git-82889295e76200714d76e0f7beb07b6b9e3b5a88.tar.gz
git-82889295e76200714d76e0f7beb07b6b9e3b5a88.tar.bz2
pass struct commit to diff_tree_combined_merge()
Instead of passing the hash of a commit and then searching that same commit in the single caller, simply pass the commit directly. Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index 96085cb..ae71f4c 100644
--- a/diff.h
+++ b/diff.h
@@ -13,6 +13,7 @@ struct strbuf;
struct diff_filespec;
struct userdiff_driver;
struct sha1_array;
+struct commit;
typedef void (*change_fn_t)(struct diff_options *options,
unsigned old_mode, unsigned new_mode,
@@ -198,7 +199,7 @@ extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
extern void diff_tree_combined(const unsigned char *sha1, const struct sha1_array *parents, int dense, struct rev_info *rev);
-extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
+extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);