log: parse separate option for --glob
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7d7b86f75f
commit
5adba90d94
@ -1484,6 +1484,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
||||
{
|
||||
int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
|
||||
const char **prune_data = NULL;
|
||||
const char *optarg;
|
||||
int argcount;
|
||||
|
||||
/* First, search for "--" */
|
||||
seen_dashdash = 0;
|
||||
@ -1530,10 +1532,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
||||
handle_refs(revs, flags, for_each_remote_ref);
|
||||
continue;
|
||||
}
|
||||
if (!prefixcmp(arg, "--glob=")) {
|
||||
if ((argcount = parse_long_opt("glob", argv + i, &optarg))) {
|
||||
struct all_refs_cb cb;
|
||||
i += argcount - 1;
|
||||
init_all_refs_cb(&cb, revs, flags);
|
||||
for_each_glob_ref(handle_one_ref, arg + 7, &cb);
|
||||
for_each_glob_ref(handle_one_ref, optarg, &cb);
|
||||
continue;
|
||||
}
|
||||
if (!prefixcmp(arg, "--branches=")) {
|
||||
|
@ -123,6 +123,12 @@ test_expect_success 'rev-list --glob=refs/heads/subspace/*' '
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'rev-list --glob refs/heads/subspace/*' '
|
||||
|
||||
compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'rev-list --glob=heads/subspace/*' '
|
||||
|
||||
compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
|
||||
|
Loading…
Reference in New Issue
Block a user