diff mbox series

[RFC,1/1] git: ignore paginate for commands with DELAY_PAGER_CONFIG

Message ID 20241104140536.4970-2-dev.mbstr@gmail.com (mailing list archive)
State New
Headers show
Series git: pager behaviour | expand

Commit Message

Matthew Bystrin Nov. 4, 2024, 2:05 p.m. UTC 
Calling commands using editor in terminal with `--paginate` option break
things. For example `git --paginate config --edit`. Add extra check to
ignore paginate flag in case command have DELAY_PAGER_CONFIG set.

Signed-off-by: Matthew Bystrin <dev.mbstr@gmail.com>
---
 git.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/git.c b/git.c
index c2c1b8e22c..2b3b049f4a 100644
--- a/git.c
+++ b/git.c
@@ -464,11 +464,12 @@  static int run_builtin(struct cmd_struct *p, int argc, const char **argv, struct
 	}
 	assert(!prefix || *prefix);
 	precompose_argv_prefix(argc, argv, NULL);
-	if (use_pager == -1 && run_setup &&
-		!(p->option & DELAY_PAGER_CONFIG))
+	if (use_pager == -1 && run_setup && !(p->option & DELAY_PAGER_CONFIG))
 		use_pager = check_pager_config(p->cmd);
 	if (use_pager == -1 && p->option & USE_PAGER)
 		use_pager = 1;
+	if (use_pager == 1 && (p->option & DELAY_PAGER_CONFIG))
+		use_pager = 0;
 	if (run_setup && startup_info->have_repository)
 		/* get_git_dir() may set up repo, avoid that */
 		trace_repo_setup();