diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-05-25 22:43:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 22:43:05 -0700 |
| commit | 8366b7baae7e5a33f609b07c939a3571653a2314 (patch) | |
| tree | c4ba1932ba5b3dbd15cee76101160a1de15a9b4e /builtin-fast-export.c | |
| parent | Ignore no-op changes in paranoid update hook (diff) | |
| parent | Merge branch 'jk/maint-send-email-compose' into maint (diff) | |
| download | tgif-8366b7baae7e5a33f609b07c939a3571653a2314.tar.xz | |
Merge branch 'maint'
* maint:
builtin-fast-export: Only output a single parent per line
Release Notes for 1.5.5.2
Conflicts:
RelNotes
Diffstat (limited to 'builtin-fast-export.c')
| -rwxr-xr-x | builtin-fast-export.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/builtin-fast-export.c b/builtin-fast-export.c index ff759cc578..1dfc01e8f0 100755 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -204,14 +204,10 @@ static void handle_commit(struct commit *commit, struct rev_info *rev) continue; if (i == 0) printf("from :%d\n", mark); - else if (i == 1) - printf("merge :%d", mark); else - printf(" :%d", mark); + printf("merge :%d\n", mark); i++; } - if (i > 1) - printf("\n"); log_tree_diff_flush(rev); rev->diffopt.output_format = saved_output_format; |