diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-01-21 08:44:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-21 08:44:54 -0800 |
| commit | 7b39a128c814a2362d0533c7df0ab7a2fef6fa4b (patch) | |
| tree | 6f348b269516bb30655e03ef6a637609d007c5d2 /builtin/grep.c | |
| parent | Merge branch 'jt/fsck-skiplist-parse-fix' (diff) | |
| parent | match-trees: stop using `the_repository` (diff) | |
| download | git-7b39a128c814a2362d0533c7df0ab7a2fef6fa4b.tar.gz git-7b39a128c814a2362d0533c7df0ab7a2fef6fa4b.zip | |
Merge branch 'ps/the-repository'
More code paths have a repository passed through the callchain,
instead of assuming the primary the_repository object.
* ps/the-repository:
match-trees: stop using `the_repository`
graph: stop using `the_repository`
add-interactive: stop using `the_repository`
tmp-objdir: stop using `the_repository`
resolve-undo: stop using `the_repository`
credential: stop using `the_repository`
mailinfo: stop using `the_repository`
diagnose: stop using `the_repository`
server-info: stop using `the_repository`
send-pack: stop using `the_repository`
serve: stop using `the_repository`
trace: stop using `the_repository`
pager: stop using `the_repository`
progress: stop using `the_repository`
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index d00ee76f24..d1427290f7 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1084,7 +1084,7 @@ int cmd_grep(int argc, } if (show_in_pager == default_pager) - show_in_pager = git_pager(1); + show_in_pager = git_pager(the_repository, 1); if (show_in_pager) { opt.color = 0; opt.name_only = 1; @@ -1246,7 +1246,7 @@ int cmd_grep(int argc, } if (!show_in_pager && !opt.status_only) - setup_pager(); + setup_pager(the_repository); die_for_incompatible_opt3(!use_index, "--no-index", untracked, "--untracked", |