diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-21 10:11:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-21 10:11:37 -0700 |
| commit | da196b603e665a81943e5df4e8daa3d981846624 (patch) | |
| tree | 419b84a6b55d4e5f5f631079adfb461b9992ab6f /t/t4003-diff-rename-1.sh | |
| parent | cebf03c4cd24eb692fe9eb426a4bac2c3fad248c (diff) | |
| download | git-da196b603e665a81943e5df4e8daa3d981846624.tar.gz | |
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.
Diffstat (limited to 't/t4003-diff-rename-1.sh')
| -rw-r--r-- | t/t4003-diff-rename-1.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh index fc773897b7..3dde165e3a 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.# |