kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'js/pull-rebase-use-advise' 

UI improvement.

* js/pull-rebase-use-advise:
  pull: colorize the hint about setting `pull.rebase`
maint
Junio C Hamano 2020-11-30 14:49:42 -08:00
parent 376b4cc420 e01ae2a4a7
commit 290c94085b
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/pull.c
View File

@ -345,7 +345,7 @@ static enum rebase_type config_get_rebase(void)
return parse_config_rebase("pull.rebase", value, 1); return parse_config_rebase("pull.rebase", value, 1);


if (opt_verbosity >= 0 && !opt_ff) { if (opt_verbosity >= 0 && !opt_ff) {
warning(_("Pulling without specifying how to reconcile divergent branches is\n" advise(_("Pulling without specifying how to reconcile divergent branches is\n"
"discouraged. You can squelch this message by running one of the following\n" "discouraged. You can squelch this message by running one of the following\n"
"commands sometime before your next pull:\n" "commands sometime before your next pull:\n"
"\n" "\n"

7
t/t7601-merge-pull-config.sh
View File

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


test_expect_success 'pull.rebase not set' ' test_expect_success 'pull.rebase not set' '
git reset --hard c0 && git reset --hard c0 &&
git pull . c1 2>err && git -c color.advice=always pull . c1 2>err &&
test_i18ngrep "Pulling without specifying how to reconcile" 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' ' test_expect_success 'pull.rebase not set and pull.ff=true' '