diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:11 -0800 |
| commit | 52ebb06f1466a235c643acffdea9c9e484cfdec0 (patch) | |
| tree | b7bfae26f5719b8447ef176f4df4437d1e3fc4a9 /git-sh-setup.sh | |
| parent | 77b30bcecd84225a21a8639c272fde88180f36d9 (diff) | |
| parent | 8c33b4cf67f47ee46fe0984751fd40c4cf7cf392 (diff) | |
| download | git-52ebb06f1466a235c643acffdea9c9e484cfdec0.tar.gz | |
Merge branch 'jn/maint-fix-pager'
* jn/maint-fix-pager:
tests: Fix race condition in t7006-pager
t7006-pager: if stdout is not a terminal, make a new one
tests: Add tests for automatic use of pager
am: Fix launching of pager
git svn: Fix launching of pager
git.1: Clarify the behavior of the --paginate option
Make 'git var GIT_PAGER' always print the configured pager
Fix 'git var' usage synopsis
Diffstat (limited to 'git-sh-setup.sh')
| -rw-r--r-- | git-sh-setup.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 5e22440aec..7a095665d7 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -107,6 +107,19 @@ git_editor() { eval "$GIT_EDITOR" '"$@"' } +git_pager() { + if test -t 1 + then + GIT_PAGER=$(git var GIT_PAGER) + else + GIT_PAGER=cat + fi + : ${LESS=-FRSX} + export LESS + + eval "$GIT_PAGER" '"$@"' +} + sane_grep () { GREP_OPTIONS= LC_ALL=C grep "$@" } |