[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>
This commit is contained in:
Junio C Hamano
2005-05-18 09:10:47 -07:00
committed by Linus Torvalds
parent bf0f910d1d
commit b58f23b38a
2 changed files with 12 additions and 9 deletions

View File

@ -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 @@