summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2020-02-19 01:17:56 -0500
committerDavid Pursehouse <dpursehouse@collab.net>2020-02-19 08:00:11 +0000
commit8a98efee5ceffcdbe952101e5b4126531cb0bd7e (patch)
treeae59ed975553e52eaaddbea32f618ad1e9afe8b0
parent7a753b8b181a26b1980349cb2223d9cb010d3099 (diff)
downloadgit-repo-8a98efee5ceffcdbe952101e5b4126531cb0bd7e.tar.gz
main: fix pager logic after negation cleanup
The pager setting is tristate (where None means "auto"), so make sure we still handle that setting. Change-Id: I89fe352572dd15922c61e3bb65ac33f847d01ee0 Test: `repo help upload` triggers the pager Test: `repo -p help upload` triggers the pager Test: `repo --no-pager help upload` doesn't trigger the pager Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/255852 Tested-by: Mike Frysinger <vapier@google.com> Reviewed-by: David Pursehouse <dpursehouse@collab.net>
-rwxr-xr-xmain.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/main.py b/main.py
index 9846d24f..2422e8be 100755
--- a/main.py
+++ b/main.py
@@ -222,7 +222,7 @@ class _Repo(object):
222 file=sys.stderr) 222 file=sys.stderr)
223 return 1 223 return 1
224 224
225 if gopts.pager and not isinstance(cmd, InteractiveCommand): 225 if gopts.pager is not False and not isinstance(cmd, InteractiveCommand):
226 config = cmd.manifest.globalConfig 226 config = cmd.manifest.globalConfig
227 if gopts.pager: 227 if gopts.pager:
228 use_pager = True 228 use_pager = True