From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jul 2017 20:59:04 +0000 (-0700)
Subject: Merge branch 'mb/reword-autocomplete-message' into maint
X-Git-Tag: v2.13.3~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cf77911ae51b95bb6cd92216e6ff1a1afc60b3cc?hp=8f3a16c390f428af64b8d34d587cc482b70f8666

Merge branch 'mb/reword-autocomplete-message' into maint

Message update.

* mb/reword-autocomplete-message:
auto-correct: tweak phrasing
---

diff --git a/help.c b/help.c
index b44c55ec2d..9d2811efda 100644
--- a/help.c
+++ b/help.c
@@ -355,12 +355,18 @@ const char *help_unknown_cmd(const char *cmd)
 		clean_cmdnames(&main_cmds);
 		fprintf_ln(stderr,
 			   _("WARNING: You called a Git command named '%s', "
-			     "which does not exist.\n"
-			     "Continuing under the assumption that you meant '%s'"),
-			cmd, assumed);
-		if (autocorrect > 0) {
-			fprintf_ln(stderr, _("in %0.1f seconds automatically..."),
-				(float)autocorrect/10.0);
+			     "which does not exist."),
+			   cmd);
+		if (autocorrect < 0)
+			fprintf_ln(stderr,
+				   _("Continuing under the assumption that "
+				     "you meant '%s'."),
+				   assumed);
+		else {
+			fprintf_ln(stderr,
+				   _("Continuing in %0.1f seconds, "
+				     "assuming that you meant '%s'."),
+				   (float)autocorrect/10.0, assumed);
 			sleep_millisec(autocorrect * 100);
 		}
 		return assumed;