mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 20:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

grep: don't set up a "default" repo for grep

Browse Source 
`init_grep_defaults()` fills a `static struct grep_opt grep_defaults`.
This struct is then used by `grep_init()` as a blueprint for other such
structs. Notably, `grep_init()` takes a `struct repo *` and assigns it
into the target struct.

As a result, it is unnecessary for us to take a `struct repo *` in
`init_grep_defaults()` as well. We assign it into the default struct and
never look at it again. And in light of how we return early if we have
already set up the default struct, it's not just unnecessary, but is
also a bit confusing: If we are called twice and with different repos,
is it a bug or a feature that we ignore the second repo?

Drop the repo parameter for `init_grep_defaults()`.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin Ågren 2020-11-21 19:31:07 +01:00 committed by Junio C Hamano
parent faefdd61ec
commit 1d3878799f
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/MyFirstObjectWalk.txt
View File

@ -394,7 +394,7 @@ First some setup. Add `init_grep_defaults()` to `init_walken_defaults()` and add
----
static void init_walken_defaults(void)
{
init_grep_defaults(the_repository);
init_grep_defaults();
}
...

2
builtin/grep.c
View File

@ -950,7 +950,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
OPT_END()
};
init_grep_defaults(the_repository);
init_grep_defaults();
git_config(grep_cmd_config, NULL);
grep_init(&opt, the_repository, prefix);

2
builtin/log.c
View File

@ -131,7 +131,7 @@ static int log_line_range_callback(const struct option *option, const char *arg,
static void init_log_defaults(void)
{
init_grep_defaults(the_repository);
init_grep_defaults();
init_diff_ui_defaults();
decoration_style = auto_decoration_style();

3
grep.c
View File

@ -57,7 +57,7 @@ static void color_set(char *dst, const char *color_bytes)
* We could let the compiler do this, but without C99 initializers
* the code gets unwieldy and unreadable, so...
*/
void init_grep_defaults(struct repository *repo)
void init_grep_defaults(void)
{
struct grep_opt *opt = &grep_defaults;
static int run_once;
@ -67,7 +67,6 @@ void init_grep_defaults(struct repository *repo)
run_once++;
memset(opt, 0, sizeof(*opt));
opt->repo = repo;
opt->relative = 1;
opt->pathname = 1;
opt->max_depth = -1;

2
grep.h
View File

@ -170,7 +170,7 @@ struct grep_opt {
void *output_priv;
};
void init_grep_defaults(struct repository *);
void init_grep_defaults(void);
int grep_config(const char *var, const char *value, void *);
void grep_init(struct grep_opt *, struct repository *repo, const char *prefix);
void grep_destroy(void);

2
revision.c
View File

@ -1834,7 +1834,7 @@ void repo_init_revisions(struct repository *r,
revs->commit_format = CMIT_FMT_DEFAULT;
revs->expand_tabs_in_log_default = 8;
init_grep_defaults(revs->repo);
init_grep_defaults();
grep_init(&revs->grep_filter, revs->repo, prefix);
revs->grep_filter.status_only = 1;