mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
commit.c: "Merge" fix in pretty_print_commit.
Earlier, f2d4227530
commit broke Merge:
lines for unabbreviated case. Do not emit extra dots if we do not
abbreviate.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
97f58b785d
commit
6bfb27a0c5
10
commit.c
10
commit.c
|
@ -438,13 +438,13 @@ static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *com
|
||||||
|
|
||||||
while (parent) {
|
while (parent) {
|
||||||
struct commit *p = parent->item;
|
struct commit *p = parent->item;
|
||||||
|
const char *hex = abbrev
|
||||||
|
? find_unique_abbrev(p->object.sha1, abbrev)
|
||||||
|
: sha1_to_hex(p->object.sha1);
|
||||||
|
char *dots = (abbrev && strlen(hex) != 40) ? "..." : "";
|
||||||
parent = parent->next;
|
parent = parent->next;
|
||||||
|
|
||||||
offset += sprintf(buf + offset,
|
offset += sprintf(buf + offset, " %s%s", hex, dots);
|
||||||
abbrev ? " %s..." : " %s",
|
|
||||||
abbrev
|
|
||||||
? find_unique_abbrev(p->object.sha1, abbrev)
|
|
||||||
: sha1_to_hex(p->object.sha1));
|
|
||||||
}
|
}
|
||||||
buf[offset++] = '\n';
|
buf[offset++] = '\n';
|
||||||
return offset;
|
return offset;
|
||||||
|
|
Loading…
Reference in a new issue