parseopt: handle malformed --expire arguments more nicely

diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index e74b9ab1e16a9255afad32de380b69aa9e76db47..cc8d463e01ac74a78fa08b638318a88b8ea98bff 100755 (executable)
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -297,7 +297,7 @@ test_expect_success 'setup incomplete lines' '
        echo "Dominus regit me," >file &&
        echo "incomplete line" | tr -d "\\012" >>file &&
        git commit -a -m "Change incomplete line" &&
-       git tag incomplete_lines_chg
+       git tag incomplete_lines_chg &&
        echo "Dominus regit me," >file &&
        git commit -a -m "Remove incomplete line" &&
        git tag incomplete_lines_rem
@@ -519,7 +519,7 @@ test_expect_success \
 
 test_expect_success \
        'encode(commit): utf8' \
-       '. "$TEST_DIRECTORY"/t3901-utf8.txt &&
+       '. "$TEST_DIRECTORY"/t3901/utf8.txt &&
         test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
         test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
         echo "UTF-8" >> file &&
@@ -529,7 +529,7 @@ test_expect_success \
 
 test_expect_success \
        'encode(commit): iso-8859-1' \
-       '. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       '. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
         test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
         test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
         echo "ISO-8859-1" >> file &&
@@ -709,6 +709,14 @@ test_expect_success HIGHLIGHT \
         git commit -m "Add test.sh" &&
         gitweb_run "p=.git;a=blob;f=test.sh"'
 
+test_expect_success HIGHLIGHT \
+       'syntax highlighting (highlighter language autodetection)' \
+       'git config gitweb.highlight yes &&
+        echo "#!/usr/bin/perl" > test &&
+        git add test &&
+        git commit -m "Add test" &&
+        gitweb_run "p=.git;a=blob;f=test"'
+
 # ----------------------------------------------------------------------
 # forks of projects
 
@@ -779,7 +787,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"'