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

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index ef7c0120949c4ce1667c9d1d8e74a9c63c8adc02..9ab6db3fb042d0cb7ee3a1919788b9a6cd26a3d6 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -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);
 }

diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 77447b70f4020a456f2ba3cac154cedf9162dea6..3e821f958bf10afc739e014ed854254a625affd9 100755 (executable)
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -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 &&