git-svn tests: rewrite brittle tests to use "--[no-]merges".
Rewrite a brittle tests which used "rev-list" without "--[no-]merges" to figure out if a set of commits turned into merge commits or not. Signed-off-by: Jeff King <peff@peff.net> [ÆAB: wrote commit message] Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jan 23, 2021 at 14:00 UTC
796c248dc1eeaa99cf8074c30dec3ce7642f811e
1 file changed
+3
-7
t/t9151-svn-mergeinfo.sh
+3
-7
index 806eff4023..c33bae91fb 100755
--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@@ -17,21 +17,17 @@ test_expect_success 'load svn dump' "
"
test_expect_success 'all svn merges became git merge commits' '
- git rev-list --parents --all --grep=Merge |
- grep -v " .* " | cut -f1 -d" " >unmarked &&
+ git rev-list --all --no-merges --grep=Merge >unmarked &&
test_must_be_empty unmarked
'
-
test_expect_success 'cherry picks did not become git merge commits' '
- git rev-list --parents --all --grep=Cherry |
- grep " .* " | cut -f1 -d" " >bad-cherries &&
+ git rev-list --all --merges --grep=Cherry >bad-cherries &&
test_must_be_empty bad-cherries
'
test_expect_success 'svn non-merge merge commits did not become git merge commits' '
- git rev-list --parents --all --grep=non-merge |
- grep " .* " | cut -f1 -d" " >bad-non-merges &&
+ git rev-list --all --merges --grep=non-merge >bad-non-merges &&
test_must_be_empty bad-non-merges
'