aboutsummaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-15 00:03:43 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-15 00:03:43 -0800
commitb43174ebf12299ba3da3007c1e759613af153f6c (patch)
tree70768ba5fa6f9d8afda3486d57ff916a62c8530d /pretty.c
parent472e4744ad28dfa568a1a46e5268aa2babb7243b (diff)
parent7fcda9201e192413c2e63fe35ce6664dbc81705d (diff)
downloadgit-b43174ebf12299ba3da3007c1e759613af153f6c.tar.gz
git-b43174ebf12299ba3da3007c1e759613af153f6c.tar.xz
Merge branch 'tr/abbrev-commit-no-ellipses'
* tr/abbrev-commit-no-ellipses: log: do not print ellipses with --abbrev-commit
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/pretty.c b/pretty.c
index cc460b569..428fbb61a 100644
--- a/pretty.c
+++ b/pretty.c
@@ -210,15 +210,13 @@ static void add_merge_info(enum cmit_fmt fmt, struct strbuf *sb,
while (parent) {
struct commit *p = parent->item;
const char *hex = NULL;
- const char *dots;
if (abbrev)
hex = find_unique_abbrev(p->object.sha1, abbrev);
if (!hex)
hex = sha1_to_hex(p->object.sha1);
- dots = (abbrev && strlen(hex) != 40) ? "..." : "";
parent = parent->next;
- strbuf_addf(sb, " %s%s", hex, dots);
+ strbuf_addf(sb, " %s", hex);
}
strbuf_addch(sb, '\n');
}