aboutsummaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-25 02:37:40 -0800
committerJunio C Hamano <junkio@cox.net>2006-01-28 00:09:38 -0800
commitb2d4c56f2f370481c80e478ac323ebb13eece807 (patch)
treeb1508998590df1ee3af0cf0c10056db57c67dd51 /commit.c
parentd50125085a6c4775a77d45a6d294d723f6de8869 (diff)
downloadgit-b2d4c56f2f370481c80e478ac323ebb13eece807.tar.gz
git-b2d4c56f2f370481c80e478ac323ebb13eece807.tar.xz
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 'commit.c')
-rw-r--r--commit.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/commit.c b/commit.c
index b8bf35e86..244104f93 100644
--- a/commit.c
+++ b/commit.c
@@ -426,9 +426,10 @@ static int is_empty_line(const char *line, int len)
return !len;
}
-static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int parents)
+static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int parents, int abbrev)
{
int offset = 0;
+ unsigned char sha1[20];
if (fmt == CMIT_FMT_ONELINE)
return offset;
@@ -437,17 +438,25 @@ static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int p
break;
case 2:
/* Go back to the previous line: 40 characters of previous parent, and one '\n' */
- offset = sprintf(buf, "Merge: %.40s\n", line-41);
+ if (abbrev && !get_sha1_hex(line-41, sha1))
+ offset = sprintf(buf, "Merge: %s\n",
+ find_unique_abbrev(sha1, abbrev));
+ else
+ offset = sprintf(buf, "Merge: %.40s\n", line-41);
/* Fallthrough */
default:
/* Replace the previous '\n' with a space */
buf[offset-1] = ' ';
- offset += sprintf(buf + offset, "%.40s\n", line+7);
+ if (abbrev && !get_sha1_hex(line+7, sha1))
+ offset += sprintf(buf + offset, "%s\n",
+ find_unique_abbrev(sha1, abbrev));
+ else
+ offset += sprintf(buf + offset, "%.40s\n", line+7);
}
return offset;
}
-unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space)
+unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space, int abbrev)
{
int hdr = 1, body = 0;
unsigned long offset = 0;
@@ -488,7 +497,7 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned l
if (!memcmp(line, "parent ", 7)) {
if (linelen != 48)
die("bad parent line in commit");
- offset += add_parent_info(fmt, buf + offset, line, ++parents);
+ offset += add_parent_info(fmt, buf + offset, line, ++parents, abbrev);
}
/*