merge: use return value of resolve_ref() to determine if HEAD is invalid

diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index fb8291c812854608777dd8d35edfcda78df5069a..f00cebff3e42cf0a38d06a03b6f14ef08dd16372 100755 (executable)
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -69,6 +69,18 @@ test_expect_success 'rev-parse --glob=heads/subspace' '
 
 '
 
+test_expect_failure 'rev-parse accepts --glob as detached option' '
+
+       compare rev-parse "subspace/one subspace/two" "--glob heads/subspace"
+
+'
+
+test_expect_failure 'rev-parse is not confused by option-like glob' '
+
+       compare rev-parse "master" "--glob --symbolic master"
+
+'
+
 test_expect_success 'rev-parse --branches=subspace/*' '
 
        compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
@@ -129,6 +141,12 @@ test_expect_success 'rev-list --glob refs/heads/subspace/*' '
 
 '
 
+test_expect_success 'rev-list not confused by option-like --glob arg' '
+
+       compare rev-list "master" "--glob -0 master"
+
+'
+
 test_expect_success 'rev-list --glob=heads/subspace/*' '
 
        compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
@@ -213,4 +231,36 @@ test_expect_success 'rev-list --remotes=foo' '
 
 '
 
+test_expect_success 'shortlog accepts --glob/--tags/--remotes' '
+
+       compare shortlog "subspace/one subspace/two" --branches=subspace &&
+       compare shortlog \
+         "master subspace-x someref other/three subspace/one subspace/two" \
+         --branches &&
+       compare shortlog master "--glob=heads/someref/* master" &&
+       compare shortlog "subspace/one subspace/two other/three" \
+         "--glob=heads/subspace/* --glob=heads/other/*" &&
+       compare shortlog \
+         "master other/three someref subspace-x subspace/one subspace/two" \
+         "--glob=heads/*" &&
+       compare shortlog foo/bar --tags=foo &&
+       compare shortlog foo/bar --tags &&
+       compare shortlog foo/baz --remotes=foo
+
+'
+
+test_expect_failure 'shortlog accepts --glob as detached option' '
+
+       compare shortlog \
+         "master other/three someref subspace-x subspace/one subspace/two" \
+         "--glob heads/*"
+
+'
+
+test_expect_failure 'shortlog --glob is not confused by option-like argument' '
+
+       compare shortlog master "--glob -e master"
+
+'
+
 test_done