Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t7501: always use test_cmp instead of diff
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>
t/t7501-commit.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
a14f6ca
)
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
@@
-141,7
+141,7
@@
EOF
test_expect_success \
'validate git rev-list output.' \
test_expect_success \
'validate git rev-list output.' \
- '
diff current expected
'
+ '
test_cmp expected current
'
test_expect_success 'partial commit that involves removal (1)' '
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 &&
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 &&
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 &&
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 &&
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 &&
expected &&
git commit --amend --author="$author" &&
git cat-file -p HEAD > current &&
-
diff
expected current
+
test_cmp
expected current
'
'