mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
t9104: fix test for following larger parents
This test is special for several reasons:
It ends with a "true" statement, which should be a no-op.
It is not because the &&-chain is broken right before it.
Also, looking at what the test intended to test according to
7f578c5
(git-svn: --follow-parent now works on sub-directories of larger
branches, 2007-01-24)
it is not clear how it would achieve that with the given steps.
Amend the test to include the second svn id to be tested for, and
change the tested refs to the ones which are to be expected, and which
make the test pass.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
8bafd20fd9
commit
b7a06e006e
|
@ -72,16 +72,18 @@ test_expect_success 'follow larger parent' '
|
||||||
svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
|
svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
|
||||||
svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
|
svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
|
||||||
git svn init --minimize-url -i larger \
|
git svn init --minimize-url -i larger \
|
||||||
"$svnrepo"/another-larger/trunk/thunk/bump/thud &&
|
"$svnrepo"/larger-parent/trunk/thunk/bump/thud &&
|
||||||
git svn fetch -i larger &&
|
git svn fetch -i larger &&
|
||||||
|
git svn init --minimize-url -i larger-parent \
|
||||||
|
"$svnrepo"/another-larger/trunk/thunk/bump/thud &&
|
||||||
|
git svn fetch -i larger-parent &&
|
||||||
git rev-parse --verify refs/remotes/larger &&
|
git rev-parse --verify refs/remotes/larger &&
|
||||||
git rev-parse --verify \
|
git rev-parse --verify \
|
||||||
refs/remotes/larger-parent/trunk/thunk/bump/thud &&
|
refs/remotes/larger-parent &&
|
||||||
test "`git merge-base \
|
test "`git merge-base \
|
||||||
refs/remotes/larger-parent/trunk/thunk/bump/thud \
|
refs/remotes/larger-parent \
|
||||||
refs/remotes/larger`" = \
|
refs/remotes/larger`" = \
|
||||||
"`git rev-parse refs/remotes/larger`"
|
"`git rev-parse refs/remotes/larger`"
|
||||||
true
|
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'follow higher-level parent' '
|
test_expect_success 'follow higher-level parent' '
|
||||||
|
|
Loading…
Reference in a new issue