git-p4: add tests demonstrating spec overlay ambiguities

diff --git a/log-tree.c b/log-tree.c
index e7694a3a4ca2e6de7fe8f3b5458eb2b65591373a..319bd31e2bd67f5ee38d6b887da2ca1b8e9ac742 100644 (file)
--- 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;
 }