Merge branch 'mn/sideband-no-ansi' into maint

diff --git a/t/t9163-git-svn-reset-clears-caches.sh b/t/t9163-git-svn-reset-clears-caches.sh
index cd4c662ba21cdc460254ccd4901fdea5a41de982..d6245cee081059d98e72758a3ff7bb42730a7662 100755 (executable)
--- a/t/t9163-git-svn-reset-clears-caches.sh
+++ b/t/t9163-git-svn-reset-clears-caches.sh
@@ -70,9 +70,9 @@ test_expect_success 'rebase looses SVN merge (m)' '
 #
 test_expect_success 'reset and fetch gets the SVN merge (m) correctly' '
        git svn reset -r 3 &&
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn fetch &&
-       test 2 = $(git cat-file -p trunk|grep parent|wc -l)
+       test 2 = $(git cat-file -p origin/trunk|grep parent|wc -l)
 '
 
 test_done