git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"Eric Wong" <e@80x24.org>,
	"Prathamesh Chavan" <pc44800@gmail.com>,
	"Peter Baumann" <peter.baumann@gmail.com>,
	"Philippe Blain" <levraiphilippeblain@gmail.com>,
	"Andrei Rybak" <rybak.a.v@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 1/7] git-sh-setup: remove unused git_pager() function
Date: Mon,  6 Sep 2021 09:05:12 +0200	[thread overview]
Message-ID: <patch-v2-1.7-8eb1dfbff5d-20210906T070201Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-v2-0.7-00000000000-20210906T070201Z-avarab@gmail.com>

Remove the git_pager() function last referenced by non-test code in
49eb8d39c78 (Remove contrib/examples/*, 2018-03-25).

We can also remove the test for this added in 995bc22d7f8 (pager: move
pager-specific setup into the build, 2016-08-04), the test that
actually matters is the one added in e54c1f2d253 (pager: set LV=-c
alongside LESS=FRSX, 2014-01-06) just above the removed test.

I.e. we don't care if the "LESS" and "LV" variables are set by
git-sh-setup anymore, no built-in uses them, we do care that pager.c
sets them, which we still test for.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 git-sh-setup.sh  | 16 ----------------
 t/t7006-pager.sh | 13 -------------
 2 files changed, 29 deletions(-)

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 10d97641856..7ee4b0edff5 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -157,22 +157,6 @@ git_editor() {
 	eval "$GIT_EDITOR" '"$@"'
 }
 
-git_pager() {
-	if test -t 1
-	then
-		GIT_PAGER=$(git var GIT_PAGER)
-	else
-		GIT_PAGER=cat
-	fi
-	for vardef in @@PAGER_ENV@@
-	do
-		var=${vardef%%=*}
-		eval ": \"\${$vardef}\" && export $var"
-	done
-
-	eval "$GIT_PAGER" '"$@"'
-}
-
 sane_grep () {
 	GREP_OPTIONS= LC_ALL=C grep @@SANE_TEXT_GREP@@ "$@"
 }
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 0e7cf75435e..08f712a4497 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -49,19 +49,6 @@ test_expect_success TTY 'LESS and LV envvars are set for pagination' '
 	grep ^LV= pager-env.out
 '
 
-test_expect_success !MINGW,TTY 'LESS and LV envvars set by git-sh-setup' '
-	(
-		sane_unset LESS LV &&
-		PAGER="env >pager-env.out; wc" &&
-		export PAGER &&
-		PATH="$(git --exec-path):$PATH" &&
-		export PATH &&
-		test_terminal sh -c ". git-sh-setup && git_pager"
-	) &&
-	grep ^LESS= pager-env.out &&
-	grep ^LV= pager-env.out
-'
-
 test_expect_success TTY 'some commands do not use a pager' '
 	rm -f paginated.out &&
 	test_terminal git rev-list HEAD &&
-- 
2.33.0.821.gfd4106eadbd


  reply	other threads:[~2021-09-06  7:05 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-02 16:01 [PATCH 0/9] remove dead shell code Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 1/9] git-sh-setup: remove unused set_reflog_action() function Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 2/9] git-sh-setup: remove unused git_editor() function Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 3/9] git-sh-setup: remove unused git_pager() function Ævar Arnfjörð Bjarmason
2021-09-02 16:34   ` Philippe Blain
2021-09-02 21:13     ` Andrei Rybak
2021-09-02 16:01 ` [PATCH 4/9] git-sh-setup: remove unused sane_egrep() function Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 5/9] git-sh-setup: remove unused require_work_tree_exists() function Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 6/9] git-sh-setup: move create_virtual_base() to mergetools/p4merge Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 7/9] git-sh-setup: move peel_committish() function to git-subtree.sh Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 8/9] git-bisect: remove unused SHA-1 $x40 shell variable Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 9/9] test-lib: remove unused $_x40 and $_z40 variables Ævar Arnfjörð Bjarmason
2021-09-02 16:53 ` [PATCH 0/9] remove dead shell code Peter Baumann
2021-09-02 20:56   ` Junio C Hamano
2021-09-02 20:53 ` Junio C Hamano
2021-09-02 21:29   ` Carlo Arenas
2021-09-02 22:42     ` Junio C Hamano
2021-09-02 22:17   ` Ævar Arnfjörð Bjarmason
2021-09-02 22:36     ` Junio C Hamano
2021-09-06  7:05 ` [PATCH v2 0/7] remove dead & undocumented " Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` Ævar Arnfjörð Bjarmason [this message]
2021-09-06  9:49     ` [PATCH v2 1/7] git-sh-setup: remove unused git_pager() function Phillip Wood
2021-09-06 22:27       ` Ævar Arnfjörð Bjarmason
2021-09-07  9:41         ` Phillip Wood
2021-09-07 10:22           ` Ævar Arnfjörð Bjarmason
2021-09-07 18:37             ` Junio C Hamano
2021-09-07 19:58               ` Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 2/7] git-sh-setup: remove unused sane_egrep() function Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 3/7] git-sh-setup: move peel_committish() function to git-subtree.sh Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 4/7] git-sh-setup: clear_local_git_env() function to git-submodule.sh Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 5/7] git-sh-setup: remove unused "pull with rebase" message Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 6/7] git-bisect: remove unused SHA-1 $x40 shell variable Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 7/7] test-lib: remove unused $_x40 and $_z40 variables Ævar Arnfjörð Bjarmason
2021-09-11 11:17   ` [PATCH v3 0/4] remove dead & internal-only shell code Ævar Arnfjörð Bjarmason
2021-09-11 11:17     ` [PATCH v3 1/4] git-submodule: remove unused is_zero_oid() function Ævar Arnfjörð Bjarmason
2021-09-13  3:28       ` Junio C Hamano
2021-09-11 11:17     ` [PATCH v3 2/4] git-sh-setup: remove unused "pull with rebase" message Ævar Arnfjörð Bjarmason
2021-09-11 11:17     ` [PATCH v3 3/4] git-bisect: remove unused SHA-1 $x40 shell variable Ævar Arnfjörð Bjarmason
2021-09-11 11:17     ` [PATCH v3 4/4] test-lib: remove unused $_x40 and $_z40 variables Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=patch-v2-1.7-8eb1dfbff5d-20210906T070201Z-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=e@80x24.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=levraiphilippeblain@gmail.com \
    --cc=pc44800@gmail.com \
    --cc=peff@peff.net \
    --cc=peter.baumann@gmail.com \
    --cc=rybak.a.v@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).