2009-01-02 11:55:37 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='applying patch with mode bits'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
2009-02-27 22:20:57 +01:00
|
|
|
|
2009-01-02 11:55:37 +01:00
|
|
|
test_expect_success setup '
|
|
|
|
echo original >file &&
|
|
|
|
git add file &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m initial &&
|
|
|
|
git tag initial &&
|
|
|
|
echo modified >file &&
|
|
|
|
git diff --stat -p >patch-0.txt &&
|
|
|
|
chmod +x file &&
|
2017-06-27 19:03:47 +02:00
|
|
|
git diff --stat -p >patch-1.txt &&
|
|
|
|
sed "s/^\(new mode \).*/\1/" <patch-1.txt >patch-empty-mode.txt &&
|
|
|
|
sed "s/^\(new mode \).*/\1garbage/" <patch-1.txt >patch-bogus-mode.txt
|
2009-01-02 11:55:37 +01:00
|
|
|
'
|
|
|
|
|
2009-02-27 22:20:57 +01:00
|
|
|
test_expect_success FILEMODE 'same mode (no index)' '
|
2009-01-02 11:55:37 +01:00
|
|
|
git reset --hard &&
|
|
|
|
chmod +x file &&
|
|
|
|
git apply patch-0.txt &&
|
|
|
|
test -x file
|
|
|
|
'
|
|
|
|
|
2009-02-27 22:20:57 +01:00
|
|
|
test_expect_success FILEMODE 'same mode (with index)' '
|
2009-01-02 11:55:37 +01:00
|
|
|
git reset --hard &&
|
|
|
|
chmod +x file &&
|
|
|
|
git add file &&
|
|
|
|
git apply --index patch-0.txt &&
|
|
|
|
test -x file &&
|
|
|
|
git diff --exit-code
|
|
|
|
'
|
|
|
|
|
2009-02-27 22:20:57 +01:00
|
|
|
test_expect_success FILEMODE 'same mode (index only)' '
|
2009-01-02 11:55:37 +01:00
|
|
|
git reset --hard &&
|
|
|
|
chmod +x file &&
|
|
|
|
git add file &&
|
|
|
|
git apply --cached patch-0.txt &&
|
|
|
|
git ls-files -s file | grep "^100755"
|
|
|
|
'
|
|
|
|
|
2009-02-27 22:20:57 +01:00
|
|
|
test_expect_success FILEMODE 'mode update (no index)' '
|
2009-01-02 11:55:37 +01:00
|
|
|
git reset --hard &&
|
|
|
|
git apply patch-1.txt &&
|
|
|
|
test -x file
|
|
|
|
'
|
|
|
|
|
2009-02-27 22:20:57 +01:00
|
|
|
test_expect_success FILEMODE 'mode update (with index)' '
|
2009-01-02 11:55:37 +01:00
|
|
|
git reset --hard &&
|
|
|
|
git apply --index patch-1.txt &&
|
|
|
|
test -x file &&
|
|
|
|
git diff --exit-code
|
|
|
|
'
|
|
|
|
|
2009-02-27 22:20:57 +01:00
|
|
|
test_expect_success FILEMODE 'mode update (index only)' '
|
2009-01-02 11:55:37 +01:00
|
|
|
git reset --hard &&
|
|
|
|
git apply --cached patch-1.txt &&
|
|
|
|
git ls-files -s file | grep "^100755"
|
|
|
|
'
|
|
|
|
|
2017-06-27 19:03:47 +02:00
|
|
|
test_expect_success FILEMODE 'empty mode is rejected' '
|
|
|
|
git reset --hard &&
|
|
|
|
test_must_fail git apply patch-empty-mode.txt 2>err &&
|
|
|
|
test_i18ngrep "invalid mode" err
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success FILEMODE 'bogus mode is rejected' '
|
|
|
|
git reset --hard &&
|
|
|
|
test_must_fail git apply patch-bogus-mode.txt 2>err &&
|
|
|
|
test_i18ngrep "invalid mode" err
|
|
|
|
'
|
|
|
|
|
2020-12-02 00:45:04 +01:00
|
|
|
test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree files' '
|
|
|
|
git reset --hard &&
|
|
|
|
test_config core.sharedRepository 0666 &&
|
|
|
|
(
|
|
|
|
# Remove a default ACL if possible.
|
2020-12-23 12:44:31 +01:00
|
|
|
(setfacl -k . 2>/dev/null || true) &&
|
2020-12-02 00:45:04 +01:00
|
|
|
umask 0077 &&
|
|
|
|
|
|
|
|
# Test both files (f1) and leading dirs (d)
|
|
|
|
mkdir d &&
|
|
|
|
touch f1 d/f2 &&
|
|
|
|
git add f1 d/f2 &&
|
|
|
|
git diff --staged >patch-f1-and-f2.txt &&
|
|
|
|
|
|
|
|
rm -rf d f1 &&
|
|
|
|
git apply patch-f1-and-f2.txt &&
|
|
|
|
|
|
|
|
echo "-rw-------" >f1_mode.expected &&
|
|
|
|
echo "drwx------" >d_mode.expected &&
|
|
|
|
test_modebits f1 >f1_mode.actual &&
|
|
|
|
test_modebits d >d_mode.actual &&
|
|
|
|
test_cmp f1_mode.expected f1_mode.actual &&
|
|
|
|
test_cmp d_mode.expected d_mode.actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2009-01-02 11:55:37 +01:00
|
|
|
test_done
|