summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-23 00:08:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-23 00:08:16 (GMT)
commit78bc024ab075f4d5d9cc0b6540b538f3d93d04cb (patch)
treedfafe6826227f4ec130048dba711da3643722873 /revision.c
parent4ca1b623865a9dc100f95a7867e35a9f73d7507a (diff)
parente2b53e58081e6a30309625fc6194ccb42772846b (diff)
downloadgit-78bc024ab075f4d5d9cc0b6540b538f3d93d04cb.zip
git-78bc024ab075f4d5d9cc0b6540b538f3d93d04cb.tar.gz
git-78bc024ab075f4d5d9cc0b6540b538f3d93d04cb.tar.bz2
Merge branch 'il/rev-glob'
* il/rev-glob: Documentation: improve description of --glob=pattern and friends rev-parse --branches/--tags/--remotes=pattern rev-parse --glob
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c34
1 files changed, 32 insertions, 2 deletions
diff --git a/revision.c b/revision.c
index 4e1a299..f54d43f 100644
--- a/revision.c
+++ b/revision.c
@@ -700,12 +700,18 @@ static int handle_one_ref(const char *path, const unsigned char *sha1, int flag,
return 0;
}
+static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
+ unsigned flags)
+{
+ cb->all_revs = revs;
+ cb->all_flags = flags;
+}
+
static void handle_refs(struct rev_info *revs, unsigned flags,
int (*for_each)(each_ref_fn, void *))
{
struct all_refs_cb cb;
- cb.all_revs = revs;
- cb.all_flags = flags;
+ init_all_refs_cb(&cb, revs, flags);
for_each(handle_one_ref, &cb);
}
@@ -1362,6 +1368,30 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
handle_refs(revs, flags, for_each_remote_ref);
continue;
}
+ if (!prefixcmp(arg, "--glob=")) {
+ struct all_refs_cb cb;
+ init_all_refs_cb(&cb, revs, flags);
+ for_each_glob_ref(handle_one_ref, arg + 7, &cb);
+ continue;
+ }
+ if (!prefixcmp(arg, "--branches=")) {
+ struct all_refs_cb cb;
+ init_all_refs_cb(&cb, revs, flags);
+ for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
+ continue;
+ }
+ if (!prefixcmp(arg, "--tags=")) {
+ struct all_refs_cb cb;
+ init_all_refs_cb(&cb, revs, flags);
+ for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
+ continue;
+ }
+ if (!prefixcmp(arg, "--remotes=")) {
+ struct all_refs_cb cb;
+ init_all_refs_cb(&cb, revs, flags);
+ for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
+ continue;
+ }
if (!strcmp(arg, "--reflog")) {
handle_reflog(revs, flags);
continue;