Merge branch 'gp/forbid-describe-all-match' into pu

gitster · gitster · commit e3af72cdafab · 2013-02-27T10:20:19.000-08:00
Not sure if we should forbid the combination or explain the
semantics better, perhaps by giving a better synonym to "--all",
which meant "disable the usual limit that only gives the annotated
tags".

* gp/forbid-describe-all-match:
  describe: make --all and --match=PATTERN mutually incompatible
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
@@ -83,7 +83,8 @@ OPTIONS
 --match <pattern>::
 	Only consider tags matching the given `glob(7)` pattern,
 	excluding the "refs/tags/" prefix.  This can be used to avoid
-	leaking private tags from the repository.
+	leaking private tags from the repository.  This option is
+	incompatible with `--all`.
 
 --always::
 	Show uniquely abbreviated commit object as fallback.
diff --git a/builtin/describe.c b/builtin/describe.c
@@ -435,6 +435,9 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 	if (longformat && abbrev == 0)
 		die(_("--long is incompatible with --abbrev=0"));
 
+	if (pattern && all)
+		die(_("--match is incompatible with --all"));
+
 	if (contains) {
 		const char **args = xmalloc((7 + argc) * sizeof(char *));
 		int i = 0;
