Skip to content

Commit

Permalink
revisions: initialize revs->grep_filter using grep_init()
Browse files Browse the repository at this point in the history
Instead of using the hand-rolled initialization sequence,
use grep_init() to populate the necessary bits.  This opens
the door to allow the calling commands to optionally read
grep.* configuration variables via git_config() if they
want to.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Oct 10, 2012
1 parent c5c31d3 commit 918d4e1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
5 changes: 5 additions & 0 deletions grep.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ static struct grep_opt grep_defaults;
void init_grep_defaults(void)
{
struct grep_opt *opt = &grep_defaults;
static int run_once;

if (run_once)
return;
run_once++;

memset(opt, 0, sizeof(*opt));
opt->relative = 1;
Expand Down
6 changes: 4 additions & 2 deletions revision.c
Original file line number Diff line number Diff line change
Expand Up @@ -1048,9 +1048,9 @@ void init_revisions(struct rev_info *revs, const char *prefix)

revs->commit_format = CMIT_FMT_DEFAULT;

init_grep_defaults();
grep_init(&revs->grep_filter, prefix);
revs->grep_filter.status_only = 1;
revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
revs->grep_filter.header_tail = &(revs->grep_filter.header_list);
revs->grep_filter.regflags = REG_NEWLINE;

diff_setup(&revs->diffopt);
Expand Down Expand Up @@ -1893,6 +1893,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
revs->diffopt.abbrev = revs->abbrev;
diff_setup_done(&revs->diffopt);

grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
&revs->grep_filter);
compile_grep_patterns(&revs->grep_filter);

if (revs->reverse && revs->reflog_info)
Expand Down

0 comments on commit 918d4e1

Please sign in to comment.