help.autocorrect: do not run a command if the command given is junk

If a given command is not found, then help.c tries to guess which one the user could have meant. If help.autocorrect is 0 or unset, then a list of suggestions is given as long as the dissimilarity between the given command and the candidates is not excessively high. But if help.autocorrect was non-zero (i.e., a delay after which the command is run automatically), the latter restriction on dissimilarity was not obeyed. In my case, this happened: $ git ..daab02 WARNING: You called a Git command named '..daab02', which does not exist. Continuing under the assumption that you meant 'read-tree' in 4.0 seconds automatically... The patch reuses the similarity limit that is also applied when the list of suggested commands is printed. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Sixt committed Dec 15, 2009 at 08:57 UTC 06500a029953164a3110c705ae579ef43548d006

1 file changed +5 -2

help.c

+5 -2

@@ -297,6 +297,9 @@ static void add_cmd_list(struct cmdnames *cmds, struct cmdnames *old)

297 old->names = NULL;

298 }

299

300 +/* An empirically derived magic number */

301 +#define SIMILAR_ENOUGH(x) ((x) < 6)

302 +

303 const char *help_unknown_cmd(const char *cmd)

304 {

305 int i, n, best_similarity = 0;

@@ -331,7 +334,7 @@ const char *help_unknown_cmd(const char *cmd)

334 n = 1;

335 while (n < main_cmds.cnt && best_similarity == main_cmds.names[n]->len)

336 ++n;

334 - if (autocorrect && n == 1) {

337 + if (autocorrect && n == 1 && SIMILAR_ENOUGH(best_similarity)) {

338 const char *assumed = main_cmds.names[0]->name;

339 main_cmds.names[0] = NULL;

340 clean_cmdnames(&main_cmds);

@@ -349,7 +352,7 @@ const char *help_unknown_cmd(const char *cmd)

352

353 fprintf(stderr, "git: '%s' is not a git-command. See 'git --help'.\n", cmd);

354

352 - if (best_similarity < 6) {

355 + if (SIMILAR_ENOUGH(best_similarity)) {

356 fprintf(stderr, "\nDid you mean %s?\n",

357 n < 2 ? "this": "one of these");

358