pass struct commit to diff_tree_combined_merge()

René Scharfe · gitster · commit 82889295e762 · 2011-12-17T18:22:29.000-08:00
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 &lt;rene.scharfe@lsrfire.ath.cx&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/combine-diff.c b/combine-diff.c
@@ -1196,17 +1196,16 @@ void diff_tree_combined(const unsigned char *sha1,
 	}
 }
 
-void diff_tree_combined_merge(const unsigned char *sha1,
-			     int dense, struct rev_info *rev)
+void diff_tree_combined_merge(const struct commit *commit, int dense,
+			      struct rev_info *rev)
 {
-	struct commit *commit = lookup_commit(sha1);
 	struct commit_list *parent = commit->parents;
 	struct sha1_array parents = SHA1_ARRAY_INIT;
 
 	while (parent) {
 		sha1_array_append(&parents, parent->item->object.sha1);
 		parent = parent->next;
 	}
-	diff_tree_combined(sha1, &parents, dense, rev);
+	diff_tree_combined(commit->object.sha1, &parents, dense, rev);
 	sha1_array_clear(&parents);
 }
diff --git 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);
 
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1196,17 +1196,16 @@ void diff_tree_combined(const unsigned char *sha1,`
`1196`	`1196`	`}`
`1197`	`1197`	`}`
`1198`	`1198`
`1199`		`-void diff_tree_combined_merge(const unsigned char *sha1,`
`1200`		`- int dense, struct rev_info *rev)`
	`1199`	`+void diff_tree_combined_merge(const struct commit *commit, int dense,`
	`1200`	`+ struct rev_info *rev)`
`1201`	`1201`	`{`
`1202`		`- struct commit *commit = lookup_commit(sha1);`
`1203`	`1202`	`struct commit_list *parent = commit->parents;`
`1204`	`1203`	`struct sha1_array parents = SHA1_ARRAY_INIT;`
`1205`	`1204`
`1206`	`1205`	`while (parent) {`
`1207`	`1206`	`sha1_array_append(&parents, parent->item->object.sha1);`
`1208`	`1207`	`parent = parent->next;`
`1209`	`1208`	`}`
`1210`		`- diff_tree_combined(sha1, &parents, dense, rev);`
	`1209`	`+ diff_tree_combined(commit->object.sha1, &parents, dense, rev);`
`1211`	`1210`	`sha1_array_clear(&parents);`
`1212`	`1211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -599,9 +599,7 @@ int log_tree_diff_flush(struct rev_info *opt)`
`599`	`599`
`600`	`600`	`static int do_diff_combined(struct rev_info opt, struct commit commit)`
`601`	`601`	`{`
`602`		`- unsigned const char *sha1 = commit->object.sha1;`
`603`		`-`
`604`		`- diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);`
	`602`	`+ diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);`
`605`	`603`	`return !opt->loginfo;`
`606`	`604`	`}`
`607`	`605`