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

Merge branch 'maint-1.5.4' into maint

Browse Source 
* maint-1.5.4:
  builtin-fast-export: Only output a single parent per line
This commit is contained in:
Junio C Hamano 2008-05-25 22:34:05 -07:00
commit 6abf189506
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-fast-export.c
View File

@ -204,14 +204,10 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
continue; continue;
if (i == 0) if (i == 0)
printf("from :%d\n", mark); printf("from :%d\n", mark);
else if (i == 1)
printf("merge :%d", mark);
else else
printf(" :%d", mark); printf("merge :%d\n", mark);
i++; i++;
} }
if (i > 1)
printf("\n");
log_tree_diff_flush(rev); log_tree_diff_flush(rev);
rev->diffopt.output_format = saved_output_format; rev->diffopt.output_format = saved_output_format;