summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cebf03c)
raw | patch | inline | side by side (parent: cebf03c)
author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Sat, 21 May 2005 17:11:37 +0000 (10:11 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Sat, 21 May 2005 17:11:37 +0000 (10:11 -0700) |
Don't do "-u0", use "--unified=0" which is accepted by modern GNU
diff versions.
diff versions.
t/t4003-diff-rename-1.sh | patch | blob | history |
index fc773897b72d3d2ebfb8614b6acfc65f8eea7cf2..3dde165e3a120e7edf4a3aac685ce6ba56c870da 100644 (file)
--- a/t/t4003-diff-rename-1.sh
+++ b/t/t4003-diff-rename-1.sh
# 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.#
# 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.#
# 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.#