X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9135-git-svn-moved-branch-empty-file.sh;h=5280e5f1e405f2a93620b496c64e85e73181f13a;hb=v1.7.3.1-35-g00648ba;hp=03705fa4ce832658f39f586d430fcbbf902bd16f;hpb=3ed24211d48d9a297b3784347acbf7e0265a58f3;p=git.git diff --git a/t/t9135-git-svn-moved-branch-empty-file.sh b/t/t9135-git-svn-moved-branch-empty-file.sh index 03705fa4c..5280e5f1e 100755 --- a/t/t9135-git-svn-moved-branch-empty-file.sh +++ b/t/t9135-git-svn-moved-branch-empty-file.sh @@ -10,7 +10,12 @@ test_expect_success 'load svn dumpfile' ' 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 && test -f b1 && ! test -s b1) + ( + cd x && + git reset --hard branch-c && + test -f b1 && + ! test -s b1 + ) ' test_done