mirror of
https://github.com/git/git.git
synced 2024-05-14 03:26:31 +02:00
Merge branch 'jc/apply-parse-diff-git-header-names-fix' into next
"git apply" failed to extract the filename the patch applied to, when the change was about an empty file created in or deleted from a directory whose name ends with a SP, which has been corrected. * jc/apply-parse-diff-git-header-names-fix: t4126: make sure a directory with SP at the end is usable
This commit is contained in:
commit
a35de15836
|
@ -66,26 +66,29 @@ test_expect_success 'apply --index create' '
|
||||||
git diff --exit-code
|
git diff --exit-code
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'apply with no-contents and a funny pathname' '
|
test_expect_success 'parsing a patch with no-contents and a funny pathname' '
|
||||||
mkdir "funny " &&
|
|
||||||
>"funny /empty" &&
|
|
||||||
git add "funny /empty" &&
|
|
||||||
git diff HEAD "funny /" >sample.patch &&
|
|
||||||
git diff -R HEAD "funny /" >elpmas.patch &&
|
|
||||||
git reset --hard &&
|
git reset --hard &&
|
||||||
rm -fr "funny " &&
|
empty_blob=$(test_oid empty_blob) &&
|
||||||
|
echo "$empty_blob" >expect &&
|
||||||
|
|
||||||
git apply --stat --check --apply sample.patch &&
|
git update-index --add --cacheinfo "100644,$empty_blob,funny /empty" &&
|
||||||
test_must_be_empty "funny /empty" &&
|
git diff --cached HEAD -- "funny /" >sample.patch &&
|
||||||
|
git diff --cached -R HEAD -- "funny /" >elpmas.patch &&
|
||||||
|
git reset &&
|
||||||
|
|
||||||
git apply --stat --check --apply elpmas.patch &&
|
git apply --cached --stat --check --apply sample.patch &&
|
||||||
test_path_is_missing "funny /empty" &&
|
git rev-parse --verify ":funny /empty" >actual &&
|
||||||
|
test_cmp expect actual &&
|
||||||
|
|
||||||
git apply -R --stat --check --apply elpmas.patch &&
|
git apply --cached --stat --check --apply elpmas.patch &&
|
||||||
test_must_be_empty "funny /empty" &&
|
test_must_fail git rev-parse --verify ":funny /empty" &&
|
||||||
|
|
||||||
git apply -R --stat --check --apply sample.patch &&
|
git apply -R --cached --stat --check --apply elpmas.patch &&
|
||||||
test_path_is_missing "funny /empty"
|
git rev-parse --verify ":funny /empty" >actual &&
|
||||||
|
test_cmp expect actual &&
|
||||||
|
|
||||||
|
git apply -R --cached --stat --check --apply sample.patch &&
|
||||||
|
test_must_fail git rev-parse --verify ":funny /empty"
|
||||||
'
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in New Issue