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>
Michael J Gruber committed
Mar 20, 2015 at 15:32 UTC
b7a06e006ebf28240c7b7cecb74be6a9b0729bef
1 file changed
+6
-4
t/t9104-git-svn-follow-parent.sh
+6
-4
@@ -72,16 +72,18 @@ test_expect_success 'follow larger parent' '
72
svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
73
svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
74
git svn init --minimize-url -i larger \
75
- "$svnrepo"/another-larger/trunk/thunk/bump/thud &&
75
+ "$svnrepo"/larger-parent/trunk/thunk/bump/thud &&
76
git svn fetch -i larger &&
77
+ git svn init --minimize-url -i larger-parent \
78
+ "$svnrepo"/another-larger/trunk/thunk/bump/thud &&
79
+ git svn fetch -i larger-parent &&
80
git rev-parse --verify refs/remotes/larger &&
81
git rev-parse --verify \
79
- refs/remotes/larger-parent/trunk/thunk/bump/thud &&
82
+ refs/remotes/larger-parent &&
83
test "`git merge-base \
81
- refs/remotes/larger-parent/trunk/thunk/bump/thud \
84
+ refs/remotes/larger-parent \
85
refs/remotes/larger`" = \
86
"`git rev-parse refs/remotes/larger`"
84
- true
87
'
88
89
test_expect_success 'follow higher-level parent' '