Skip to content

Commit 26a3728

Browse files
gitstergitster
committed
Merge branch 'al/ref-filter-merged-and-no-merged'
"git for-each-ref" and friends that list refs used to allow only one --merged or --no-merged to filter them; they learned to take combination of both kind of filtering. * al/ref-filter-merged-and-no-merged: Doc: prefer more specific file name ref-filter: make internal reachable-filter API more precise ref-filter: allow merged and no-merged filters Doc: cover multiple contains/no-contains filters t3201: test multiple branch filter combinations
2 parents 4d51525 + b59cdff commit 26a3728

File tree

13 files changed

+140
-77
lines changed

13 files changed

+140
-77
lines changed

‎Documentation/git-branch.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SYNOPSIS
1111
'git branch' [--color[=<when>] | --no-color] [--show-current]
1212
[-v [--abbrev=<length> | --no-abbrev]]
1313
[--column[=<options>] | --no-column] [--sort=<key>]
14-
[(--merged | --no-merged) [<commit>]]
14+
[--merged [<commit>]] [--no-merged [<commit>]]
1515
[--contains [<commit>]] [--no-contains [<commit>]]
1616
[--points-at <object>] [--format=<format>]
1717
[(-r | --remotes) | (-a | --all)]
@@ -252,13 +252,11 @@ start-point is either a local or remote-tracking branch.
252252

253253
--merged [<commit>]::
254254
Only list branches whose tips are reachable from the
255-
specified commit (HEAD if not specified). Implies `--list`,
256-
incompatible with `--no-merged`.
255+
specified commit (HEAD if not specified). Implies `--list`.
257256

258257
--no-merged [<commit>]::
259258
Only list branches whose tips are not reachable from the
260-
specified commit (HEAD if not specified). Implies `--list`,
261-
incompatible with `--merged`.
259+
specified commit (HEAD if not specified). Implies `--list`.
262260

263261
<branchname>::
264262
The name of the branch to create or delete.
@@ -370,6 +368,8 @@ serve four related but different purposes:
370368
- `--no-merged` is used to find branches which are candidates for merging
371369
into HEAD, since those branches are not fully contained by HEAD.
372370

371+
include::ref-reachability-filters.txt[]
372+
373373
SEE ALSO
374374
--------
375375
linkgit:git-check-ref-format[1],

‎Documentation/git-for-each-ref.txt‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SYNOPSIS
1111
'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
1212
[(--sort=<key>)...] [--format=<format>] [<pattern>...]
1313
[--points-at=<object>]
14-
(--merged[=<object>] | --no-merged[=<object>])
14+
[--merged[=<object>]] [--no-merged[=<object>]]
1515
[--contains[=<object>]] [--no-contains[=<object>]]
1616

1717
DESCRIPTION
@@ -76,13 +76,11 @@ OPTIONS
7676

7777
--merged[=<object>]::
7878
Only list refs whose tips are reachable from the
79-
specified commit (HEAD if not specified),
80-
incompatible with `--no-merged`.
79+
specified commit (HEAD if not specified).
8180

8281
--no-merged[=<object>]::
8382
Only list refs whose tips are not reachable from the
84-
specified commit (HEAD if not specified),
85-
incompatible with `--merged`.
83+
specified commit (HEAD if not specified).
8684

