diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-02-17 19:22:35 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-17 11:26:49 -0800 |
| commit | 2afc29aa84f518906c50a1f005e3d715babb5c20 (patch) | |
| tree | 6f5e4935aa05e394408a30bfc051f1eb79e7de8f /builtin-name-rev.c | |
| parent | 53756f290b94a0f8ee7021713fa63540d1a7e4e8 (diff) | |
| download | git-2afc29aa84f518906c50a1f005e3d715babb5c20.tar.gz | |
name-rev: introduce the --refs=<pattern> option
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>
Diffstat (limited to 'builtin-name-rev.c')
| -rw-r--r-- | builtin-name-rev.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/builtin-name-rev.c b/builtin-name-rev.c index b4f15cc38a..36f1ba6d38 100644 --- a/builtin-name-rev.c +++ b/builtin-name-rev.c @@ -5,7 +5,7 @@ #include "refs.h" 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 { 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) { struct object *o = parse_object(sha1); - int tags_only = *(int*)cb_data; + struct name_ref_data *data = cb_data; 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; 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 }; 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); @@ -146,7 +154,10 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix) as_is = 1; continue; } 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; } else if (!strcmp(*argv, "--all")) { 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); } - for_each_ref(name_ref, &tags_only); + for_each_ref(name_ref, &data); if (transform_stdin) { char buffer[2048]; |