summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-18 16:10:47 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-18 16:39:40 (GMT)
commitb58f23b38a9a9f28d751311353819d3cdf6a86da (patch)
tree680c51b9bdc494e0229f679e979875dc4f1c83a5 /t
parentbf0f910d1dd5e5b291ea818f3037e8f8fe8caffc (diff)
downloadgit-b58f23b38a9a9f28d751311353819d3cdf6a86da.zip
git-b58f23b38a9a9f28d751311353819d3cdf6a86da.tar.gz
git-b58f23b38a9a9f28d751311353819d3cdf6a86da.tar.bz2
[PATCH] Fix diff output take #4.
This implements the output format suggested by Linus in <Pine.LNX.4.58.0505161556260.18337@ppc970.osdl.org>, except the imaginary diff option is spelled "diff --git" with double dashes as suggested by Matthias Urlichs. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 't')
-rw-r--r--t/t4000-diff-format.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index d869412..91ed2dc 100644
--- 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
-# mode: 100644 100755 path0
+diff --git a/path0 b/path0
+old mode 100644
+new mode 100755
--- a/path0
+++ b/path0
@@ -1,3 +1,3 @@
@@ -34,7 +36,8 @@ cat >expected <<\EOF
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 @@