projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
repo-config: support --get-regexp
[git.git]
/
t
/
t4000-diff-format.sh
diff --git
a/t/t4000-diff-format.sh
b/t/t4000-diff-format.sh
index
3accb14
..
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
@@
-16,7
+17,7
@@
chmod +x path1
test_expect_success \
'update-cache --add two files with and without +x.' \
test_expect_success \
'update-cache --add two files with and without +x.' \
- 'git-update-
cache
--add path0 path1'
+ 'git-update-
index
--add path0 path1'
mv path0 path0-
sed -e 's/line/Line/' <path0- >path0
mv path0 path0-
sed -e 's/line/Line/' <path0- >path0
@@
-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,15
+57,6
@@
EOF
test_expect_success \
'validate git-diff-files -p output.' \
test_expect_success \
'validate git-diff-files -p output.' \
- 'cmp -s current expected'
-
-test_expect_success \
- 'build same diff using git-diff-helper.' \
- 'git-diff-files -z | git-diff-helper -z >current'
-
-
-test_expect_success \
- 'validate git-diff-helper output.' \
- 'cmp -s current expected'
+ 'compare_diff_patch current expected'
test_done
test_done