summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff3
diff options
context:
space:
mode:
authorLibravatar Martin Ågren <martin.agren@gmail.com>2017-11-19 16:03:48 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-20 09:50:25 +0900
commited104fa9e1016f8ac5f85642ed11e16b09510bea (patch)
treeed7e7b287c071a579ed2a952ef5dddf81fc55d8b /mergetools/vimdiff3
parentgit.c: ignore pager.* when launching builtin as dashed external (diff)
downloadtgif-ed104fa9e1016f8ac5f85642ed11e16b09510bea.tar.xz
t7006: add tests for how git branch paginates
The next couple of commits will change how `git branch` handles `pager.branch`, similar to how de121ffe5 (tag: respect `pager.tag` in list-mode only, 2017-08-02) and ff1e72483 (tag: change default of `pager.tag` to "on", 2017-08-02) changed `git tag`. Add tests in this area to make sure that we don't regress and so that the upcoming commits can be made clearer by adapting the tests. Add some tests for `--list` (implied), one for `--edit-description`, and one for `--set-upstream-to` as a representative of "something other than the first two". In particular, use `test_expect_failure` to document that we currently respect the pager-configuration with `--edit-description`. The current behavior is buggy since the pager interferes with the editor and makes the end result completely broken. See also b3ee740c8 (t7006: add tests for how git tag paginates, 2017-08-02). Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/vimdiff3')
0 files changed, 0 insertions, 0 deletions