mirror of
https://github.com/git/git.git
synced 2024-11-09 02:33:11 +01:00
28f8802417
The point of the test is not really to test the ability of the filesystem to keep the given x-bit, but to check is merge-recursive correctly handles it. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
52 lines
1.1 KiB
Bash
Executable file
52 lines
1.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='merge-recursive: handle file mode'
|
|
. ./test-lib.sh
|
|
|
|
# Note that we follow "chmod +x F" with "update-index --chmod=+x F" to
|
|
# help filesystems that do not have the executable bit.
|
|
|
|
test_expect_success 'mode change in one branch: keep changed version' '
|
|
: >file1 &&
|
|
git add file1 &&
|
|
git commit -m initial &&
|
|
git checkout -b a1 master &&
|
|
: >dummy &&
|
|
git add dummy &&
|
|
git commit -m a &&
|
|
git checkout -b b1 master &&
|
|
chmod +x file1 &&
|
|
git update-index --chmod=+x file1 &&
|
|
git commit -m b1 &&
|
|
git checkout a1 &&
|
|
git merge-recursive master -- a1 b1 &&
|
|
test -x file1
|
|
'
|
|
|
|
test_expect_success 'mode change in both branches: expect conflict' '
|
|
git reset --hard HEAD &&
|
|
git checkout -b a2 master &&
|
|
: >file2 &&
|
|
H=$(git hash-object file2) &&
|
|
chmod +x file2 &&
|
|
git update-index --add --chmod=+x file2 &&
|
|
git commit -m a2 &&
|
|
git checkout -b b2 master &&
|
|
: >file2 &&
|
|
git add file2 &&
|
|
git commit -m b2 &&
|
|
git checkout a2 &&
|
|
(
|
|
git merge-recursive master -- a2 b2
|
|
test $? = 1
|
|
) &&
|
|
git ls-files -u >actual &&
|
|
(
|
|
echo "100755 $H 2 file2"
|
|
echo "100644 $H 3 file2"
|
|
) >expect &&
|
|
test_cmp actual expect &&
|
|
test -x file2
|
|
'
|
|
|
|
test_done
|