summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-23 07:36:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-28 00:16:40 (GMT)
commit9926ba98a4a77e012ea9121abee42608fe1564b6 (patch)
treebcb37631fc65f96f7e095ded96860411909f17d8 /merge-recursive.c
parented93b449c5e13a70beb7f0ae02fb6da95e42a805 (diff)
downloadgit-9926ba98a4a77e012ea9121abee42608fe1564b6.zip
git-9926ba98a4a77e012ea9121abee42608fe1564b6.tar.gz
git-9926ba98a4a77e012ea9121abee42608fe1564b6.tar.bz2
merge-recursive: use abbreviated commit object name.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 2ba43ae..ccfa905 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 {