mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-28 19:45:10 +02:00
Code

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:
Junio C Hamano 2024-03-28 14:20:13 -07:00
parent 22e8e4a68e 012c8b307d
commit a35de15836
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
t/t4126-apply-empty.sh
View File

@ -66,26 +66,29 @@ test_expect_success 'apply --index create' '
git diff --exit-code
'
test_expect_success 'apply 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 &&
test_expect_success 'parsing a patch with no-contents and a funny pathname' '
git reset --hard &&
rm -fr "funny " &&
empty_blob=$(test_oid empty_blob) &&
echo "$empty_blob" >expect &&
git apply --stat --check --apply sample.patch &&
test_must_be_empty "funny /empty" &&
git update-index --add --cacheinfo "100644,$empty_blob,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 &&
test_path_is_missing "funny /empty" &&
git apply --cached --stat --check --apply sample.patch &&
git rev-parse --verify ":funny /empty" >actual &&
test_cmp expect actual &&
git apply -R --stat --check --apply elpmas.patch &&
test_must_be_empty "funny /empty" &&
git apply --cached --stat --check --apply elpmas.patch &&
test_must_fail git rev-parse --verify ":funny /empty" &&
git apply -R --stat --check --apply sample.patch &&
test_path_is_missing "funny /empty"
git apply -R --cached --stat --check --apply elpmas.patch &&
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