mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
5bd74506cd
Now that "git diff" handles stdin and relative paths outside the working tree correctly, we can convert all instances of "diff -u" to "git diff". This commit is really the result of $ perl -pi.bak -e 's/diff -u/git diff/' $(git grep -l "diff -u" t/) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from commit c699a40d68215c7e44a5b26117a35c8a56fbd387)
45 lines
1,002 B
Bash
Executable file
45 lines
1,002 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'
|
|
|
|
if [ "$(git config --get core.filemode)" = false ]
|
|
then
|
|
say 'filemode disabled on the filesystem, using update-index --chmod=+x'
|
|
test_expect_success \
|
|
'git-update-index --chmod=+x' \
|
|
'git-update-index rezrov &&
|
|
git-update-index --chmod=+x rezrov &&
|
|
git-diff-index $tree >current'
|
|
else
|
|
test_expect_success \
|
|
'chmod' \
|
|
'chmod +x rezrov &&
|
|
git-update-index rezrov &&
|
|
git-diff-index $tree >current'
|
|
fi
|
|
|
|
_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' \
|
|
'git diff expected check'
|
|
|
|
test_done
|
|
|