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

Fix "git-log --parents" breakage post v1.3.0

Browse Source 
Post 1.3.0 "git log" forgets to list parent commits on the first line
when --parents is given.  git-cvsserver relied on it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds 2006-05-03 07:59:00 -07:00 committed by Junio C Hamano
parent 060729dd7e
commit c8c893c62b
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
log-tree.c
View File

@ -3,6 +3,15 @@
#include "commit.h" #include "commit.h"
#include "log-tree.h" #include "log-tree.h"
static void show_parents(struct commit *commit, int abbrev)
{
struct commit_list *p;
for (p = commit->parents; p ; p = p->next) {
struct commit *parent = p->item;
printf(" %s", diff_unique_abbrev(parent->object.sha1, abbrev));
}
}
void show_log(struct rev_info *opt, struct log_info *log, const char *sep) void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
{ {
static char this_header[16384]; static char this_header[16384];
@ -14,7 +23,10 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
opt->loginfo = NULL; opt->loginfo = NULL;
if (!opt->verbose_header) { if (!opt->verbose_header) {
puts(sha1_to_hex(commit->object.sha1)); fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
if (opt->parents)
show_parents(commit, abbrev_commit);
putchar('\n');
return; return;
} }
@ -40,6 +52,8 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
printf("%s%s", printf("%s%s",
opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ", opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
diff_unique_abbrev(commit->object.sha1, abbrev_commit)); diff_unique_abbrev(commit->object.sha1, abbrev_commit));
if (opt->parents)
show_parents(commit, abbrev_commit);
if (parent) if (parent)
printf(" (from %s)", diff_unique_abbrev(parent->object.sha1, abbrev_commit)); printf(" (from %s)", diff_unique_abbrev(parent->object.sha1, abbrev_commit));
putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n'); putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');