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 2ba43ae84b20f993ba175f728297cf5360066872..ccfa905e995088f57550aa4717561c9d428911fe 100644 (file)
--- 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 {
        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 {
                if (parse_commit(commit) != 0)
                        printf("(bad commit)\n");
                else {