mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-28 08:35:23 +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:
  apply: parse names out of "diff --git" more carefully
This commit is contained in:
Junio C Hamano 2024-03-27 10:13:02 -07:00
parent e103d9ffe4 5ea0176003
commit d586367985
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apply.c
View File

@ -1292,8 +1292,15 @@ static char *git_header_name(int p_value,
return NULL; /* no postimage name */
second = skip_tree_prefix(p_value, name + len + 1,
line_len - (len + 1));
/*
* If we are at the SP at the end of a directory,
* skip_tree_prefix() may return NULL as that makes
* it appears as if we have an absolute path.
* Keep going to find another SP.
*/
if (!second)
return NULL;
continue;
/*
* Does len bytes starting at "name" and "second"
* (that are separated by one HT or SP we just

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

@ -66,4 +66,26 @@ 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 &&
git reset --hard &&
rm -fr "funny " &&
git apply --stat --check --apply sample.patch &&
test_must_be_empty "funny /empty" &&
git apply --stat --check --apply elpmas.patch &&
test_path_is_missing "funny /empty" &&
git apply -R --stat --check --apply elpmas.patch &&
test_must_be_empty "funny /empty" &&
git apply -R --stat --check --apply sample.patch &&
test_path_is_missing "funny /empty"
'
test_done