@matheusbsbs / matheus-bagliano / commits / ff59f6da84

fast-export: quote paths with spaces

A path containing a space must be quoted when used as an argument to either the copy or rename commands (because unlike other commands, the path is not the final thing on the line for those commands). Commit 6280dfdc3b (fast-export: quote paths in output, 2011-08-05) previously attempted to fix fast-export's quoting by passing all paths through quote_c_style(). However, that function does not consider the space to be a character which requires quoting, so let's special-case the space inside print_path(). This will cause space-containing paths to also be quoted in other commands where such quoting is not strictly necessary, but it does not hurt to do so. The test from 6280dfdc3b did not detect this because, while it does introduce renames in the export stream, it does not actually turn on rename detection, so they were presented as pairs of deletions/adds. Using "-M" reveals the bug. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jay Soffian committed Jun 27, 2012 at 17:58 UTC ff59f6da840bb58058fef06721a2646daae50509

2 files changed +3 -1

builtin/fast-export.c

@@ -185,6 +185,8 @@ static void print_path(const char *path)

185 int need_quote = quote_c_style(path, NULL, NULL, 0);

186 if (need_quote)

187 quote_c_style(path, NULL, stdout, 0);

188 + else if (strchr(path, ' '))

189 + printf("\"%s\"", path);

190 else

191 printf("%s", path);

192 }

t/t9350-fast-export.sh

+1 -1

@@ -430,7 +430,7 @@ test_expect_success 'fast-export quotes pathnames' '

430 git commit -m rename &&

431 git read-tree --empty &&

432 git commit -m deletion &&

433 - git fast-export HEAD >export.out &&

433 + git fast-export -M HEAD >export.out &&

434 git rev-list HEAD >expect &&

435 git init result &&

436 cd result &&