Merge branch 'ch/am-header'

diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index be0959e8a34aed0bb722a72207dd1f6b993132a0..e5040580626f4df6159c929c1ad54f085f03d830 100755 (executable)
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -65,6 +65,11 @@ test_expect_success 'test --parseopt with --' '
        test_cmp expect output
 '
 
+test_expect_success 'test --parseopt --stop-at-non-option' '
+       git rev-parse --parseopt --stop-at-non-option -- --foo arg --bar=ham < optionspec > output &&
+       test_cmp expect output
+'
+
 cat > expect <<EOF
 set -- --foo -- '--' 'arg' '--bar=ham'
 EOF