X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=t%2Ft4003-diff-rename-1.sh;h=3dde165e3a120e7edf4a3aac685ce6ba56c870da;hb=58b103f55d5b95dc24cce2fb4f64e697958fd204;hp=fc773897b72d3d2ebfb8614b6acfc65f8eea7cf2;hpb=c3e7fbcbd0561cd13abc8cefcea3e09ab6090d50;p=git.git diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh index fc773897..3dde165e 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.#