mirror of
https://github.com/git/git
synced 2024-11-04 16:17:49 +00:00
49e5cc5b26
This patch fixes a racy test failure in t4129.
The deletion test added by e95d515141 (apply: canonicalize modes read
from patches, 2024-08-05) wants to make sure that git-apply does not
complain about a non-canonical mode in the patch, even if that mode does
not match the working tree file. So it does this:
echo content >non-canon &&
git add non-canon &&
chmod 666 non-canon &&
This is wrong, because running chmod will update the ctime on the file,
making it stat-dirty and causing git-apply to refuse to apply the patch.
But this only happens sometimes, since it depends on the timestamps
crossing a second boundary (but it triggers pretty quickly when run with
--stress).
We can fix this by doing the chmod before updating the index. The order
isn't important here, as the mode will be canonicalized to 100644 in the
index anyway (in fact, the chmod is not even that important in the first
place, since git-apply will only look at the index; I only added it as
an extra confirmation that git-apply would not be confused by it).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
195 lines
4.8 KiB
Bash
Executable file
195 lines
4.8 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='applying patch with mode bits'
|
|
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./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 >ls-files-output &&
|
|
test_grep "^100755" ls-files-output
|
|
'
|
|
|
|
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 >ls-files-output &&
|
|
test_grep "^100755" ls-files-output
|
|
'
|
|
|
|
test_expect_success FILEMODE 'empty mode is rejected' '
|
|
git reset --hard &&
|
|
test_must_fail git apply patch-empty-mode.txt 2>err &&
|
|
test_grep "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_grep "invalid mode" err
|
|
'
|
|
|
|
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.
|
|
(setfacl -k . 2>/dev/null || true) &&
|
|
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
|
|
)
|
|
'
|
|
|
|
test_expect_success 'git apply respects core.fileMode' '
|
|
test_config core.fileMode false &&
|
|
echo true >script.sh &&
|
|
git add --chmod=+x script.sh &&
|
|
git ls-files -s script.sh >ls-files-output &&
|
|
test_grep "^100755" ls-files-output &&
|
|
test_tick && git commit -m "Add script" &&
|
|
git ls-tree -r HEAD script.sh >ls-tree-output &&
|
|
test_grep "^100755" ls-tree-output &&
|
|
|
|
echo true >>script.sh &&
|
|
test_tick && git commit -m "Modify script" script.sh &&
|
|
git format-patch -1 --stdout >patch &&
|
|
test_grep "^index.*100755$" patch &&
|
|
|
|
git switch -c branch HEAD^ &&
|
|
git apply --index patch 2>err &&
|
|
test_grep ! "has type 100644, expected 100755" err &&
|
|
git reset --hard &&
|
|
|
|
git apply patch 2>err &&
|
|
test_grep ! "has type 100644, expected 100755" err &&
|
|
|
|
git apply --cached patch 2>err &&
|
|
test_grep ! "has type 100644, expected 100755" err
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'patch mode for new file is canonicalized' '
|
|
cat >patch <<-\EOF &&
|
|
diff --git a/non-canon b/non-canon
|
|
new file mode 100660
|
|
--- /dev/null
|
|
+++ b/non-canon
|
|
+content
|
|
EOF
|
|
test_when_finished "git reset --hard" &&
|
|
(
|
|
umask 0 &&
|
|
git apply --index patch 2>err
|
|
) &&
|
|
test_must_be_empty err &&
|
|
git ls-files -s -- non-canon >staged &&
|
|
test_grep "^100644" staged &&
|
|
ls -l non-canon >worktree &&
|
|
test_grep "^-rw-rw-rw" worktree
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'patch mode for deleted file is canonicalized' '
|
|
test_when_finished "git reset --hard" &&
|
|
echo content >non-canon &&
|
|
chmod 666 non-canon &&
|
|
git add non-canon &&
|
|
|
|
cat >patch <<-\EOF &&
|
|
diff --git a/non-canon b/non-canon
|
|
deleted file mode 100660
|
|
--- a/non-canon
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-content
|
|
EOF
|
|
git apply --index patch 2>err &&
|
|
test_must_be_empty err &&
|
|
git ls-files -- non-canon >staged &&
|
|
test_must_be_empty staged &&
|
|
test_path_is_missing non-canon
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'patch mode for mode change is canonicalized' '
|
|
test_when_finished "git reset --hard" &&
|
|
echo content >non-canon &&
|
|
git add non-canon &&
|
|
|
|
cat >patch <<-\EOF &&
|
|
diff --git a/non-canon b/non-canon
|
|
old mode 100660
|
|
new mode 100770
|
|
EOF
|
|
(
|
|
umask 0 &&
|
|
git apply --index patch 2>err
|
|
) &&
|
|
test_must_be_empty err &&
|
|
git ls-files -s -- non-canon >staged &&
|
|
test_grep "^100755" staged &&
|
|
ls -l non-canon >worktree &&
|
|
test_grep "^-rwxrwxrwx" worktree
|
|
'
|
|
|
|
test_done
|