gitweb: Always use three argument form of open

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 93966f78f887d31afab2266fb9f01aee497bbf9c..64502e2be762a82b65a72af6847d5a3b79303d45 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -37,6 +37,46 @@ test_expect_success setup '
 
 '
 
+printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial" > expect
+test_expect_success 'pretty' '
+
+       git log --pretty="format:%s" > actual &&
+       test_cmp expect actual
+'
+
+printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial\n" > expect
+test_expect_success 'pretty (tformat)' '
+
+       git log --pretty="tformat:%s" > actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'pretty (shortcut)' '
+
+       git log --pretty="%s" > actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'format' '
+
+       git log --format="%s" > actual &&
+       test_cmp expect actual
+'
+
+cat > expect << EOF
+804a787 sixth
+394ef78 fifth
+5d31159 fourth
+2fbe8c0 third
+f7dab8e second
+3a2fdcb initial
+EOF
+test_expect_success 'oneline' '
+
+       git log --oneline > actual &&
+       test_cmp expect actual
+'
+
 test_expect_success 'diff-filter=A' '
 
        actual=$(git log --pretty="format:%s" --diff-filter=A HEAD) &&
@@ -244,10 +284,36 @@ test_expect_success 'set up more tangled history' '
        git merge master~3 &&
        git merge side~1 &&
        git checkout master &&
-       git merge tangle
+       git merge tangle &&
+       git checkout -b reach &&
+       test_commit reach &&
+       git checkout master &&
+       git checkout -b octopus-a &&
+       test_commit octopus-a &&
+       git checkout master &&
+       git checkout -b octopus-b &&
+       test_commit octopus-b &&
+       git checkout master &&
+       test_commit seventh &&
+       git merge octopus-a octopus-b
+       git merge reach
 '
 
 cat > expect <<\EOF
+*   Merge branch 'reach'
+|\
+| \
+|  \
+*-. \   Merge branches 'octopus-a' and 'octopus-b'
+|\ \ \
+* | | | seventh
+| | * | octopus-b
+| |/ /
+|/| |
+| * | octopus-a
+|/ /
+| * reach
+|/
 *   Merge branch 'tangle'
 |\
 | *   Merge branch 'side' (early part) into tangle