summaryrefslogtreecommitdiff
path: root/builtin-fast-export.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-25 22:34:05 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-25 22:34:05 -0700
commit6abf189506712a0e3c5ea796d136177b8f24ca22 (patch)
tree1a1285d27f5e2c7a360577982ffb9dba437ab5b4 /builtin-fast-export.c
parent20bd3b072f93a8a8a4151a08513cfc3622ac963d (diff)
parent5070b49e529e2df30ec2e33073267d281450dde6 (diff)
downloadgit-6abf189506712a0e3c5ea796d136177b8f24ca22.tar.gz
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: builtin-fast-export: Only output a single parent per line
Diffstat (limited to 'builtin-fast-export.c')
-rwxr-xr-xbuiltin-fast-export.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index e1c56303e5..4ab93fcf78 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;