undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pretty_print_commit: honor grafts.

Browse Source 
When displaying Merge: lines, we used to take the real commit
parents from the commit objects.  Use the parsed parents from
the commit object instead, so that we honor fake parent
information from info/grafts.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-01-27 02:17:19 -08:00
parent 3815f423ae
commit f2d4227530
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
commit.c
View File

@ -426,33 +426,27 @@ static int is_empty_line(const char *line, int len)
return !len; return !len;
} }
static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int parents, int abbrev) static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
{ {
int offset = 0; struct commit_list *parent = commit->parents;
unsigned char sha1[20]; int offset;
if (fmt == CMIT_FMT_ONELINE) if ((fmt == CMIT_FMT_ONELINE) || !parent || !parent->next)
return offset; return 0;
switch (parents) {
case 1: offset = sprintf(buf, "Merge:");
break;
case 2: while (parent) {
/* Go back to the previous line: 40 characters of previous parent, and one '\n' */ struct commit *p = parent->item;
if (abbrev && !get_sha1_hex(line-41, sha1)) parent = parent->next;
offset = sprintf(buf, "Merge: %s\n",
find_unique_abbrev(sha1, abbrev)); offset += sprintf(buf + offset,
else abbrev ? " %s..." : " %s",
offset = sprintf(buf, "Merge: %.40s\n", line-41); abbrev
/* Fallthrough */ ? find_unique_abbrev(p->object.sha1, abbrev)
default: : sha1_to_hex(p->object.sha1));
/* Replace the previous '\n' with a space */
buf[offset-1] = ' ';
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);
} }
buf[offset++] = '\n';
return offset; return offset;
} }
@ -460,8 +454,8 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
{ {
int hdr = 1, body = 0; int hdr = 1, body = 0;
unsigned long offset = 0; unsigned long offset = 0;
int parents = 0;
int indent = (fmt == CMIT_FMT_ONELINE) ? 0 : 4; int indent = (fmt == CMIT_FMT_ONELINE) ? 0 : 4;
int parents_shown = 0;
const char *msg = commit->buffer; const char *msg = commit->buffer;
for (;;) { for (;;) {
@ -498,9 +492,15 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
if (!memcmp(line, "parent ", 7)) { if (!memcmp(line, "parent ", 7)) {
if (linelen != 48) if (linelen != 48)
die("bad parent line in commit"); die("bad parent line in commit");
offset += add_parent_info(fmt, buf + offset, line, ++parents, abbrev); continue;
} }
if (!parents_shown) {
offset += add_merge_info(fmt, buf + offset,
commit, abbrev);
parents_shown = 1;
continue;
}
/* /*
* MEDIUM == DEFAULT shows only author with dates. * MEDIUM == DEFAULT shows only author with dates.
* FULL shows both authors but not dates. * FULL shows both authors but not dates.