diff options
author | Miklos Vajna <vmiklos@frugalware.org> | 2008-09-10 19:32:44 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-09-10 11:16:10 -0700 |
commit | 1e368681bd8c35202b91f8998e07d8bbb3de6c7c (patch) | |
tree | b126da99f89b83577e4733602213742e541a6790 | |
parent | a14f6ca26a1f17a6aa1c4dd8994ca1e1bcbe1729 (diff) | |
download | git-1e368681bd8c35202b91f8998e07d8bbb3de6c7c.tar.gz git-1e368681bd8c35202b91f8998e07d8bbb3de6c7c.tar.xz |
t7501: always use test_cmp instead of diff
This should make the output more readable (by default using diff -u)
when some tests fail.
Also changed the diff order from "current expected" to "expected
current".
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-x | t/t7501-commit.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 469bff887..63bfc6d8b 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -141,7 +141,7 @@ EOF test_expect_success \ 'validate git rev-list output.' \ - 'diff current expected' + 'test_cmp expected current' test_expect_success 'partial commit that involves removal (1)' ' @@ -151,7 +151,7 @@ test_expect_success 'partial commit that involves removal (1)' ' git commit -m "Partial: add elif" elif && git diff-tree --name-status HEAD^ HEAD >current && echo "A elif" >expected && - diff expected current + test_cmp expected current ' @@ -160,7 +160,7 @@ test_expect_success 'partial commit that involves removal (2)' ' git commit -m "Partial: remove file" file && git diff-tree --name-status HEAD^ HEAD >current && echo "D file" >expected && - diff expected current + test_cmp expected current ' @@ -171,7 +171,7 @@ test_expect_success 'partial commit that involves removal (3)' ' git commit -m "Partial: modify elif" elif && git diff-tree --name-status HEAD^ HEAD >current && echo "M elif" >expected && - diff expected current + test_cmp expected current ' @@ -187,7 +187,7 @@ test_expect_success 'amend commit to fix author' ' expected && git commit --amend --author="$author" && git cat-file -p HEAD > current && - diff expected current + test_cmp expected current ' @@ -256,7 +256,7 @@ test_expect_success 'amend commit to fix author' ' expected && git commit --amend --author="$author" && git cat-file -p HEAD > current && - diff expected current + test_cmp expected current ' |