summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a14f6ca)
raw | patch | inline | side by side (parent: a14f6ca)
author | Miklos Vajna <vmiklos@frugalware.org> | |
Wed, 10 Sep 2008 17:32:44 +0000 (19:32 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 10 Sep 2008 18:16:10 +0000 (11:16 -0700) |
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>
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>
t/t7501-commit.sh | patch | blob | history |
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 469bff8873534e247205926dfb4919800457ca1e..63bfc6d8b3f6917cad1b51a73a84ba61762b220d 100755 (executable)
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
test_expect_success \
'validate git rev-list output.' \
- 'diff current expected'
+ 'test_cmp expected current'
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
'
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
'
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
'
expected &&
git commit --amend --author="$author" &&
git cat-file -p HEAD > current &&
- diff expected current
+ test_cmp expected current
'
expected &&
git commit --amend --author="$author" &&
git cat-file -p HEAD > current &&
- diff expected current
+ test_cmp expected current
'