summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-16 18:41:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-16 18:41:27 (GMT)
commit8516c1c231272e3c8fb42ba34306c776e6a90409 (patch)
tree2607a9f77469b8b81011b5a32292ae823cd77635
parent412403eb454156ad5e1eafffc771e529730654aa (diff)
parent823e0ded8a319425496967dcb284e7e3ce2b6c29 (diff)
downloadgit-8516c1c231272e3c8fb42ba34306c776e6a90409.zip
git-8516c1c231272e3c8fb42ba34306c776e6a90409.tar.gz
git-8516c1c231272e3c8fb42ba34306c776e6a90409.tar.bz2
Merge branch 'ms/help-unknown' into maint
* ms/help-unknown: help_unknown_cmd: do not propose an "unknown" cmd
-rw-r--r--help.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/help.c b/help.c
index 7654f1b..4219355 100644
--- a/help.c
+++ b/help.c
@@ -302,6 +302,10 @@ static void add_cmd_list(struct cmdnames *cmds, struct cmdnames *old)
#define SIMILARITY_FLOOR 7
#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)
{
int i, n, best_similarity = 0;
@@ -326,6 +330,14 @@ const char *help_unknown_cmd(const char *cmd)
int cmp = 0; /* avoid compiler stupidity */
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? */
while (n < ARRAY_SIZE(common_cmds) &&
(cmp = strcmp(common_cmds[n].name, candidate)) < 0)