summaryrefslogtreecommitdiff
path: root/log-tree.c
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 /log-tree.c
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 'log-tree.c')
-rw-r--r--log-tree.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/log-tree.c b/log-tree.c
index e7694a3..319bd31 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -599,9 +599,7 @@ int log_tree_diff_flush(struct rev_info *opt)
static int do_diff_combined(struct rev_info *opt, struct commit *commit)
{
- unsigned const char *sha1 = commit->object.sha1;
-
- diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
+ diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
return !opt->loginfo;
}