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
@@ -17,21 +17,17 @@ test_expect_success 'load svn dump' "
17
"
18
19
test_expect_success 'all svn merges became git merge commits' '
20
- git rev-list --parents --all --grep=Merge |
21
- grep -v " .* " | cut -f1 -d" " >unmarked &&
20
+ git rev-list --all --no-merges --grep=Merge >unmarked &&
21
test_must_be_empty unmarked
22
'
23
25
-
24
test_expect_success 'cherry picks did not become git merge commits' '
27
- git rev-list --parents --all --grep=Cherry |
28
- grep " .* " | cut -f1 -d" " >bad-cherries &&
25
+ git rev-list --all --merges --grep=Cherry >bad-cherries &&
26
test_must_be_empty bad-cherries
27
'
28
29
test_expect_success 'svn non-merge merge commits did not become git merge commits' '
33
- git rev-list --parents --all --grep=non-merge |
34
- grep " .* " | cut -f1 -d" " >bad-non-merges &&
30
+ git rev-list --all --merges --grep=non-merge >bad-non-merges &&
31
test_must_be_empty bad-non-merges
32
'
33