undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

name-rev: introduce the --refs=<pattern> option

Browse Source 
Instead of (or, in addition to) --tags, to use only tags for naming,
you can now use --refs=<pattern> to specify a shell glob pattern
which the refs must match to be used for naming.

Example:

	$ git name-rev --refs=*v1* 33db5f4d
	33db5f4d tags/v1.0rc1^0~1593

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin 2007-02-17 19:22:35 +01:00 committed by Junio C Hamano
parent 53756f290b
commit 2afc29aa84
2 changed files with 22 additions and 7 deletions

6
Documentation/git-name-rev.txt
View File

@ -8,7 +8,8 @@ git-name-rev - Find symbolic names for given revs
SYNOPSIS SYNOPSIS
-------- --------
'git-name-rev' [--tags] ( --all | --stdin | <committish>... ) 'git-name-rev' [--tags] [--refs=<pattern>]
( --all | --stdin | <committish>... )
DESCRIPTION DESCRIPTION
----------- -----------
@ -22,6 +23,9 @@ OPTIONS
--tags:: --tags::
Do not use branch names, but only tags to name the commits Do not use branch names, but only tags to name the commits
--refs=<pattern>::
Only use refs whose names match a given shell pattern.
--all:: --all::
List all commits reachable from all refs List all commits reachable from all refs

23
builtin-name-rev.c
View File

@ -5,7 +5,7 @@
#include "refs.h" #include "refs.h"
static const char name_rev_usage[] = static const char name_rev_usage[] =
"git-name-rev [--tags] ( --all | --stdin | committish [committish...] )\n"; "git-name-rev [--tags | --refs=<pattern>] ( --all | --stdin | committish [committish...] )\n";
typedef struct rev_name { typedef struct rev_name {
const char *tip_name; const char *tip_name;
@ -74,13 +74,21 @@ copy_data:
} }
} }
struct name_ref_data {
int tags_only;
const char *ref_filter;
};
static int name_ref(const char *path, const unsigned char *sha1, int flags, void *cb_data) static int name_ref(const char *path, const unsigned char *sha1, int flags, void *cb_data)
{ {
struct object *o = parse_object(sha1); struct object *o = parse_object(sha1);
int tags_only = *(int*)cb_data; struct name_ref_data *data = cb_data;
int deref = 0; int deref = 0;
if (tags_only && strncmp(path, "refs/tags/", 10)) if (data->tags_only && strncmp(path, "refs/tags/", 10))
return 0;
if (data->ref_filter && fnmatch(data->ref_filter, path, 0))
return 0; return 0;
while (o && o->type == OBJ_TAG) { while (o && o->type == OBJ_TAG) {
@ -129,7 +137,7 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
{ {
struct object_array revs = { 0, 0, NULL }; struct object_array revs = { 0, 0, NULL };
int as_is = 0, all = 0, transform_stdin = 0; int as_is = 0, all = 0, transform_stdin = 0;
int tags_only = 0; struct name_ref_data data = { 0, NULL };
git_config(git_default_config); git_config(git_default_config);
@ -146,7 +154,10 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
as_is = 1; as_is = 1;
continue; continue;
} else if (!strcmp(*argv, "--tags")) { } else if (!strcmp(*argv, "--tags")) {
tags_only = 1; data.tags_only = 1;
continue;
} else if (!strncmp(*argv, "--refs=", 7)) {
data.ref_filter = *argv + 7;
continue; continue;
} else if (!strcmp(*argv, "--all")) { } else if (!strcmp(*argv, "--all")) {
if (argc > 1) if (argc > 1)
@ -185,7 +196,7 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
add_object_array((struct object *)commit, *argv, &revs); add_object_array((struct object *)commit, *argv, &revs);
} }
for_each_ref(name_ref, &tags_only); for_each_ref(name_ref, &data);
if (transform_stdin) { if (transform_stdin) {
char buffer[2048]; char buffer[2048];