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/t9166-git-svn-fetch-merge-branch-of-branch2.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/t9166-git-svn-fetch-merge-branch-of-branch2.sh')
| -rwxr-xr-x | t/t9166-git-svn-fetch-merge-branch-of-branch2.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh b/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh index af0ec0e2e3..52f2e46a5b 100755 --- a/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh +++ b/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh @@ -46,7 +46,7 @@ test_expect_success 'clone svn repo' ' ' test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2) && - y=$(git rev-parse branch2) && + y=$(git rev-parse origin/branch2) && test "x$x" = "x$y" ' |