t/t4129-apply-samemode.sh

   1 #!/bin/sh
   2
   3 test_description='applying patch with mode bits'
   4
   5
   6 TEST_PASSES_SANITIZE_LEAK=true
   7 . ./test-lib.sh
   8
   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
  21 '
  22
  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
  28 '
  29
  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
  37 '
  38
  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
  46 '
  47
  48 test_expect_success FILEMODE 'mode update (no index)' '
  49         git reset --hard &&
  50         git apply patch-1.txt &&
  51         test -x file
  52 '
  53
  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
  59 '
  60
  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
  66 '
  67
  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
  72 '
  73
  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
  78 '
  79
  80 test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree files' '
  81         git reset --hard &&
  82         test_config core.sharedRepository 0666 &&
  83         (
  84                 # Remove a default ACL if possible.
  85                 (setfacl -k . 2>/dev/null || true) &&
  86                 umask 0077 &&
  87
  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 &&
  93
  94                 rm -rf d f1 &&
  95                 git apply patch-f1-and-f2.txt &&
  96
  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
 103         )
 104 '
 105
 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 &&
 115
 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 &&
 120
 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 &&
 125
 126         git apply patch 2>err &&
 127         test_grep ! "has type 100644, expected 100755" err &&
 128
 129         git apply --cached patch 2>err &&
 130         test_grep ! "has type 100644, expected 100755" err
 131 '
 132
 133 test_expect_success POSIXPERM 'patch mode for new file is canonicalized' '
 134         cat >patch <<-\EOF &&
 135         diff --git a/non-canon b/non-canon
 136         new file mode 100660
 137         --- /dev/null
 138         +++ b/non-canon
 139         +content
 140         EOF
 141         test_when_finished "git reset --hard" &&
 142         (
 143                 umask 0 &&
 144                 git apply --index patch 2>err
 145         ) &&
 146         test_must_be_empty err &&
 147         git ls-files -s -- non-canon >staged &&
 148         test_grep "^100644" staged &&
 149         ls -l non-canon >worktree &&
 150         test_grep "^-rw-rw-rw" worktree
 151 '
 152
 153 test_expect_success POSIXPERM 'patch mode for deleted file is canonicalized' '
 154         test_when_finished "git reset --hard" &&
 155         echo content >non-canon &&
 156         chmod 666 non-canon &&
 157         git add non-canon &&
 158
 159         cat >patch <<-\EOF &&
 160         diff --git a/non-canon b/non-canon
 161         deleted file mode 100660
 162         --- a/non-canon
 163         +++ /dev/null
 164         @@ -1 +0,0 @@
 165         -content
 166         EOF
 167         git apply --index patch 2>err &&
 168         test_must_be_empty err &&
 169         git ls-files -- non-canon >staged &&
 170         test_must_be_empty staged &&
 171         test_path_is_missing non-canon
 172 '
 173
 174 test_expect_success POSIXPERM 'patch mode for mode change is canonicalized' '
 175         test_when_finished "git reset --hard" &&
 176         echo content >non-canon &&
 177         git add non-canon &&
 178
 179         cat >patch <<-\EOF &&
 180         diff --git a/non-canon b/non-canon
 181         old mode 100660
 182         new mode 100770
 183         EOF
 184         (
 185                 umask 0 &&
 186                 git apply --index patch 2>err
 187         ) &&
 188         test_must_be_empty err &&
 189         git ls-files -s -- non-canon >staged &&
 190         test_grep "^100755" staged &&
 191         ls -l non-canon >worktree &&
 192         test_grep "^-rwxrwxrwx" worktree
 193 '
 194
 195 test_done