diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-04-03 15:03:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-03 15:03:05 -0700 |
| commit | 1e2574e5854e989f17d44f505f73278455b28eeb (patch) | |
| tree | 6d119a7ce6b96849436fda023e5980d2ce8c6a24 /revision.c | |
| parent | The 14th batch (diff) | |
| parent | pack-objects: lazily set up "struct rev_info", don't leak (diff) | |
| download | git-1e2574e5854e989f17d44f505f73278455b28eeb.tar.gz git-1e2574e5854e989f17d44f505f73278455b28eeb.zip | |
Merge branch 'ds/partial-bundle-more' into ab/plug-leak-in-revisions
* ds/partial-bundle-more:
pack-objects: lazily set up "struct rev_info", don't leak
bundle: output hash information in 'verify'
bundle: move capabilities to end of 'verify'
pack-objects: parse --filter directly into revs.filter
pack-objects: move revs out of get_object_list()
list-objects-filter: remove CL_ARG__FILTER
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/revision.c b/revision.c index 2646b78990..7d435f8048 100644 --- a/revision.c +++ b/revision.c @@ -2691,9 +2691,9 @@ static int handle_revision_pseudo_opt(struct rev_info *revs, revs->no_walk = 0; } else if (!strcmp(arg, "--single-worktree")) { revs->single_worktree = 1; - } else if (skip_prefix(arg, ("--" CL_ARG__FILTER "="), &arg)) { + } else if (skip_prefix(arg, ("--filter="), &arg)) { parse_list_objects_filter(&revs->filter, arg); - } else if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) { + } else if (!strcmp(arg, ("--no-filter"))) { list_objects_filter_set_no_filter(&revs->filter); } else { return 0; |