mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ms/help-unknown'

Browse Source 
* ms/help-unknown:
  help_unknown_cmd: do not propose an "unknown" cmd
This commit is contained in:
Junio C Hamano
2011-07-22 14:43:21 -07:00
parent b3743df73f 823e0ded8a
commit c8409e716a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
help.c
View File

@ -305,6 +305,10 @@ static void add_cmd_list(struct cmdnames *cmds, struct cmdnames *old)
#define SIMILARITY_FLOOR 7 #define SIMILARITY_FLOOR 7
#define SIMILAR_ENOUGH(x) ((x) < SIMILARITY_FLOOR) #define SIMILAR_ENOUGH(x) ((x) < SIMILARITY_FLOOR)
static const char bad_interpreter_advice[] =
N_("'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?");
const char *help_unknown_cmd(const char *cmd) const char *help_unknown_cmd(const char *cmd)
{ {
int i, n, best_similarity = 0; int i, n, best_similarity = 0;
@ -329,6 +333,14 @@ const char *help_unknown_cmd(const char *cmd)
int cmp = 0; /* avoid compiler stupidity */ int cmp = 0; /* avoid compiler stupidity */
const char *candidate = main_cmds.names[i]->name; const char *candidate = main_cmds.names[i]->name;
/*
* An exact match means we have the command, but
* for some reason exec'ing it gave us ENOENT; probably
* it's a bad interpreter in the #! line.
*/
if (!strcmp(candidate, cmd))
die(_(bad_interpreter_advice), cmd, cmd);
/* Does the candidate appear in common_cmds list? */ /* Does the candidate appear in common_cmds list? */
while (n < ARRAY_SIZE(common_cmds) && while (n < ARRAY_SIZE(common_cmds) &&
(cmp = strcmp(common_cmds[n].name, candidate)) < 0) (cmp = strcmp(common_cmds[n].name, candidate)) < 0)