From d461aea78cbddc2f3d1a0fd312eea84039777009 Mon Sep 17 00:00:00 2001 From: y5c4l3 Date: Sat, 19 Oct 2024 20:39:50 +0000 Subject: [PATCH] diff: setup pager only before diff contents truly ready git-diff setups pager at an early stage in cmd_diff; running diff with invalid options like git diff --invalid will unexpectedly starts a pager, which causes behavior inconsistency. The pager setup routine should be moved right before the real diff contents, in case there is any argv error. Signed-off-by: y5c4l3 Signed-off-by: Taylor Blau --- builtin/diff.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin/diff.c b/builtin/diff.c index dca52d4221ed19..033401737007c0 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -105,6 +105,7 @@ static void builtin_diff_b_f(struct rev_info *revs, 1, 0, blob[0]->path ? blob[0]->path : path, path); + setup_diff_pager(&revs->diffopt); diffcore_std(&revs->diffopt); diff_flush(&revs->diffopt); } @@ -129,6 +130,7 @@ static void builtin_diff_blobs(struct rev_info *revs, &blob[0]->item->oid, &blob[1]->item->oid, 1, 1, blob_path(blob[0]), blob_path(blob[1])); + setup_diff_pager(&revs->diffopt); diffcore_std(&revs->diffopt); diff_flush(&revs->diffopt); } @@ -164,6 +166,7 @@ static void builtin_diff_index(struct rev_info *revs, } else if (repo_read_index(the_repository) < 0) { die_errno("repo_read_cache"); } + setup_diff_pager(&revs->diffopt); run_diff_index(revs, option); } @@ -201,6 +204,7 @@ static void builtin_diff_tree(struct rev_info *revs, oid[swap] = &ent0->item->oid; oid[1 - swap] = &ent1->item->oid; } + setup_diff_pager(&revs->diffopt); diff_tree_oid(oid[0], oid[1], "", &revs->diffopt); log_tree_diff_flush(revs); } @@ -227,6 +231,7 @@ static void builtin_diff_combined(struct rev_info *revs, if (i != first_non_parent) oid_array_append(&parents, &ent[i].item->oid); } + setup_diff_pager(&revs->diffopt); diff_tree_combined(&ent[first_non_parent].item->oid, &parents, revs); oid_array_clear(&parents); } @@ -283,6 +288,7 @@ static void builtin_diff_files(struct rev_info *revs, int argc, const char **arg 0) < 0) { die_errno("repo_read_index_preload"); } + setup_diff_pager(&revs->diffopt); run_diff_files(revs, options); } @@ -523,8 +529,6 @@ int cmd_diff(int argc, rev.diffopt.flags.recursive = 1; rev.diffopt.rotate_to_strict = 1; - setup_diff_pager(&rev.diffopt); - /* * Do we have --cached and not have a pending object, then * default to HEAD by hand. Eek.