mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-21 12:48:32 +02:00
Code

git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2021-01-23 14:00:42 +01:00 committed by Junio C Hamano
parent 4669917e8f
commit f918a89e50
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
t/t9151-svn-mergeinfo.sh
View File

@ -17,41 +17,42 @@ test_expect_success 'load svn dump' "
" "
test_expect_success 'all svn merges became git merge commits' ' test_expect_success 'all svn merges became git merge commits' '
unmarked=$(git rev-list --parents --all --grep=Merge | git rev-list --parents --all --grep=Merge |
grep -v " .* " | cut -f1 -d" ") && grep -v " .* " | cut -f1 -d" " >unmarked &&
[ -z "$unmarked" ] test_must_be_empty unmarked
' '
test_expect_success 'cherry picks did not become git merge commits' ' test_expect_success 'cherry picks did not become git merge commits' '
bad_cherries=$(git rev-list --parents --all --grep=Cherry | git rev-list --parents --all --grep=Cherry |
grep " .* " | cut -f1 -d" ") && grep " .* " | cut -f1 -d" " >bad-cherries &&
[ -z "$bad_cherries" ] test_must_be_empty bad-cherries
' '
test_expect_success 'svn non-merge merge commits did not become git merge commits' ' test_expect_success 'svn non-merge merge commits did not become git merge commits' '
bad_non_merges=$(git rev-list --parents --all --grep=non-merge | git rev-list --parents --all --grep=non-merge |
grep " .* " | cut -f1 -d" ") && grep " .* " | cut -f1 -d" " >bad-non-merges &&
[ -z "$bad_non_merges" ] test_must_be_empty bad-non-merges
' '
test_expect_success 'commit made to merged branch is reachable from the merge' ' test_expect_success 'commit made to merged branch is reachable from the merge' '
before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") && before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") &&
merge_commit=$(git rev-list --all --grep="Merge trunk to b2") && merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
not_reachable=$(git rev-list -1 $before_commit --not $merge_commit) && git rev-list -1 $before_commit --not $merge_commit >not-reachable &&
[ -z "$not_reachable" ] test_must_be_empty not-reachable
' '
test_expect_success 'merging two branches in one commit is detected correctly' ' test_expect_success 'merging two branches in one commit is detected correctly' '
f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") && f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") && f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") &&
merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") && merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
not_reachable=$(git rev-list -1 $f1_commit $f2_commit --not $merge_commit) && git rev-list -1 $f1_commit $f2_commit --not $merge_commit >not-reachable &&
[ -z "$not_reachable" ] test_must_be_empty not-reachable
' '
test_expect_failure 'everything got merged in the end' ' test_expect_failure 'everything got merged in the end' '
unmerged=$(git rev-list --all --not master) && git rev-list --all --not master >unmerged &&
[ -z "$unmerged" ] test_must_be_empty unmerged
' '
test_done test_done