diff-tree: abbreviate merge parent object names with --abbrev --pretty.

When --abbrev is in effect, abbreviate the merge parent names
in prettyprinted output.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-01-25 02:37:40 -08:00
parent d50125085a
commit b2d4c56f2f
5 changed files with 18 additions and 9 deletions

View File

@ -84,7 +84,7 @@ static const char *generate_header(const unsigned char *commit_sha1,
diff_unique_abbrev(parent_sha1, abbrev) : "root");
offset += pretty_print_commit(commit_format, msg, len,
this_header + offset,
sizeof(this_header) - offset);
sizeof(this_header) - offset, abbrev);
return this_header;
}