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

UI improvement.

* js/pull-rebase-use-advise:
  pull: colorize the hint about setting `pull.rebase`

builtin/pull.c

@@ -345,18 +345,18 @@ static enum rebase_type config_get_rebase(void)
 		return parse_config_rebase("pull.rebase", value, 1);
 
 	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"
-			"  git config pull.rebase false  # merge (the default strategy)\n"
+			 "  git config pull.rebase false  # merge (the default strategy)\n"
-			"  git config pull.rebase true   # rebase\n"
+			 "  git config pull.rebase true   # rebase\n"
-			"  git config pull.ff only       # fast-forward only\n"
+			 "  git config pull.ff only       # fast-forward only\n"
-			"\n"
+			 "\n"
-			"You can replace \"git config\" with \"git config --global\" to set a default\n"
+			 "You can replace \"git config\" with \"git config --global\" to set a default\n"
-			"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
+			 "preference for all repositories. You can also pass --rebase, --no-rebase,\n"
-			"or --ff-only on the command line to override the configured default per\n"
+			 "or --ff-only on the command line to override the configured default per\n"
-			"invocation.\n"));
+			 "invocation.\n"));
 	}
 
 	return REBASE_FALSE;

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 &&
+	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' '