2009-01-02 10:55:37 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='applying patch with mode bits'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
2010-08-13 20:40:04 +00:00
|
|
|
. "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh
|
2009-02-27 21:20:57 +00:00
|
|
|
|
2009-01-02 10:55:37 +00: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 &&
|
|
|
|
git diff --stat -p >patch-1.txt
|
|
|
|
'
|
|
|
|
|
2009-02-27 21:20:57 +00:00
|
|
|
test_expect_success FILEMODE 'same mode (no index)' '
|
2009-01-02 10:55:37 +00:00
|
|
|
git reset --hard &&
|
|
|
|
chmod +x file &&
|
|
|
|
git apply patch-0.txt &&
|
|
|
|
test -x file
|
|
|
|
'
|
|
|
|
|
2009-02-27 21:20:57 +00:00
|
|
|
test_expect_success FILEMODE 'same mode (with index)' '
|
2009-01-02 10:55:37 +00: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 21:20:57 +00:00
|
|
|
test_expect_success FILEMODE 'same mode (index only)' '
|
2009-01-02 10:55:37 +00: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 21:20:57 +00:00
|
|
|
test_expect_success FILEMODE 'mode update (no index)' '
|
2009-01-02 10:55:37 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git apply patch-1.txt &&
|
|
|
|
test -x file
|
|
|
|
'
|
|
|
|
|
2009-02-27 21:20:57 +00:00
|
|
|
test_expect_success FILEMODE 'mode update (with index)' '
|
2009-01-02 10:55:37 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git apply --index patch-1.txt &&
|
|
|
|
test -x file &&
|
|
|
|
git diff --exit-code
|
|
|
|
'
|
|
|
|
|
2009-02-27 21:20:57 +00:00
|
|
|
test_expect_success FILEMODE 'mode update (index only)' '
|
2009-01-02 10:55:37 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git apply --cached patch-1.txt &&
|
|
|
|
git ls-files -s file | grep "^100755"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|