diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-30 23:49:42 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-30 23:49:42 +0100 |
| commit | 290c94085bc913951d15c47bce818a19541a1e72 (patch) | |
| tree | 2346e36148c3ffd3959aecd03aa813a582e76f3d /t/t7601-merge-pull-config.sh | |
| parent | Merge branch 'js/t4015-wo-master' (diff) | |
| parent | pull: colorize the hint about setting `pull.rebase` (diff) | |
| download | git-290c94085bc913951d15c47bce818a19541a1e72.tar.xz git-290c94085bc913951d15c47bce818a19541a1e72.zip | |
Merge branch 'js/pull-rebase-use-advise'
UI improvement.
* js/pull-rebase-use-advise:
pull: colorize the hint about setting `pull.rebase`
Diffstat (limited to 't/t7601-merge-pull-config.sh')
| -rwxr-xr-x | t/t7601-merge-pull-config.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index c5c4ea5fc0..6774e9d86f 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -29,8 +29,11 @@ test_expect_success 'setup' ' test_expect_success 'pull.rebase not set' ' git reset --hard c0 && - git pull . c1 2>err && - test_i18ngrep "Pulling without specifying how to reconcile" err + git -c color.advice=always pull . c1 2>err && + test_decode_color <err >decoded && + test_i18ngrep "<YELLOW>hint: " decoded && + test_i18ngrep "Pulling without specifying how to reconcile" decoded + ' test_expect_success 'pull.rebase not set and pull.ff=true' ' |