projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] git-tar-tree: fix write_trailer
[git.git]
/
t
/
t4000-diff-format.sh
diff --git
a/t/t4000-diff-format.sh
b/t/t4000-diff-format.sh
old mode 100644
(file)
new mode 100755
(executable)
index
d869412
..
3accb14
--- a/
t/t4000-diff-format.sh
+++ b/
t/t4000-diff-format.sh
@@
-26,7
+26,9
@@
test_expect_success \
'git-diff-files -p after editing work tree.' \
'git-diff-files -p >current'
cat >expected <<\EOF
'git-diff-files -p after editing work tree.' \
'git-diff-files -p >current'
cat >expected <<\EOF
-# mode: 100644 100755 path0
+diff --git a/path0 b/path0
+old mode 100644
+new mode 100755
--- a/path0
+++ b/path0
@@ -1,3 +1,3 @@
--- a/path0
+++ b/path0
@@ -1,3 +1,3 @@
@@
-34,7
+36,8
@@
cat >expected <<\EOF
Line 2
-line 3
+Line 3
Line 2
-line 3
+Line 3
-# mode: 100755 . path1
+diff --git a/path1 b/path1
+deleted file mode 100755
--- a/path1
+++ /dev/null
@@ -1,3 +0,0 @@
--- a/path1
+++ /dev/null
@@ -1,3 +0,0 @@
@@
-47,4
+50,13
@@
test_expect_success \
'validate git-diff-files -p output.' \
'cmp -s current expected'
'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'
+
test_done
test_done