diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-23 09:36:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-28 02:16:40 +0200 |
| commit | 9926ba98a4a77e012ea9121abee42608fe1564b6 (patch) | |
| tree | bcb37631fc65f96f7e095ded96860411909f17d8 /merge-recursive.c | |
| parent | merge: loosen overcautious "working file will be lost" check. (diff) | |
| download | git-9926ba98a4a77e012ea9121abee42608fe1564b6.tar.xz git-9926ba98a4a77e012ea9121abee42608fe1564b6.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 2ba43ae84b..ccfa905e99 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 { |