mirror of
https://github.com/git/git.git
synced 2024-05-25 04:16:09 +02:00
4c025c667e
apply --cached (as used by add -p) should accept creation and deletion patches to intent-to-add paths in the index. apply --index, however, should always fail because an intent-to-add path never matches the worktree (by definition). Based-on-patch-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Raymond E. Pasco <ray@ameretat.dev> Signed-off-by: Junio C Hamano <gitster@pobox.com>
57 lines
1.3 KiB
Bash
Executable File
57 lines
1.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git apply of i-t-a file'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
test_write_lines 1 2 3 4 5 >blueprint &&
|
|
|
|
cat blueprint >test-file &&
|
|
git add -N test-file &&
|
|
git diff >creation-patch &&
|
|
grep "new file mode 100644" creation-patch &&
|
|
|
|
rm -f test-file &&
|
|
git diff >deletion-patch &&
|
|
grep "deleted file mode 100644" deletion-patch
|
|
'
|
|
|
|
test_expect_success 'apply creation patch to ita path (--cached)' '
|
|
git rm -f test-file &&
|
|
cat blueprint >test-file &&
|
|
git add -N test-file &&
|
|
|
|
git apply --cached creation-patch &&
|
|
git cat-file blob :test-file >actual &&
|
|
test_cmp blueprint actual
|
|
'
|
|
|
|
test_expect_success 'apply creation patch to ita path (--index)' '
|
|
git rm -f test-file &&
|
|
cat blueprint >test-file &&
|
|
git add -N test-file &&
|
|
rm -f test-file &&
|
|
|
|
test_must_fail git apply --index creation-patch
|
|
'
|
|
|
|
test_expect_success 'apply deletion patch to ita path (--cached)' '
|
|
git rm -f test-file &&
|
|
cat blueprint >test-file &&
|
|
git add -N test-file &&
|
|
|
|
git apply --cached deletion-patch &&
|
|
test_must_fail git ls-files --stage --error-unmatch test-file
|
|
'
|
|
|
|
test_expect_success 'apply deletion patch to ita path (--index)' '
|
|
cat blueprint >test-file &&
|
|
git add -N test-file &&
|
|
|
|
test_must_fail git apply --index deletion-patch &&
|
|
git ls-files --stage --error-unmatch test-file
|
|
'
|
|
|
|
test_done
|