undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn tests: rewrite brittle tests to use "--[no-]merges".

Browse Source 
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>
This commit is contained in:
Jeff King 2021-01-23 14:00:43 +01:00 committed by Junio C Hamano
parent f918a89e50
commit 796c248dc1
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
'