| commit | 5070b49e529e2df30ec2e33073267d281450dde6 | |
| author | Pieter de Bie <pdebie@ai.rug.nl> | |
| Sat, 24 May 2008 23:21:53 +0000 (25 01:21 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 26 May 2008 05:26:24 +0000 (25 22:26 -0700) | ||
| tree | 459aee5f4dee16ec8d13af26d53214bbbbf4b4cf | treesnapshot (tar.gz zip) |
| parent | e00f3790b88ce61f1bdc863011a122b98b43197e | commitdiff |
builtin-fast-export: Only output a single parent per line
According to the git-fast-import man-page, you can only put a single
committish per merge: line, like this:
merge :10
merge :11
However, git-fast-export puts all parents on a single line, like this:
merge :10 :11
This changes fast-export to output a single parent per line. Otherwise
neither git-fast-import nor bzr-fast-import can read its output.
[jc: fix-up to remove excess LF in the output that makes fast-import barf]
Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
According to the git-fast-import man-page, you can only put a single
committish per merge: line, like this:
merge :10
merge :11
However, git-fast-export puts all parents on a single line, like this:
merge :10 :11
This changes fast-export to output a single parent per line. Otherwise
neither git-fast-import nor bzr-fast-import can read its output.
[jc: fix-up to remove excess LF in the output that makes fast-import barf]
Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-fast-export.c | diffblobblamehistory |