git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCHv2] Tweak help auto-correct phrasing.

From
Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Date
Jun 20, 2017, 18:00 UTC
Message-ID
<1497981610.28187.3.camel@gmail.com>
In-Reply-To
<20161220140226.18456-1-marcnarc@xiplink.com>
On Tue, 2016-12-20 at 09:02 -0500, Marc Branchaud wrote:
Show 80 quoted lines
> When auto-correct is enabled, an invalid git command prints a warning
> and
> a continuation message, which differs depending on whether or not
> help.autoCorrect is positive or negative.
> 
> With help.autoCorrect = 15:
> 
>    WARNING: You called a Git command named 'lgo', which does not
> exist.
>    Continuing under the assumption that you meant 'log'
>    in 1.5 seconds automatically...
> 
> With help.autoCorrect < 0:
> 
>    WARNING: You called a Git command named 'lgo', which does not
> exist.
>    Continuing under the assumption that you meant 'log'
> 
> The continuation message's phrasing is awkward.  This commit cleans
> it up.
> As a bonus, we now use full-sentence strings which make translation
> easier.
> 
> With help.autoCorrect = 15:
> 
>    WARNING: You called a Git command named 'lgo', which does not
> exist.
>    Continuing in 1.5 seconds, assuming that you meant 'log'.
> 
> With help.autoCorrect < 0:
> 
>    WARNING: You called a Git command named 'lgo', which does not
> exist.
>    Continuing under the assumption that you meant 'log'.
> 
> Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
> ---
> 
> Writing the commit message was more work than the commit!  :)
> 
> 		M.
> 
>  help.c | 18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/help.c b/help.c
> index 53e2a67e00..fc56aa2d76 100644
> --- a/help.c
> +++ b/help.c
> @@ -381,12 +381,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;

Excuse me bringing this up after a long time. Was this patch applied? What's it's status?

-- 
Regards,
Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Previous: Junio C HamanoNext: Kaartic Sivaraam
Message 13 of 14 in “Suggestion for the "Did you mean this?" feature”
  1. Kaartic SivaraamDec 18, 2016
  2. Stephan BeyerDec 18, 2016
  3. Kaartic SivaraamDec 18, 2016
  4. Alexei LozovskyDec 18, 2016
  5. Chris PackhamDec 19, 2016
  6. Tweak help auto-correct phrasing.Marc Branchaud, Dec 19, 2016
  7. Junio C HamanoDec 19, 2016
  8. [PATCHv2] Tweak help auto-correct phrasing.Marc Branchaud, Dec 20, 2016
  9. Kaartic SivaraamJun 20, 2017
  10. Marc BranchaudJun 20, 2017
  11. [PATCHv2 (resend)] Tweak help auto-correct phrasing.Marc Branchaud, Jun 21, 2017
  12. Junio C HamanoJun 21, 2017
  13. Kaartic SivaraamJun 20, 2017
  14. Kaartic SivaraamDec 19, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.