mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
44e5471a8d
An empty string as mode specification is accepted silently by git apply, as Vegard Nossum found out using AFL. It's interpreted as zero. Reject such bogus file modes, and only accept ones consisting exclusively of octal digits. Reported-by: Vegard Nossum <vegard.nossum@oracle.com> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
76 lines
1.7 KiB
Bash
Executable file
76 lines
1.7 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='applying patch with mode bits'
|
|
|
|
. ./test-lib.sh
|
|
|
|
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 &&
|
|
sed "s/^\(new mode \).*/\1/" <patch-1.txt >patch-empty-mode.txt &&
|
|
sed "s/^\(new mode \).*/\1garbage/" <patch-1.txt >patch-bogus-mode.txt
|
|
'
|
|
|
|
test_expect_success FILEMODE 'same mode (no index)' '
|
|
git reset --hard &&
|
|
chmod +x file &&
|
|
git apply patch-0.txt &&
|
|
test -x file
|
|
'
|
|
|
|
test_expect_success FILEMODE 'same mode (with index)' '
|
|
git reset --hard &&
|
|
chmod +x file &&
|
|
git add file &&
|
|
git apply --index patch-0.txt &&
|
|
test -x file &&
|
|
git diff --exit-code
|
|
'
|
|
|
|
test_expect_success FILEMODE 'same mode (index only)' '
|
|
git reset --hard &&
|
|
chmod +x file &&
|
|
git add file &&
|
|
git apply --cached patch-0.txt &&
|
|
git ls-files -s file | grep "^100755"
|
|
'
|
|
|
|
test_expect_success FILEMODE 'mode update (no index)' '
|
|
git reset --hard &&
|
|
git apply patch-1.txt &&
|
|
test -x file
|
|
'
|
|
|
|
test_expect_success FILEMODE 'mode update (with index)' '
|
|
git reset --hard &&
|
|
git apply --index patch-1.txt &&
|
|
test -x file &&
|
|
git diff --exit-code
|
|
'
|
|
|
|
test_expect_success FILEMODE 'mode update (index only)' '
|
|
git reset --hard &&
|
|
git apply --cached patch-1.txt &&
|
|
git ls-files -s file | grep "^100755"
|
|
'
|
|
|
|
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
|
|
'
|
|
|
|
test_done
|