diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-25 02:37:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-28 00:09:38 -0800 |
| commit | b2d4c56f2f370481c80e478ac323ebb13eece807 (patch) | |
| tree | b1508998590df1ee3af0cf0c10056db57c67dd51 /diff-tree.c | |
| parent | d50125085a6c4775a77d45a6d294d723f6de8869 (diff) | |
| download | git-b2d4c56f2f370481c80e478ac323ebb13eece807.tar.gz | |
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>
Diffstat (limited to 'diff-tree.c')
| -rw-r--r-- | diff-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-tree.c b/diff-tree.c index efa2b9476e..efa17d14a4 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -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; } |