projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'lt/diff'
[git.git]
/
t
/
t4000-diff-format.sh
diff --git
a/t/t4000-diff-format.sh
b/t/t4000-diff-format.sh
index
f3b6330
..
67b9681
100755
(executable)
--- a/
t/t4000-diff-format.sh
+++ b/
t/t4000-diff-format.sh
@@
-7,6
+7,7
@@
test_description='Test built-in diff output engine.
'
. ./test-lib.sh
'
. ./test-lib.sh
+. ../diff-lib.sh
echo >path0 'Line 1
Line 2
echo >path0 'Line 1
Line 2
@@
-25,6
+26,14
@@
rm -f path1
test_expect_success \
'git-diff-files -p after editing work tree.' \
'git-diff-files -p >current'
test_expect_success \
'git-diff-files -p after editing work tree.' \
'git-diff-files -p >current'
+
+# that's as far as it comes
+if [ "$(git repo-config --get core.filemode)" = false ]
+then
+ say 'filemode disabled on the filesystem'
+ test_done
+fi
+
cat >expected <<\EOF
diff --git a/path0 b/path0
old mode 100644
cat >expected <<\EOF
diff --git a/path0 b/path0
old mode 100644
@@
-48,6
+57,6
@@
EOF
test_expect_success \
'validate git-diff-files -p output.' \
test_expect_success \
'validate git-diff-files -p output.' \
- 'c
mp -s
current expected'
+ 'c
ompare_diff_patch
current expected'
test_done
test_done