summaryrefslogtreecommitdiff
path: root/help.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-26 14:09:33 -0700
committerJunio C Hamano <gitster@pobox.com>2017-06-26 14:09:33 -0700
commitaca226e6e9cb691acb7a7899efb93ec8d819861f (patch)
tree72cd7a0ad322ecca354f2b0ae0c803a44be0e0c9 /help.c
parent6968ca9b255d1ee327c36bdd79418aa8d8b2c38f (diff)
parent968b1fe263f9dfec65be4598e4f0dd76f1692551 (diff)
downloadgit-aca226e6e9cb691acb7a7899efb93ec8d819861f.tar.gz
Merge branch 'mb/reword-autocomplete-message'
Message update. * mb/reword-autocomplete-message: auto-correct: tweak phrasing
Diffstat (limited to 'help.c')
-rw-r--r--help.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/help.c b/help.c
index 07b185389d..88a3aeaeb9 100644
--- a/help.c
+++ b/help.c
@@ -356,12 +356,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;