diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-21 10:53:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-21 10:53:09 -0700 |
| commit | aeaa7e2784b8253e1557e6b41350b6e3c7fa49a2 (patch) | |
| tree | 1c5641428ab2aad75d9874abedb821fd9ad01205 /t/t9114-git-svn-dcommit-merge.sh | |
| parent | Merge branch 'jx/i18n' (diff) | |
| parent | Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given (diff) | |
| download | tgif-aeaa7e2784b8253e1557e6b41350b6e3c7fa49a2.tar.xz | |
Merge git://bogomips.org/git-svn
* git://bogomips.org/git-svn:
Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
Diffstat (limited to 't/t9114-git-svn-dcommit-merge.sh')
| -rwxr-xr-x | t/t9114-git-svn-dcommit-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh index d33d714006..fb41876677 100755 --- a/t/t9114-git-svn-dcommit-merge.sh +++ b/t/t9114-git-svn-dcommit-merge.sh @@ -48,7 +48,7 @@ test_expect_success 'setup svn repository' ' test_expect_success 'setup git mirror and merge' ' git svn init "$svnrepo" -t tags -T trunk -b branches && git svn fetch && - git checkout -b svn remotes/trunk && + git checkout -b svn remotes/origin/trunk && git checkout -b merge && echo new file > new_file && git add new_file && @@ -81,7 +81,7 @@ test_debug 'gitk --all & sleep 1' test_expect_success 'verify post-merge ancestry' " test x\`git rev-parse --verify refs/heads/svn\` = \ - x\`git rev-parse --verify refs/remotes/trunk \` && + x\`git rev-parse --verify refs/remotes/origin/trunk \` && test x\`git rev-parse --verify refs/heads/svn^2\` = \ x\`git rev-parse --verify refs/heads/merge\` && git cat-file commit refs/heads/svn^ | grep '^friend$' |