From: Junio C Hamano <junkio@cox.net>
Date: Mon, 23 Oct 2006 07:36:22 +0000 (-0700)
Subject: merge-recursive: use abbreviated commit object name.
X-Git-Tag: v1.4.4-rc1~4^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9926ba98a4a77e012ea9121abee42608fe1564b6;p=git.git

merge-recursive: use abbreviated commit object name.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index 2ba43ae84..ccfa905e9 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -98,7 +98,7 @@ static void output_commit_title(struct commit *commit)
 	if (commit->util)
 		printf("virtual %s\n", (char *)commit->util);
 	else {
-		printf("%s ", sha1_to_hex(commit->object.sha1));
+		printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
 		if (parse_commit(commit) != 0)
 			printf("(bad commit)\n");
 		else {