averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-01 18:24:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jr/apply-directory-normalize' into next

Browse Source 
"git apply --directory=./un/../normalized/path" now normalizes the
given path before using it.

* jr/apply-directory-normalize:
  apply: normalize path in --directory argument
This commit is contained in:
Junio C Hamano
2026-02-26 10:06:16 -08:00
parent c5762ee063 0fbf380daf
commit 588d44696d
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apply.c
View File

@@ -5022,6 +5022,10 @@ static int apply_option_parse_directory(const struct option *opt,
strbuf_reset(&state->root);
strbuf_addstr(&state->root, arg);
if (strbuf_normalize_path(&state->root) < 0)
return error(_("unable to normalize directory: '%s'"), arg);
strbuf_complete(&state->root, '/');
return 0;
}

41
t/t4128-apply-root.sh
View File

@@ -43,6 +43,47 @@ test_expect_success 'apply --directory -p (2) ' '
'
test_expect_success 'apply --directory (./ prefix)' '
git reset --hard initial &&
git apply --directory=./some/sub -p3 --index patch &&
echo Bello >expect &&
git show :some/sub/dir/file >actual &&
test_cmp expect actual &&
test_cmp expect some/sub/dir/file
'
test_expect_success 'apply --directory (double slash)' '
git reset --hard initial &&
git apply --directory=some//sub -p3 --index patch &&
echo Bello >expect &&
git show :some/sub/dir/file >actual &&
test_cmp expect actual &&
test_cmp expect some/sub/dir/file
'
test_expect_success 'apply --directory (./ in the middle)' '
git reset --hard initial &&
git apply --directory=some/./sub -p3 --index patch &&
echo Bello >expect &&
git show :some/sub/dir/file >actual &&
test_cmp expect actual &&
test_cmp expect some/sub/dir/file
'
test_expect_success 'apply --directory (../ in the middle)' '
git reset --hard initial &&
git apply --directory=some/../some/sub -p3 --index patch &&
echo Bello >expect &&
git show :some/sub/dir/file >actual &&
test_cmp expect actual &&
test_cmp expect some/sub/dir/file
'
test_expect_success 'apply --directory rejects leading ../' '
test_must_fail git apply --directory=../foo -p3 patch 2>err &&
test_grep "unable to normalize directory" err
'
cat > patch << EOF
diff --git a/newfile b/newfile
new file mode 100644