summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-02 20:44:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-02 20:44:11 (GMT)
commit52ebb06f1466a235c643acffdea9c9e484cfdec0 (patch)
treeb7bfae26f5719b8447ef176f4df4437d1e3fc4a9 /git-am.sh
parent77b30bcecd84225a21a8639c272fde88180f36d9 (diff)
parent8c33b4cf67f47ee46fe0984751fd40c4cf7cf392 (diff)
downloadgit-52ebb06f1466a235c643acffdea9c9e484cfdec0.zip
git-52ebb06f1466a235c643acffdea9c9e484cfdec0.tar.gz
git-52ebb06f1466a235c643acffdea9c9e484cfdec0.tar.bz2
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-am.sh')
-rwxr-xr-xgit-am.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/git-am.sh b/git-am.sh
index ebfbee5..9df951a 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