diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-16 14:45:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-16 14:45:12 -0800 |
| commit | 5a98255dec1578cc6dc3f25e85d7ea96028687b7 (patch) | |
| tree | cd518fc5ec8312d8b9a90f656e3936d38c47bf36 /t | |
| parent | A bit more for -rc2 (diff) | |
| parent | git-p4: fix git-p4.pathEncoding for removed files (diff) | |
| download | tgif-5a98255dec1578cc6dc3f25e85d7ea96028687b7.tar.xz | |
Merge branch 'ls/p4-path-encoding'
When "git p4" imports changelist that removes paths, it failed to
convert pathnames when the p4 used encoding different from the one
used on the Git side. This has been corrected.
* ls/p4-path-encoding:
git-p4: fix git-p4.pathEncoding for removed files
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9822-git-p4-path-encoding.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh index 7b83e696a9..c78477c19b 100755 --- a/t/t9822-git-p4-path-encoding.sh +++ b/t/t9822-git-p4-path-encoding.sh @@ -51,6 +51,22 @@ test_expect_success 'Clone repo containing iso8859-1 encoded paths with git-p4.p ) ' +test_expect_success 'Delete iso8859-1 encoded paths and clone' ' + ( + cd "$cli" && + ISO8859="$(printf "$ISO8859_ESCAPED")" && + p4 delete "$ISO8859" && + p4 submit -d "remove file" + ) && + git p4 clone --destination="$git" //depot@all && + test_when_finished cleanup_git && + ( + cd "$git" && + git -c core.quotepath=false ls-files >actual && + test_must_be_empty actual + ) +' + test_expect_success 'kill p4d' ' kill_p4d ' |