@matheusbsbs / matheus-bagliano / commits / e01ae2a4a7

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>

Johannes Schindelin committed Nov 19, 2020 at 10:22 UTC e01ae2a4a7e99357b9464b54e48cbf4b4caac036

2 files changed +17 -14

builtin/pull.c

+12 -12

@@ -345,18 +345,18 @@ static enum rebase_type config_get_rebase(void)

345 return parse_config_rebase("pull.rebase", value, 1);

346

347 if (opt_verbosity >= 0 && !opt_ff) {

348 - warning(_("Pulling without specifying how to reconcile divergent branches is\n"

349 - "discouraged. You can squelch this message by running one of the following\n"

350 - "commands sometime before your next pull:\n"

351 - "\n"

352 - " git config pull.rebase false # merge (the default strategy)\n"

353 - " git config pull.rebase true # rebase\n"

354 - " git config pull.ff only # fast-forward only\n"

355 - "\n"

356 - "You can replace \"git config\" with \"git config --global\" to set a default\n"

357 - "preference for all repositories. You can also pass --rebase, --no-rebase,\n"

358 - "or --ff-only on the command line to override the configured default per\n"

359 - "invocation.\n"));

348 + advise(_("Pulling without specifying how to reconcile divergent branches is\n"

349 + "discouraged. You can squelch this message by running one of the following\n"

350 + "commands sometime before your next pull:\n"

351 + "\n"

352 + " git config pull.rebase false # merge (the default strategy)\n"

353 + " git config pull.rebase true # rebase\n"

354 + " git config pull.ff only # fast-forward only\n"

355 + "\n"

356 + "You can replace \"git config\" with \"git config --global\" to set a default\n"

357 + "preference for all repositories. You can also pass --rebase, --no-rebase,\n"

358 + "or --ff-only on the command line to override the configured default per\n"

359 + "invocation.\n"));

360 }

361

362 return REBASE_FALSE;

t/t7601-merge-pull-config.sh

+5 -2

@@ -29,8 +29,11 @@ test_expect_success 'setup' '

30 test_expect_success 'pull.rebase not set' '

31 git reset --hard c0 &&

32 - git pull . c1 2>err &&

33 - test_i18ngrep "Pulling without specifying how to reconcile" err

32 + git -c color.advice=always pull . c1 2>err &&

33 + test_decode_color <err >decoded &&

34 + test_i18ngrep "<YELLOW>hint: " decoded &&

35 + test_i18ngrep "Pulling without specifying how to reconcile" decoded

36 +

37 '

39 test_expect_success 'pull.rebase not set and pull.ff=true' '