Skip to contentSkip to conversation

git: pager behaviour

RFC PATCH New Matthew Bystrin 1 participant 2 messages Nov 4, 2024

lore
Share & tools
lore
#0 lore raw

cover git: pager behaviour

I've recently discovered that launching --edit with --paginate breaks everything. Is this an expected behaviour? I proposed a possible solution in this patch. However it is turned out that situation with pager is more complicated than expected.

This patch does not fix notes command and even does not pass "t7006.24 git tag -a respects --paginate" test. Interesting point to mention is that notes edit command can be also broken with -c pager.notes=1.

Relates: cd878a206e8c (t7006: add tests for how git config paginates)

Matthew Bystrin (1):
git: ignore paginate for commands with DELAY_PAGER_CONFIG

 git.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.43.0
#1 lore raw

RFC PATCH 1/1 git: ignore paginate for commands with DELAY_PAGER_CONFIG

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.

---
 git.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
git.c +3 -2
index c2c1b8e22c..2b3b049f4a 100644
@@ -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();
Signature · 1 line
2.43.0