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>

diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
index 806eff40238622c2bf7dd633dc97e62b8f01ee56..c33bae91fb05f7cc1dff4d0f3361e2e4bff993c6 100755 (executable)
--- 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
 '