From 245b1c1c4859d4e5636dd2d3bccb3e4d3c44558e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 28 May 2025 14:56:08 +0200 Subject: [PATCH] ci/check-cherry-picks: never use a pager In a small terminal window this would just stop running after each commit until you exit the pager. That's not what we want when running it locally. --- ci/check-cherry-picks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh index 44924ab8d8ab..dd8e9bb0ca19 100755 --- a/ci/check-cherry-picks.sh +++ b/ci/check-cherry-picks.sh @@ -52,7 +52,7 @@ while read -r new_commit_sha ; do if git merge-base --is-ancestor "$original_commit_sha" "$picked_branch" ; then echo " ✔ $original_commit_sha present in branch $picked_branch" - range_diff_common='git range-diff + range_diff_common='git --no-pager range-diff --no-notes --creation-factor=100 '"$original_commit_sha~..$original_commit_sha"'