undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Don't do "-u0", use "--unified=0" which is accepted by modern GNU
diff versions.
This commit is contained in:
Linus Torvalds 2005-05-21 10:11:37 -07:00
parent cebf03c4cd
commit da196b603e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t4003-diff-rename-1.sh
View File

@ -26,7 +26,7 @@ test_expect_success \
# both are slightly edited. So we say you copy-and-edit one, # both are slightly edited. So we say you copy-and-edit one,
# and rename-and-edit the other. # 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 && sed -e 's/\([0-9][0-9]*\)/#/g' >current &&
cat >expected <<\EOF cat >expected <<\EOF
diff --git a/COPYING b/COPYING.# diff --git a/COPYING b/COPYING.#
@ -68,7 +68,7 @@ test_expect_success \
# both are slightly edited. So we say you edited one, # both are slightly edited. So we say you edited one,
# and copy-and-edit the other. # 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 sed -e 's/\([0-9][0-9]*\)/#/g' >current
cat >expected <<\EOF cat >expected <<\EOF
diff --git a/COPYING b/COPYING.# diff --git a/COPYING b/COPYING.#
@ -108,7 +108,7 @@ test_expect_success \
# this is only possible because -C mode now reports the unmodified # this is only possible because -C mode now reports the unmodified
# file to the diff-core. # 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 sed -e 's/\([0-9][0-9]*\)/#/g' >current
cat >expected <<\EOF cat >expected <<\EOF
diff --git a/COPYING b/COPYING.# diff --git a/COPYING b/COPYING.#