mirror of
https://github.com/git/git
synced 2024-10-30 14:03:28 +00:00
9f3547837e
A couple of test scripts have actually been adapted to accommodate for a configurable default branch name, but they still overrode it via the `GIT_TEST_*` variable. Let's drop that override where possible. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
54 lines
1.8 KiB
Bash
Executable file
54 lines
1.8 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007, 2009 Sam Vilain
|
|
#
|
|
|
|
test_description='git-svn svn mergeinfo properties'
|
|
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'load svn dump' "
|
|
svnadmin load -q '$rawsvnrepo' \
|
|
<'$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
|
|
git svn init --minimize-url -R svnmerge \
|
|
--rewrite-root=http://svn.example.org \
|
|
-T trunk -b branches '$svnrepo' &&
|
|
git svn fetch --all
|
|
"
|
|
|
|
test_expect_success 'all svn merges became git merge commits' '
|
|
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 --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 --all --merges --grep=non-merge >bad-non-merges &&
|
|
test_must_be_empty bad-non-merges
|
|
'
|
|
|
|
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") &&
|
|
merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
|
|
git rev-list -1 $before_commit --not $merge_commit >not-reachable &&
|
|
test_must_be_empty not-reachable
|
|
'
|
|
|
|
test_expect_success 'merging two branches in one commit is detected correctly' '
|
|
f1_commit=$(git rev-list --all --grep="make f1 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") &&
|
|
git rev-list -1 $f1_commit $f2_commit --not $merge_commit >not-reachable &&
|
|
test_must_be_empty not-reachable
|
|
'
|
|
|
|
test_expect_failure 'everything got merged in the end' '
|
|
git rev-list --all --not main >unmerged &&
|
|
test_must_be_empty unmerged
|
|
'
|
|
|
|
test_done
|