X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=log-tree.c;h=cea8756866e5ab86f09f3fadb0fe33e92b04b4bd;hb=471dcfdbb23ad423168d928335bc36217f9e311d;hp=3cf569ce7eccc07cd69cf659df0814724647c5a2;hpb=d041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb;p=git.git

diff --git a/log-tree.c b/log-tree.c
index 3cf569ce7..cea875686 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -120,9 +120,9 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in
 		type = DECORATION_REF_REMOTE;
 	else if (!prefixcmp(refname, "refs/tags/"))
 		type = DECORATION_REF_TAG;
-	else if (!prefixcmp(refname, "refs/stash"))
+	else if (!strcmp(refname, "refs/stash"))
 		type = DECORATION_REF_STASH;
-	else if (!prefixcmp(refname, "HEAD"))
+	else if (!strcmp(refname, "HEAD"))
 		type = DECORATION_REF_HEAD;
 
 	if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS)
@@ -728,9 +728,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;
 }