aboutsummaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2017-11-19 16:03:49 +0100
committerJunio C Hamano <gitster@pobox.com>2017-11-20 09:50:25 +0900
commitd74b541e0b40be0bf35e836bd8c6cbf653283d4b (patch)
treed14933fb659159e4aea5712a4ee2c38fe1fe674b /xdiff
parented104fa9e1016f8ac5f85642ed11e16b09510bea (diff)
downloadgit-d74b541e0b40be0bf35e836bd8c6cbf653283d4b.tar.gz
git-d74b541e0b40be0bf35e836bd8c6cbf653283d4b.tar.xz
branch: respect `pager.branch` in list-mode only
Similar to de121ffe5 (tag: respect `pager.tag` in list-mode only, 2017-08-02), use the DELAY_PAGER_CONFIG-mechanism to only respect `pager.branch` when we are listing branches. We have two possibilities of generalizing what that earlier commit made to `git tag`. One is to interpret, e.g., --set-upstream-to as "it does not use an editor, so we should page". Another, the one taken by this commit, is to say "it does not list, so let's not page". That is in line with the approach of the series on `pager.tag` and in particular the wording in Documentation/git-tag.txt, which this commit reuses for git-branch.txt. This fixes the failing test added in the previous commit. Also adapt the test for whether `git branch --set-upstream-to` respects `pager.branch`. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions