2005-05-14 09:52:42 +04:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='Test built-in diff output engine.
|
|
|
|
|
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
2008-08-08 13:26:28 +04:00
|
|
|
. "$TEST_DIRECTORY"/diff-lib.sh
|
2005-05-14 09:52:42 +04:00
|
|
|
|
|
|
|
echo >path0 'Line 1
|
|
|
|
Line 2
|
|
|
|
line 3'
|
|
|
|
cat path0 >path1
|
|
|
|
chmod +x path1
|
|
|
|
|
2013-07-16 12:05:35 +04:00
|
|
|
test_expect_success 'update-index --add two files with and without +x.' '
|
|
|
|
git update-index --add path0 path1
|
|
|
|
'
|
2005-05-14 09:52:42 +04:00
|
|
|
|
|
|
|
mv path0 path0-
|
|
|
|
sed -e 's/line/Line/' <path0- >path0
|
|
|
|
chmod +x path0
|
|
|
|
rm -f path1
|
2013-07-16 12:05:35 +04:00
|
|
|
test_expect_success 'git diff-files -p after editing work tree.' '
|
|
|
|
git diff-files -p >actual
|
|
|
|
'
|
2006-01-05 14:55:03 +03:00
|
|
|
|
|
|
|
# that's as far as it comes
|
2007-01-29 03:16:53 +03:00
|
|
|
if [ "$(git config --get core.filemode)" = false ]
|
2006-01-05 14:55:03 +03:00
|
|
|
then
|
|
|
|
say 'filemode disabled on the filesystem'
|
|
|
|
test_done
|
|
|
|
fi
|
|
|
|
|
2005-05-14 09:52:42 +04:00
|
|
|
cat >expected <<\EOF
|
2005-05-18 20:10:47 +04:00
|
|
|
diff --git a/path0 b/path0
|
|
|
|
old mode 100644
|
|
|
|
new mode 100755
|
2005-05-14 09:52:42 +04:00
|
|
|
--- a/path0
|
|
|
|
+++ b/path0
|
|
|
|
@@ -1,3 +1,3 @@
|
|
|
|
Line 1
|
|
|
|
Line 2
|
|
|
|
-line 3
|
|
|
|
+Line 3
|
2005-05-18 20:10:47 +04:00
|
|
|
diff --git a/path1 b/path1
|
|
|
|
deleted file mode 100755
|
2005-05-14 09:52:42 +04:00
|
|
|
--- a/path1
|
|
|
|
+++ /dev/null
|
|
|
|
@@ -1,3 +0,0 @@
|
|
|
|
-Line 1
|
|
|
|
-Line 2
|
|
|
|
-line 3
|
|
|
|
EOF
|
|
|
|
|
2013-07-16 12:05:35 +04:00
|
|
|
test_expect_success 'validate git diff-files -p output.' '
|
|
|
|
compare_diff_patch expected actual
|
|
|
|
'
|
2005-05-14 09:52:42 +04:00
|
|
|
|
|
|
|
test_done
|