Skip to content

Commit 12d1ea2

Browse files
committed
Merge branch 'js/fast-export-paths-with-spaces' into maint
"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
2 parents 9ea5c63 + ff59f6d commit 12d1ea2

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

builtin/fast-export.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ static void print_path(const char *path)
185185
int need_quote = quote_c_style(path, NULL, NULL, 0);
186186
if (need_quote)
187187
quote_c_style(path, NULL, stdout, 0);
188+
else if (strchr(path, ' '))
189+
printf("\"%s\"", path);
188190
else
189191
printf("%s", path);
190192
}

t/t9350-fast-export.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ test_expect_success 'fast-export quotes pathnames' '
430430
git commit -m rename &&
431431
git read-tree --empty &&
432432
git commit -m deletion &&
433-
git fast-export HEAD >export.out &&
433+
git fast-export -M HEAD >export.out &&
434434
git rev-list HEAD >expect &&
435435
git init result &&
436436
cd result &&

0 commit comments

Comments
 (0)