Merge branch 'sr/local-config'

diff --git a/t/t9135-git-svn-moved-branch-empty-file.sh b/t/t9135-git-svn-moved-branch-empty-file.sh
index 03705fa4ce832658f39f586d430fcbbf902bd16f..5280e5f1e405f2a93620b496c64e85e73181f13a 100755 (executable)
--- 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