git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty
Refactor some old-style test code to use test_must_be_empty instead of "test -z". This makes a follow-up commit easier to read. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Jan 23, 2021 at 14:00 UTC
f918a89e50d4e31fe5b2db979122e76992951bc7
1 file changed
+16
-15
t/t9151-svn-mergeinfo.sh
+16
-15
@@ -17,41 +17,42 @@ test_expect_success 'load svn dump' "
17
"
18
19
test_expect_success 'all svn merges became git merge commits' '
20
- unmarked=$(git rev-list --parents --all --grep=Merge |
21
- grep -v " .* " | cut -f1 -d" ") &&
22
- [ -z "$unmarked" ]
20
+ git rev-list --parents --all --grep=Merge |
21
+ grep -v " .* " | cut -f1 -d" " >unmarked &&
22
+ test_must_be_empty unmarked
23
'
24
25
+
26
test_expect_success 'cherry picks did not become git merge commits' '
26
- bad_cherries=$(git rev-list --parents --all --grep=Cherry |
27
- grep " .* " | cut -f1 -d" ") &&
28
- [ -z "$bad_cherries" ]
27
+ git rev-list --parents --all --grep=Cherry |
28
+ grep " .* " | cut -f1 -d" " >bad-cherries &&
29
+ test_must_be_empty bad-cherries
30
'
31
32
test_expect_success 'svn non-merge merge commits did not become git merge commits' '
32
- bad_non_merges=$(git rev-list --parents --all --grep=non-merge |
33
- grep " .* " | cut -f1 -d" ") &&
34
- [ -z "$bad_non_merges" ]
33
+ git rev-list --parents --all --grep=non-merge |
34
+ grep " .* " | cut -f1 -d" " >bad-non-merges &&
35
+ test_must_be_empty bad-non-merges
36
'
37
38
test_expect_success 'commit made to merged branch is reachable from the merge' '
39
before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") &&
40
merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
40
- not_reachable=$(git rev-list -1 $before_commit --not $merge_commit) &&
41
- [ -z "$not_reachable" ]
41
+ git rev-list -1 $before_commit --not $merge_commit >not-reachable &&
42
+ test_must_be_empty not-reachable
43
'
44
45
test_expect_success 'merging two branches in one commit is detected correctly' '
46
f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
47
f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") &&
48
merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
48
- not_reachable=$(git rev-list -1 $f1_commit $f2_commit --not $merge_commit) &&
49
- [ -z "$not_reachable" ]
49
+ git rev-list -1 $f1_commit $f2_commit --not $merge_commit >not-reachable &&
50
+ test_must_be_empty not-reachable
51
'
52
53
test_expect_failure 'everything got merged in the end' '
53
- unmerged=$(git rev-list --all --not master) &&
54
- [ -z "$unmerged" ]
54
+ git rev-list --all --not master >unmerged &&
55
+ test_must_be_empty unmerged
56
'
57
58
test_done