diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2015-03-20 14:32:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 19:33:14 (GMT) |
| commit | b7a06e006ebf28240c7b7cecb74be6a9b0729bef (patch) | |
| tree | a4c269e3aa0ed0c821856e0c056a60e47144d334 /t/t9104-git-svn-follow-parent.sh | |
| parent | 8bafd20fd97f5101d1c2c8a332864a2cbc97ce0b (diff) | |
| download | git-b7a06e006ebf28240c7b7cecb74be6a9b0729bef.zip git-b7a06e006ebf28240c7b7cecb74be6a9b0729bef.tar.gz git-b7a06e006ebf28240c7b7cecb74be6a9b0729bef.tar.bz2 | |
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>
Diffstat (limited to 't/t9104-git-svn-follow-parent.sh')
| -rwxr-xr-x | t/t9104-git-svn-follow-parent.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh index 13b179e..83f17e1 100755 --- a/t/t9104-git-svn-follow-parent.sh +++ b/t/t9104-git-svn-follow-parent.sh @@ -72,16 +72,18 @@ test_expect_success 'follow larger parent' ' svn import -m "import a larger parent" import "$svnrepo"/larger-parent && svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-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 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-parent/trunk/thunk/bump/thud && + refs/remotes/larger-parent && test "`git merge-base \ - refs/remotes/larger-parent/trunk/thunk/bump/thud \ + refs/remotes/larger-parent \ refs/remotes/larger`" = \ "`git rev-parse refs/remotes/larger`" - true ' test_expect_success 'follow higher-level parent' ' |