8785
--contains[=<object>]::
8886
Only list refs which contain the specified commit (HEAD if not
@@ -408,6 +406,11 @@ Note also that multiple copies of an object may be present in the object
408406
database; in this case, it is undefined which copy's size or delta base
409407
will be reported.
410408

409+
NOTES
410+
-----
411+
412+
include::ref-reachability-filters.txt[]
413+
411414
SEE ALSO
412415
--------
413416
linkgit:git-show-ref[1]

‎Documentation/git-tag.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ SYNOPSIS
1515
'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
1616
[--points-at <object>] [--column[=<options>] | --no-column]
1717
[--create-reflog] [--sort=<key>] [--format=<format>]
18-
[--[no-]merged [<commit>]] [<pattern>...]
18+
[--merged <commit>] [--no-merged <commit>] [<pattern>...]
1919
'git tag' -v [--format=<format>] <tagname>...
2020

2121
DESCRIPTION
@@ -149,11 +149,11 @@ This option is only applicable when listing tags without annotation lines.
149149

150150
--merged [<commit>]::
151151
Only list tags whose commits are reachable from the specified
152-
commit (`HEAD` if not specified), incompatible with `--no-merged`.
152+
commit (`HEAD` if not specified).
153153

154154
--no-merged [<commit>]::
155155
Only list tags whose commits are not reachable from the specified
156-
commit (`HEAD` if not specified), incompatible with `--merged`.
156+
commit (`HEAD` if not specified).
157157

158158
--points-at <object>::
159159
Only list tags of the given object (HEAD if not
@@ -377,6 +377,11 @@ $ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1
377377

378378
include::date-formats.txt[]
379379

380+
NOTES
381+
-----
382+
383+
include::ref-reachability-filters.txt[]
384+
380385
SEE ALSO
381386
--------
382387
linkgit:git-check-ref-format[1].

‎Documentation/ref-reachability-filters.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
When combining multiple `--contains` and `--no-contains` filters, only
2+
references that contain at least one of the `--contains` commits and
3+
contain none of the `--no-contains` commits are shown.
4+
5+
When combining multiple `--merged` and `--no-merged` filters, only
6+
references that are reachable from at least one of the `--merged`
7+
commits and from none of the `--no-merged` commits are shown.

‎builtin/branch.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "commit-reach.h"
2727

2828
static const char * const builtin_branch_usage[] = {
29-
N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"),
29+
N_("git branch [<options>] [-r | -a] [--merged] [--no-merged]"),
3030
N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
3131
N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
3232
N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
@@ -688,8 +688,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
688688
!show_current && !unset_upstream && argc == 0)
689689
list = 1;
690690

691-
if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE || filter.points_at.nr ||
692-
filter.no_commit)
691+
if (filter.with_commit || filter.no_commit ||
692+
filter.reachable_from || filter.unreachable_from || filter.points_at.nr)
693693
list = 1;
694694

695695
if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current +

‎builtin/for-each-ref.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
static char const * const for_each_ref_usage[] = {
1010
N_("git for-each-ref [<options>] [<pattern>]"),
1111
N_("git for-each-ref [--points-at <object>]"),
12-
N_("git for-each-ref [(--merged | --no-merged) [<commit>]]"),
12+
N_("git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"),
1313
N_("git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"),
1414
NULL
1515
};

‎builtin/tag.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static const char * const git_tag_usage[] = {
2626
"\t\t<tagname> [<head>]"),
2727
N_("git tag -d <tagname>..."),
2828
N_("git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
29-
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"),
29+
"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"),
3030
N_("git tag -v [--format=<format>] <tagname>..."),
3131
NULL
3232
};
@@ -457,8 +457,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
457457
if (argc == 0)
458458
cmdmode = 'l';
459459
else if (filter.with_commit || filter.no_commit ||
460-
filter.points_at.nr || filter.merge_commit ||
461-
filter.lines != -1)
460+
filter.reachable_from || filter.unreachable_from ||
461+
filter.points_at.nr || filter.lines != -1)
462462
cmdmode = 'l';
463463
}
464464

@@ -509,7 +509,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
509509
die(_("--no-contains option is only allowed in list mode"));
510510
if (filter.points_at.nr)
511511
die(_("--points-at option is only allowed in list mode"));
512-
if (filter.merge_commit)
512+
if (filter.reachable_from || filter.unreachable_from)
513513
die(_("--merged and --no-merged options are only allowed in list mode"));
514514
if (cmdmode == 'd')
515515
return for_each_tag_name(argv, delete_tag, NULL);

‎ref-filter.c‎

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2167,9 +2167,9 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid,
21672167
* obtain the commit using the 'oid' available and discard all
21682168
* non-commits early. The actual filtering is done later.
21692169
*/
2170-
if (filter->merge_commit || filter->with_commit || filter->no_commit || filter->verbose) {
2171-
commit = lookup_commit_reference_gently(the_repository, oid,
2172-
1);
2170+
if (filter->reachable_from || filter->unreachable_from ||
2171+
filter->with_commit || filter->no_commit || filter->verbose) {
2172+
commit = lookup_commit_reference_gently(the_repository, oid, 1);
21732173
if (!commit)
21742174
return 0;
21752175
/* We perform the filtering for the '--contains' option... */
@@ -2231,13 +2231,19 @@ void ref_array_clear(struct ref_array *array)
22312231
}
22322232
}
22332233

2234-
static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
2234+
#define EXCLUDE_REACHED 0
2235+
#define INCLUDE_REACHED 1
2236+
static void reach_filter(struct ref_array *array,
2237+
struct commit_list *check_reachable,
2238+
int include_reached)
22352239
{
22362240
struct rev_info revs;
22372241
int i, old_nr;
2238-
struct ref_filter *filter = ref_cbdata->filter;
2239-
struct ref_array *array = ref_cbdata->array;
22402242
struct commit **to_clear = xcalloc(sizeof(struct commit *), array->nr);
2243+
struct commit_list *cr;
2244+
2245+
if (!check_reachable)
2246+
return;
22412247

22422248
repo_init_revisions(the_repository, &revs, NULL);
22432249

@@ -2247,8 +2253,11 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
22472253
to_clear[i] = item->commit;
22482254
}
22492255

