Permalink
Browse files

Merge branch 'js/fast-export-paths-with-spaces'

"git fast-export" produced an input stream for fast-import without
properly quoting pathnames when they contain SPs in them.

* js/fast-export-paths-with-spaces:
  fast-export: quote paths with spaces
  • Loading branch information...
2 parents 45c96c0 + ff59f6d commit f8a9eafb4895935be6c9debf02a9b04339488bf0 @gitster gitster committed Jul 9, 2012
Showing with 3 additions and 1 deletion.
  1. +2 −0 builtin/fast-export.c
  2. +1 −1 t/t9350-fast-export.sh
View
@@ -185,6 +185,8 @@ static void print_path(const char *path)
int need_quote = quote_c_style(path, NULL, NULL, 0);
if (need_quote)
quote_c_style(path, NULL, stdout, 0);
+ else if (strchr(path, ' '))
+ printf("\"%s\"", path);
else
printf("%s", path);
}
View
@@ -430,7 +430,7 @@ test_expect_success 'fast-export quotes pathnames' '
git commit -m rename &&
git read-tree --empty &&
git commit -m deletion &&
- git fast-export HEAD >export.out &&
+ git fast-export -M HEAD >export.out &&
git rev-list HEAD >expect &&
git init result &&
cd result &&

0 comments on commit f8a9eaf

Please sign in to comment.