diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 11:22:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 23:13:30 +0100 |
| commit | e01ae2a4a7e99357b9464b54e48cbf4b4caac036 (patch) | |
| tree | 13a6f0c79719ffef524d6d20cab4df3304ae4a0f /t/t7601-merge-pull-config.sh | |
| parent | Git 2.29.2 (diff) | |
| download | git-e01ae2a4a7e99357b9464b54e48cbf4b4caac036.tar.xz git-e01ae2a4a7e99357b9464b54e48cbf4b4caac036.zip | |
pull: colorize the hint about setting `pull.rebase`
In d18c950a69f (pull: warn if the user didn't say whether to rebase or
to merge, 2020-03-09), a new hint was introduced to encourage users to
make a conscious decision about whether they want their pull to merge or
to rebase by configuring the `pull.rebase` setting.
This warning was clearly intended to advise users, but as pointed out in
https://lore.kernel.org/git/87ima2rdsm.fsf%40evledraar.gmail.com, it
uses `warning()` instead of `advise()`.
One consequence is that the advice is not colorized in the same manner
as other, similar messages. So let's use `advise()` instead.
Pointed-out-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -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' ' |