2250-
filter->merge_commit->object.flags |= UNINTERESTING;
2251-
add_pending_object(&revs, &filter->merge_commit->object, "");
2256+
for (cr = check_reachable; cr; cr = cr->next) {
2257+
struct commit *merge_commit = cr->item;
2258+
merge_commit->object.flags |= UNINTERESTING;
2259+
add_pending_object(&revs, &merge_commit->object, "");
2260+
}
22522261

22532262
revs.limited = 1;
22542263
if (prepare_revision_walk(&revs))
@@ -2263,14 +2272,19 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
22632272

22642273
int is_merged = !!(commit->object.flags & UNINTERESTING);
22652274

2266-
if (is_merged == (filter->merge == REF_FILTER_MERGED_INCLUDE))
2275+
if (is_merged == include_reached)
22672276
array->items[array->nr++] = array->items[i];
22682277
else
22692278
free_array_item(item);
22702279
}
22712280

22722281
clear_commit_marks_many(old_nr, to_clear, ALL_REV_FLAGS);
2273-
clear_commit_marks(filter->merge_commit, ALL_REV_FLAGS);
2282+
2283+
while (check_reachable) {
2284+
struct commit *merge_commit = pop_commit(&check_reachable);
2285+
clear_commit_marks(merge_commit, ALL_REV_FLAGS);
2286+
}
2287+
22742288
free(to_clear);
22752289
}
22762290

@@ -2322,8 +2336,8 @@ int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int
23222336
clear_contains_cache(&ref_cbdata.no_contains_cache);
23232337

23242338
/* Filters that need revision walking */
2325-
if (filter->merge_commit)
2326-
do_merge_filter(&ref_cbdata);
2339+
reach_filter(array, filter->reachable_from, INCLUDE_REACHED);
2340+
reach_filter(array, filter->unreachable_from, EXCLUDE_REACHED);
23272341

23282342
return ret;
23292343
}
@@ -2541,31 +2555,22 @@ int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset)
25412555
{
25422556
struct ref_filter *rf = opt->value;
25432557
struct object_id oid;
2544-
int no_merged = starts_with(opt->long_name, "no");
2558+
struct commit *merge_commit;
25452559

25462560
BUG_ON_OPT_NEG(unset);
25472561

2548-
if (rf->merge) {
2549-
if (no_merged) {
2550-
return error(_("option `%s' is incompatible with --merged"),
2551-
opt->long_name);
2552-
} else {
2553-
return error(_("option `%s' is incompatible with --no-merged"),
2554-
opt->long_name);
2555-
}
2556-
}
2557-
2558-
rf->merge = no_merged
2559-
? REF_FILTER_MERGED_OMIT
2560-
: REF_FILTER_MERGED_INCLUDE;
2561-
25622562
if (get_oid(arg, &oid))
25632563
die(_("malformed object name %s"), arg);
25642564

2565-
rf->merge_commit = lookup_commit_reference_gently(the_repository,
2566-
&oid, 0);
2567-
if (!rf->merge_commit)
2565+
merge_commit = lookup_commit_reference_gently(the_repository, &oid, 0);
2566+
2567+
if (!merge_commit)
25682568
return error(_("option `%s' must point to a commit"), opt->long_name);
25692569

2570+
if (starts_with(opt->long_name, "no"))
2571+
commit_list_insert(merge_commit, &rf->unreachable_from);
2572+
else
2573+
commit_list_insert(merge_commit, &rf->reachable_from);
2574+
25702575
return 0;
25712576
}

‎ref-filter.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,8 @@ struct ref_filter {
5454
struct oid_array points_at;
5555
struct commit_list *with_commit;
5656
struct commit_list *no_commit;
57-
58-
enum {
59-
REF_FILTER_MERGED_NONE = 0,
60-
REF_FILTER_MERGED_INCLUDE,
61-
REF_FILTER_MERGED_OMIT
62-
} merge;
63-
struct commit *merge_commit;
57+
struct commit_list *reachable_from;
58+
struct commit_list *unreachable_from;
6459

6560
unsigned int with_commit_tag_algo : 1,
6661
match_as_path : 1,

‎t/t3200-branch.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,10 +1299,6 @@ test_expect_success '--merged catches invalid object names' '
12991299
test_must_fail git branch --merged 0000000000000000000000000000000000000000
13001300
'
13011301

1302-
test_expect_success '--merged is incompatible with --no-merged' '
1303-
test_must_fail git branch --merged HEAD --no-merged HEAD
1304-
'
1305-
13061302
test_expect_success '--list during rebase' '
13071303
test_when_finished "reset_rebase" &&
13081304
git checkout master &&

0 commit comments

Comments
 (0)