From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sat, 21 May 2005 17:11:37 +0000 (-0700)
Subject: t/t4003-diff-rename-1: use modern options to "diff"
X-Git-Tag: v0.99~513
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=da196b603e665a81943e5df4e8daa3d981846624;p=git.git

t/t4003-diff-rename-1: use modern options to "diff"

Don't do "-u0", use "--unified=0" which is accepted by modern GNU
diff versions.
---

diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh
index fc773897b..3dde165e3 100644
--- a/t/t4003-diff-rename-1.sh
+++ b/t/t4003-diff-rename-1.sh
@@ -26,7 +26,7 @@ test_expect_success \
 # both are slightly edited.  So we say you copy-and-edit one,
 # and rename-and-edit the other.
 
-GIT_DIFF_OPTS=-u0 git-diff-cache -M $tree |
+GIT_DIFF_OPTS=--unified=0 git-diff-cache -M $tree |
 sed -e 's/\([0-9][0-9]*\)/#/g' >current &&
 cat >expected <<\EOF
 diff --git a/COPYING b/COPYING.#
@@ -68,7 +68,7 @@ test_expect_success \
 # both are slightly edited.  So we say you edited one,
 # and copy-and-edit the other.
 
-GIT_DIFF_OPTS=-u0 git-diff-cache -C $tree |
+GIT_DIFF_OPTS=--unified=0 git-diff-cache -C $tree |
 sed -e 's/\([0-9][0-9]*\)/#/g' >current
 cat >expected <<\EOF
 diff --git a/COPYING b/COPYING.#
@@ -108,7 +108,7 @@ test_expect_success \
 # this is only possible because -C mode now reports the unmodified
 # file to the diff-core.
 
-GIT_DIFF_OPTS=-u0 git-diff-cache -C $tree |
+GIT_DIFF_OPTS=--unified=0 git-diff-cache -C $tree |
 sed -e 's/\([0-9][0-9]*\)/#/g' >current
 cat >expected <<\EOF
 diff --git a/COPYING b/COPYING.#