pull: support pull.ff config

diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index f9f078e7b705eda275f1a1ed8642b81aecf01a53..e94b2f147a72b216a1c97d278bb9c822aed7392a 100755 (executable)
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -779,7 +779,10 @@ test_expect_success \
 
 test_expect_success \
        'unborn HEAD: "summary" page (with "heads" subview)' \
-       'git checkout orphan_branch || git checkout --orphan orphan_branch &&
+       '{
+               git checkout orphan_branch ||
+               git checkout --orphan orphan_branch
+        } &&
         test_when_finished "git checkout master" &&
         gitweb_run "p=.git;a=summary"'