diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-11 11:03:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-11 11:03:16 -0700 |
| commit | b81b758d5001c4ebab1a5b8202bb1b0f4cdf3391 (patch) | |
| tree | 9ab6027c65d759e62f4a3b132fda954a324ef074 /t | |
| parent | Merge branch 'rc/maint-http-wrong-free' (diff) | |
| parent | fast-export: quote paths in output (diff) | |
| download | tgif-b81b758d5001c4ebab1a5b8202bb1b0f4cdf3391.tar.xz | |
Merge branch 'jk/fast-export-quote-path'
* jk/fast-export-quote-path:
fast-export: quote paths in output
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9350-fast-export.sh | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh index f823c05305..950d0ff498 100755 --- a/t/t9350-fast-export.sh +++ b/t/t9350-fast-export.sh @@ -228,7 +228,7 @@ test_expect_success 'fast-export -C -C | fast-import' ' mkdir new && git --git-dir=new/.git init && git fast-export -C -C --signed-tags=strip --all > output && - grep "^C \"file6\" \"file7\"\$" output && + grep "^C file6 file7\$" output && cat output | (cd new && git fast-import && @@ -414,4 +414,30 @@ test_expect_success SYMLINKS 'directory becomes symlink' ' (cd result && git show master:foo) ' +test_expect_success 'fast-export quotes pathnames' ' + git init crazy-paths && + (cd crazy-paths && + blob=`echo foo | git hash-object -w --stdin` && + git update-index --add \ + --cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \ + --cacheinfo 100644 $blob "path with \"quote\"" \ + --cacheinfo 100644 $blob "path with \\backslash" \ + --cacheinfo 100644 $blob "path with space" && + git commit -m addition && + git ls-files -z -s | perl -0pe "s{\\t}{$&subdir/}" >index && + git read-tree --empty && + git update-index -z --index-info <index && + git commit -m rename && + git read-tree --empty && + git commit -m deletion && + git fast-export HEAD >export.out && + git rev-list HEAD >expect && + git init result && + cd result && + git fast-import <../export.out && + git rev-list HEAD >actual && + test_cmp ../expect actual + ) +' + test_done |