diff options
| author | Michal Marek <mmarek@suse.cz> | 2009-07-01 11:40:30 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-01 13:20:00 -0700 |
| commit | 653a31c16a0b83c11f00eb94ef49857ce8f2e37b (patch) | |
| tree | 56fda7f753935a311d07b464e14c56633dda4288 | |
| parent | d4c985653a580e78db94c549bdcd71669067b8a9 (diff) | |
| download | git-653a31c16a0b83c11f00eb94ef49857ce8f2e37b.tar.gz git-653a31c16a0b83c11f00eb94ef49857ce8f2e37b.tar.xz | |
request-pull: really really disable pager
Earlier 476cc72 (request-pull: really disable pager, 2009-06-30)
tried to use the correct environment variable to disable paging
from multiple calls to "git log" and friends, but there was one
extra call to "git log" that was not covered by the trick.
Move the setting and exporting of GIT_PAGER much earlier in the
script to cover everybody.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-request-pull.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh index ab2dd1049..591777324 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -12,6 +12,9 @@ OPTIONS_SPEC= . git-sh-setup . git-parse-remote +GIT_PAGER= +export GIT_PAGER + base=$1 url=$2 head=${3-HEAD} @@ -34,7 +37,7 @@ branch=$(git ls-remote "$url" \ }") if [ -z "$branch" ]; then echo "warn: No branch of $url is at:" >&2 - git log --max-count=1 --pretty='format:warn: %h: %s' $headrev >&2 + git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2 echo "warn: Are you sure you pushed $head there?" >&2 echo >&2 echo >&2 @@ -42,8 +45,6 @@ if [ -z "$branch" ]; then status=1 fi -GIT_PAGER= -export GIT_PAGER echo "The following changes since commit $baserev:" git shortlog --max-count=1 $baserev | sed -e 's/^\(.\)/ \1/' |