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/t9135-git-svn-moved-branch-empty-file.sh | |
| parent | 8fe3ee67adcd2ee9372c7044fa311ce55eb285b4 (diff) | |
| parent | fe191fcaa58cb785c804465a0da9bcba9fd9e822 (diff) | |
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/t9135-git-svn-moved-branch-empty-file.sh')
| -rwxr-xr-x | t/t9135-git-svn-moved-branch-empty-file.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9135-git-svn-moved-branch-empty-file.sh b/t/t9135-git-svn-moved-branch-empty-file.sh index 5280e5f1e4..93db45db7d 100755 --- a/t/t9135-git-svn-moved-branch-empty-file.sh +++ b/t/t9135-git-svn-moved-branch-empty-file.sh @@ -12,7 +12,7 @@ test_expect_success 'clone using git svn' 'git svn clone -s "$svnrepo" x' test_expect_success 'test that b1 exists and is empty' ' ( cd x && - git reset --hard branch-c && + git reset --hard origin/branch-c && test -f b1 && ! test -s b1 ) |