Merge branch 'rj/add-i-leak-fix'
[git.git] / t / t4129-apply-samemode.sh
blob4eb84440298552ec53520307641419a7f6d7fd77
1 #!/bin/sh
3 test_description='applying patch with mode bits'
6 TEST_PASSES_SANITIZE_LEAK=true
7 . ./test-lib.sh
9 test_expect_success setup '
10 echo original >file &&
11 git add file &&
12 test_tick &&
13 git commit -m initial &&
14 git tag initial &&
15 echo modified >file &&
16 git diff --stat -p >patch-0.txt &&
17 chmod +x file &&
18 git diff --stat -p >patch-1.txt &&
19 sed "s/^\(new mode \).*/\1/" <patch-1.txt >patch-empty-mode.txt &&
20 sed "s/^\(new mode \).*/\1garbage/" <patch-1.txt >patch-bogus-mode.txt
23 test_expect_success FILEMODE 'same mode (no index)' '
24 git reset --hard &&
25 chmod +x file &&
26 git apply patch-0.txt &&
27 test -x file
30 test_expect_success FILEMODE 'same mode (with index)' '
31 git reset --hard &&
32 chmod +x file &&
33 git add file &&
34 git apply --index patch-0.txt &&
35 test -x file &&
36 git diff --exit-code
39 test_expect_success FILEMODE 'same mode (index only)' '
40 git reset --hard &&
41 chmod +x file &&
42 git add file &&
43 git apply --cached patch-0.txt &&
44 git ls-files -s file >ls-files-output &&
45 test_grep "^100755" ls-files-output
48 test_expect_success FILEMODE 'mode update (no index)' '
49 git reset --hard &&
50 git apply patch-1.txt &&
51 test -x file
54 test_expect_success FILEMODE 'mode update (with index)' '
55 git reset --hard &&
56 git apply --index patch-1.txt &&
57 test -x file &&
58 git diff --exit-code
61 test_expect_success FILEMODE 'mode update (index only)' '
62 git reset --hard &&
63 git apply --cached patch-1.txt &&
64 git ls-files -s file >ls-files-output &&
65 test_grep "^100755" ls-files-output
68 test_expect_success FILEMODE 'empty mode is rejected' '
69 git reset --hard &&
70 test_must_fail git apply patch-empty-mode.txt 2>err &&
71 test_grep "invalid mode" err
74 test_expect_success FILEMODE 'bogus mode is rejected' '
75 git reset --hard &&
76 test_must_fail git apply patch-bogus-mode.txt 2>err &&
77 test_grep "invalid mode" err
80 test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree files' '
81 git reset --hard &&
82 test_config core.sharedRepository 0666 &&
84 # Remove a default ACL if possible.
85 (setfacl -k . 2>/dev/null || true) &&
86 umask 0077 &&
88 # Test both files (f1) and leading dirs (d)
89 mkdir d &&
90 touch f1 d/f2 &&
91 git add f1 d/f2 &&
92 git diff --staged >patch-f1-and-f2.txt &&
94 rm -rf d f1 &&
95 git apply patch-f1-and-f2.txt &&
97 echo "-rw-------" >f1_mode.expected &&
98 echo "drwx------" >d_mode.expected &&
99 test_modebits f1 >f1_mode.actual &&
100 test_modebits d >d_mode.actual &&
101 test_cmp f1_mode.expected f1_mode.actual &&
102 test_cmp d_mode.expected d_mode.actual
106 test_expect_success 'git apply respects core.fileMode' '
107 test_config core.fileMode false &&
108 echo true >script.sh &&
109 git add --chmod=+x script.sh &&
110 git ls-files -s script.sh >ls-files-output &&
111 test_grep "^100755" ls-files-output &&
112 test_tick && git commit -m "Add script" &&
113 git ls-tree -r HEAD script.sh >ls-tree-output &&
114 test_grep "^100755" ls-tree-output &&
116 echo true >>script.sh &&
117 test_tick && git commit -m "Modify script" script.sh &&
118 git format-patch -1 --stdout >patch &&
119 test_grep "^index.*100755$" patch &&
121 git switch -c branch HEAD^ &&
122 git apply --index patch 2>err &&
123 test_grep ! "has type 100644, expected 100755" err &&
124 git reset --hard &&
126 git apply patch 2>err &&
127 test_grep ! "has type 100644, expected 100755" err &&
129 git apply --cached patch 2>err &&
130 test_grep ! "has type 100644, expected 100755" err
133 test_done