mirror of
https://github.com/git/git
synced 2024-07-16 10:38:05 +00:00
1f553918a8
This function replaces sequences of 'chmod +x' and 'git update-index --chmod=+x' in the test suite, whose purpose is to help filesystems that need core.filemode=false. Two places where only 'chmod +x' was used we also use this new function. The function calls 'git update-index --chmod' without checking core.filemode (unlike some of the call sites did). We do this because the call sites *expect* that the executable bit ends up in the index (ie. it is not the purpose of the call sites to *test* whether git treats 'chmod +x' and 'update-index --chmod=+x' correctly). Therefore, on filesystems with core.filemode=true the 'git update-index --chmod' is a no-op. The function uses --add with update-index to help one call site in t6031-merge-recursive. It makes no difference for the other callers. Signed-off-by: Johannes Sixt <j6t@kdbg.org>
33 lines
657 B
Bash
Executable file
33 lines
657 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='Test mode change diffs.
|
|
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success \
|
|
'setup' \
|
|
'echo frotz >rezrov &&
|
|
git update-index --add rezrov &&
|
|
tree=`git write-tree` &&
|
|
echo $tree'
|
|
|
|
test_expect_success \
|
|
'chmod' \
|
|
'test_chmod +x rezrov &&
|
|
git diff-index $tree >current'
|
|
|
|
_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
|
|
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
|
|
sed -e 's/\(:100644 100755\) \('"$_x40"'\) \2 /\1 X X /' <current >check
|
|
echo ":100644 100755 X X M rezrov" >expected
|
|
|
|
test_expect_success \
|
|
'verify' \
|
|
'test_cmp expected check'
|
|
|
|
test_done
|