mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
a4c969aa0d
Test that applying a new file creation patch with --intent-to-add to an existing index does not modify the index outside adding the correct intents-to-add, and that applying a patch with both modifications and new file creations with --intent-to-add correctly only adds intents-to-add to the index. Signed-off-by: Raymond E. Pasco <ray@ameretat.dev> Signed-off-by: Junio C Hamano <gitster@pobox.com>
86 lines
2.0 KiB
Bash
Executable File
86 lines
2.0 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 >committed-file &&
|
|
git add committed-file &&
|
|
git commit -m "commit" &&
|
|
|
|
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 &&
|
|
|
|
git rm -f test-file &&
|
|
test_write_lines 6 >>committed-file &&
|
|
cat blueprint >test-file &&
|
|
git add -N test-file &&
|
|
git diff >complex-patch &&
|
|
git restore committed-file
|
|
'
|
|
|
|
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_expect_success 'apply creation patch to existing index with -N' '
|
|
git rm -f test-file &&
|
|
cat blueprint >index-file &&
|
|
git add index-file &&
|
|
git apply -N creation-patch &&
|
|
|
|
git ls-files --stage --error-unmatch index-file &&
|
|
git ls-files --stage --error-unmatch test-file
|
|
'
|
|
|
|
test_expect_success 'apply complex patch with -N' '
|
|
git rm -f test-file index-file &&
|
|
git apply -N complex-patch &&
|
|
|
|
git ls-files --stage --error-unmatch test-file &&
|
|
git diff | grep "a/committed-file"
|
|
'
|
|
|
|
test_done
|