kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-describe: Add a --match option to limit considered tags. 

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Pierre Habouzit 2007-12-21 22:49:54 +01:00 committed by Junio C Hamano
parent cc21682793
commit 30ffa60377
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-describe.txt
View File

@ -51,6 +51,10 @@ OPTIONS
being employed to standard error. The tag name will still being employed to standard error. The tag name will still
be printed to standard out. be printed to standard out.


--match <pattern>::
Only consider tags matching the given pattern (can be used to avoid
leaking private tags made from the repository).

EXAMPLES EXAMPLES
-------- --------



19
builtin-describe.c
View File

@ -19,6 +19,7 @@ static int all; /* Default to annotated tags only */
static int tags; /* But allow any tags if --tags is specified */ static int tags; /* But allow any tags if --tags is specified */
static int abbrev = DEFAULT_ABBREV; static int abbrev = DEFAULT_ABBREV;
static int max_candidates = 10; static int max_candidates = 10;
const char *pattern = NULL;


struct commit_name { struct commit_name {
int prio; /* annotated tag = 2, tag = 1, head = 0 */ int prio; /* annotated tag = 2, tag = 1, head = 0 */
@ -57,9 +58,11 @@ static int get_name(const char *path, const unsigned char *sha1, int flag, void
* Otherwise only annotated tags are used. * Otherwise only annotated tags are used.
*/ */
if (!prefixcmp(path, "refs/tags/")) { if (!prefixcmp(path, "refs/tags/")) {
if (object->type == OBJ_TAG) if (object->type == OBJ_TAG) {
prio = 2; prio = 2;
else if (pattern && fnmatch(pattern, path + 10, 0))
prio = 0;
} else
prio = 1; prio = 1;
} }
else else
@ -254,6 +257,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
OPT__ABBREV(&abbrev), OPT__ABBREV(&abbrev),
OPT_INTEGER(0, "candidates", &max_candidates, OPT_INTEGER(0, "candidates", &max_candidates,
"consider <n> most recent tags (default: 10)"), "consider <n> most recent tags (default: 10)"),
OPT_STRING(0, "match", &pattern, "pattern",
"only consider tags matching <pattern>"),
OPT_END(), OPT_END(),
}; };


@ -266,12 +271,18 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
save_commit_buffer = 0; save_commit_buffer = 0;


if (contains) { if (contains) {
const char **args = xmalloc((4 + argc) * sizeof(char*)); const char **args = xmalloc((5 + argc) * sizeof(char*));
int i = 0; int i = 0;
args[i++] = "name-rev"; args[i++] = "name-rev";
args[i++] = "--name-only"; args[i++] = "--name-only";
if (!all) if (!all) {
args[i++] = "--tags"; args[i++] = "--tags";
if (pattern) {
char *s = xmalloc(strlen("--refs=refs/tags/") + strlen(pattern) + 1);
sprintf(s, "--refs=refs/tags/%s", pattern);
args[i++] = s;
}
}
memcpy(args + i, argv, argc * sizeof(char*)); memcpy(args + i, argv, argc * sizeof(char*));
args[i + argc] = NULL; args[i + argc] = NULL;
return cmd_name_rev(i + argc, args, prefix); return cmd_name_rev(i + argc, args, prefix);