Skip to content

Commit b7a06e0

Browse files
Michael J Grubergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8bafd20 commit b7a06e0

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

t/t9104-git-svn-follow-parent.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,18 @@ test_expect_success 'follow larger parent' '
7272
svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
7373
svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
7474
git svn init --minimize-url -i larger \
75-
"$svnrepo"/another-larger/trunk/thunk/bump/thud &&
75+
"$svnrepo"/larger-parent/trunk/thunk/bump/thud &&
7676
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 &&
7780
git rev-parse --verify refs/remotes/larger &&
7881
git rev-parse --verify \
79-
refs/remotes/larger-parent/trunk/thunk/bump/thud &&
82+
refs/remotes/larger-parent &&
8083
test "`git merge-base \
81-
refs/remotes/larger-parent/trunk/thunk/bump/thud \
84+
refs/remotes/larger-parent \
8285
refs/remotes/larger`" = \
8386
"`git rev-parse refs/remotes/larger`"
84-
true
8587
'
8688

8789
test_expect_success 'follow higher-level parent' '

0 commit comments

Comments
 (0)