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/t9125-git-svn-multi-glob-branch-names.sh | |
| parent | 8fe3ee67adcd2ee9372c7044fa311ce55eb285b4 (diff) | |
| parent | fe191fcaa58cb785c804465a0da9bcba9fd9e822 (diff) | |
| download | git-aeaa7e2784b8253e1557e6b41350b6e3c7fa49a2.tar.gz git-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/t9125-git-svn-multi-glob-branch-names.sh')
| -rwxr-xr-x | t/t9125-git-svn-multi-glob-branch-names.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9125-git-svn-multi-glob-branch-names.sh b/t/t9125-git-svn-multi-glob-branch-names.sh index 096abd1fe..0d53fc901 100755 --- a/t/t9125-git-svn-multi-glob-branch-names.sh +++ b/t/t9125-git-svn-multi-glob-branch-names.sh @@ -20,14 +20,14 @@ test_expect_success 'test clone with multi-glob in branch names' ' git svn clone -T trunk -b branches/*/* -t tags \ "$svnrepo/project" project && (cd project && - git rev-parse "refs/remotes/v14.1/beta" && - git rev-parse "refs/remotes/v14.1/gold" + git rev-parse "refs/remotes/origin/v14.1/beta" && + git rev-parse "refs/remotes/origin/v14.1/gold" ) ' test_expect_success 'test dcommit to multi-globbed branch' " (cd project && - git reset --hard 'refs/remotes/v14.1/gold' && + git reset --hard 'refs/remotes/origin/v14.1/gold' && echo hello >> foo && git commit -m 'hello' -- foo && git svn dcommit |