Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t6050: use test_line_count instead of wc -l
author
Christian Couder
<christian.couder@gmail.com>
Sun, 31 Mar 2019 13:46:56 +0000
(15:46 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 1 Apr 2019 08:49:00 +0000
(17:49 +0900)
This modernizes a test and makes it more portable.
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6050-replace.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
aeb582a
)
diff --git
a/t/t6050-replace.sh
b/t/t6050-replace.sh
index d638119750c5b9f11682814de466cc19a9d38770..41b177936e383c1ef0302f080816f1eb564aa196 100755
(executable)
--- a/
t/t6050-replace.sh
+++ b/
t/t6050-replace.sh
@@
-393,9
+393,11
@@
test_expect_success 'replace ref cleanup' '
'
test_expect_success '--graft with and without already replaced object' '
- test $(git log --oneline | wc -l) = 7 &&
+ git log --oneline >log &&
+ test_line_count = 7 log &&
git replace --graft $HASH5 &&
- test $(git log --oneline | wc -l) = 3 &&
+ git log --oneline >log &&
+ test_line_count = 3 log &&
commit_has_parents $HASH5 &&
test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 &&
git replace --force -g $HASH5 $HASH4 $HASH3 &&