898dd251b408b0daf5ba43e0af924bb4d25acc49 blob 1667 bytes (raw)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
| | #!/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 &&
git rm -f test-file &&
touch test-file &&
git add test-file &&
cat blueprint >test-file &&
git diff >incorrect-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 diff from empty blob to ita path (--cached)' '
git rm -f test-file &&
cat blueprint >test-file &&
git add -N test-file &&
test_must_fail git apply --cached incorrect-patch
'
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
|
debug log:
solving 898dd251b4 ...
found 898dd251b4 in https://public-inbox.org/git/20200808075827.36248-3-ray@ameretat.dev/
found c614eaf04c in git.git.git
preparing index
index prepared:
100755 c614eaf04cca93a22157d08e9fc464639468eb3a t/t4140-apply-ita.sh
applying [1/1] https://public-inbox.org/git/20200808075827.36248-3-ray@ameretat.dev/
diff --git a/t/t4140-apply-ita.sh b/t/t4140-apply-ita.sh
index c614eaf04c..898dd251b4 100755
Checking patch t/t4140-apply-ita.sh...
Applied patch t/t4140-apply-ita.sh cleanly.
index at:
100755 898dd251b408b0daf5ba43e0af924bb4d25acc49 t/t4140-apply-ita.sh
Code repositories for project(s) associated with this inbox:
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).