aboutsummaryrefslogtreecommitdiff
path: root/shell.c
diff options
context:
space:
mode:
authorPieter de Bie <pdebie@ai.rug.nl>2008-05-25 01:21:53 +0200
committerJunio C Hamano <gitster@pobox.com>2008-05-25 22:26:24 -0700
commit5070b49e529e2df30ec2e33073267d281450dde6 (patch)
tree459aee5f4dee16ec8d13af26d53214bbbbf4b4cf /shell.c
parente00f3790b88ce61f1bdc863011a122b98b43197e (diff)
downloadgit-5070b49e529e2df30ec2e33073267d281450dde6.tar.gz
git-5070b49e529e2df30ec2e33073267d281450dde6.tar.xz
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>
Diffstat (limited to 'shell.c')
0 files changed, 0 insertions, 0 deletions