From: Jonathan Nieder <jrnieder@gmail•com>
To: Jeff King <peff@peff•net>
Cc: Sebastian Celis <sebastian@sebastiancelis•com>, git@vger•kernel.org
Subject: [PATCH 5/6] am: Fix launching of pager
Date: Sun, 14 Feb 2010 06:07:31 -0600 [thread overview]
Message-ID: <20100214120731.GE3499@progeny.tock> (raw)
In-Reply-To: <20100214115430.GA1849@progeny.tock>
The git_pager() function used in git am has some problems:
- It does not check if stdout is a tty, so it always paginates.
- If $GIT_PAGER uses any environment variables, they are being
ignored, since it does not run $GIT_PAGER through eval.
Fix them. While at it, move the definition of git_pager() to
git-sh-setup so authors of other commands are not tempted to
reimplement it with the same mistakes.
If GIT_PAGER is set to the empty string, pagination is disabled. This
is different from the treatment of GIT_EDITOR by git_editor(), but
consistency with the use of GIT_PAGER by git builtins is more
important.
Signed-off-by: Jonathan Nieder <jrnieder@gmail•com>
---
git-am.sh | 5 +----
git-sh-setup.sh | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 3c08d53..b11af03 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -663,10 +663,7 @@ do
[eE]*) git_editor "$dotest/final-commit"
action=again ;;
[vV]*) action=again
- : ${GIT_PAGER=$(git var GIT_PAGER)}
- : ${LESS=-FRSX}
- export LESS
- $GIT_PAGER "$dotest/patch" ;;
+ git_pager "$dotest/patch" ;;
*) action=again ;;
esac
done
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index d56426d..f3b5237 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -107,6 +107,22 @@ git_editor() {
eval "$GIT_EDITOR" '"$@"'
}
+git_pager() {
+ if test -z "${GIT_PAGER+set}"
+ then
+ if tty <&1 >/dev/null 2>/dev/null
+ then
+ GIT_PAGER=cat
+ else
+ GIT_PAGER=$(git var GIT_PAGER)
+ fi
+ fi
+ : ${LESS=-FRSX}
+ export LESS
+
+ eval "$GIT_PAGER" '"$@"'
+}
+
sane_grep () {
GREP_OPTIONS= LC_ALL=C grep "$@"
}
--
1.7.0
next prev parent reply other threads:[~2010-02-14 12:07 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-13 21:14 'git svn log' no longer uses the pager Sebastian Celis
2010-02-13 23:51 ` Jeff King
2010-02-14 11:54 ` Jonathan Nieder
2010-02-14 11:55 ` [PATCH 1/6] Fix 'git var' usage synopsis Jonathan Nieder
2010-02-15 2:22 ` Junio C Hamano
2010-02-15 2:36 ` [PATCH v2 " Jonathan Nieder
2010-02-15 4:47 ` Jeff King
2010-02-14 11:59 ` [PATCH 2/6] Make 'git var GIT_PAGER' always print the configured pager Jonathan Nieder
2010-02-15 5:00 ` Jeff King
2010-02-15 5:44 ` Jonathan Nieder
2010-02-15 7:57 ` Jeff King
2010-02-14 12:02 ` [PATCH 3/6] git.1: Clarify the behavior of the --paginate option Jonathan Nieder
2010-02-15 4:55 ` Jeff King
2010-02-14 12:06 ` [PATCH 4/6] git svn: Fix launching of pager Jonathan Nieder
2010-02-15 7:58 ` Eric Wong
2010-02-14 12:07 ` Jonathan Nieder [this message]
2010-02-15 2:30 ` [PATCH 5/6] am: " Junio C Hamano
2010-02-15 2:59 ` [PATCH v2 " Jonathan Nieder
2010-02-15 3:25 ` [PATCH v3 " Jonathan Nieder
2010-02-15 4:42 ` Jeff King
2010-02-15 5:04 ` [PATCH v4 " Jonathan Nieder
2010-02-15 5:12 ` Jeff King
2010-02-15 20:26 ` Johannes Sixt
2010-02-14 12:13 ` [PATCH 6/6] tests: Add tests for automatic use " Jonathan Nieder
2010-02-15 5:10 ` Jeff King
2010-02-15 5:35 ` [PATCH v2 " Jonathan Nieder
2010-02-15 5:37 ` Jeff King
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=20100214120731.GE3499@progeny.tock \
--to=jrnieder@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
--cc=sebastian@sebastiancelis$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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