diff options
| author |  Brandon Casey <casey@nrlssc.navy.mil> | 2008-07-22 16:17:43 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-23 11:35:01 -0700 |
| commit | 2b14d07237fb6a52a55e89dde027e40aa627789d (patch) | |
| tree | d62a53491f41c4033c222479003eacaff68cb969 /t/t2201-add-update-typechange.sh | |
| parent | t7601: extend the 'merge picks up the best result' test (diff) | |
| download | tgif-2b14d07237fb6a52a55e89dde027e40aa627789d.tar.xz | |
t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diff
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2201-add-update-typechange.sh')
| -rwxr-xr-x | t/t2201-add-update-typechange.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t2201-add-update-typechange.sh b/t/t2201-add-update-typechange.sh index e15e3eb81b..d24c7d9e5f 100755 --- a/t/t2201-add-update-typechange.sh +++ b/t/t2201-add-update-typechange.sh @@ -106,12 +106,12 @@ test_expect_success modify ' test_expect_success diff-files ' git diff-files --raw >actual && - diff -u expect-files actual + test_cmp expect-files actual ' test_expect_success diff-index ' git diff-index --raw HEAD -- >actual && - diff -u expect-index actual + test_cmp expect-index actual ' test_expect_success 'add -u' ' @@ -119,7 +119,7 @@ test_expect_success 'add -u' ' cp -p ".git/index" ".git/saved-index" && git add -u && git ls-files -s >actual && - diff -u expect-final actual + test_cmp expect-final actual ' test_expect_success 'commit -a' ' @@ -130,11 +130,11 @@ test_expect_success 'commit -a' ' fi && git commit -m "second" -a && git ls-files -s >actual && - diff -u expect-final actual && + test_cmp expect-final actual && rm -f .git/index && git read-tree HEAD && git ls-files -s >actual && - diff -u expect-final actual + test_cmp expect-final actual ' test_done |