2006-04-21 19:27:34 +02:00
|
|
|
#include "cache.h"
|
|
|
|
#include "builtin.h"
|
|
|
|
#include "exec_cmd.h"
|
2008-08-31 15:50:23 +02:00
|
|
|
#include "levenshtein.h"
|
2008-07-30 01:16:58 +02:00
|
|
|
#include "help.h"
|
2010-11-26 17:00:39 +01:00
|
|
|
#include "common-cmds.h"
|
2012-04-13 12:54:37 +02:00
|
|
|
#include "string-list.h"
|
|
|
|
#include "column.h"
|
2012-06-02 20:51:42 +02:00
|
|
|
#include "version.h"
|
2013-05-04 02:04:19 +02:00
|
|
|
#include "refs.h"
|
2008-03-07 08:46:28 +01:00
|
|
|
|
2008-07-30 01:16:58 +02:00
|
|
|
void add_cmdname(struct cmdnames *cmds, const char *name, int len)
|
2006-04-21 19:27:34 +02:00
|
|
|
{
|
2008-07-30 01:16:58 +02:00
|
|
|
struct cmdname *ent = xmalloc(sizeof(*ent) + len + 1);
|
2007-10-29 04:30:52 +01:00
|
|
|
|
2006-04-21 19:27:34 +02:00
|
|
|
ent->len = len;
|
|
|
|
memcpy(ent->name, name, len);
|
|
|
|
ent->name[len] = 0;
|
2007-10-29 04:30:52 +01:00
|
|
|
|
|
|
|
ALLOC_GROW(cmds->names, cmds->cnt + 1, cmds->alloc);
|
|
|
|
cmds->names[cmds->cnt++] = ent;
|
2006-04-21 19:27:34 +02:00
|
|
|
}
|
|
|
|
|
2008-08-31 15:50:23 +02:00
|
|
|
static void clean_cmdnames(struct cmdnames *cmds)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < cmds->cnt; ++i)
|
|
|
|
free(cmds->names[i]);
|
|
|
|
free(cmds->names);
|
|
|
|
cmds->cnt = 0;
|
|
|
|
cmds->alloc = 0;
|
|
|
|
}
|
|
|
|
|
2006-04-21 19:27:34 +02:00
|
|
|
static int cmdname_compare(const void *a_, const void *b_)
|
|
|
|
{
|
|
|
|
struct cmdname *a = *(struct cmdname **)a_;
|
|
|
|
struct cmdname *b = *(struct cmdname **)b_;
|
|
|
|
return strcmp(a->name, b->name);
|
|
|
|
}
|
|
|
|
|
2007-10-29 04:30:52 +01:00
|
|
|
static void uniq(struct cmdnames *cmds)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
if (!cmds->cnt)
|
|
|
|
return;
|
|
|
|
|
2012-07-25 18:16:19 +02:00
|
|
|
for (i = j = 1; i < cmds->cnt; i++) {
|
|
|
|
if (!strcmp(cmds->names[i]->name, cmds->names[j-1]->name))
|
|
|
|
free(cmds->names[i]);
|
|
|
|
else
|
2007-10-29 04:30:52 +01:00
|
|
|
cmds->names[j++] = cmds->names[i];
|
2012-07-25 18:16:19 +02:00
|
|
|
}
|
2007-10-29 04:30:52 +01:00
|
|
|
|
|
|
|
cmds->cnt = j;
|
|
|
|
}
|
|
|
|
|
2008-07-30 01:16:58 +02:00
|
|
|
void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes)
|
2007-11-09 00:35:32 +01:00
|
|
|
{
|
2007-10-29 04:30:52 +01:00
|
|
|
int ci, cj, ei;
|
|
|
|
int cmp;
|
|
|
|
|
|
|
|
ci = cj = ei = 0;
|
|
|
|
while (ci < cmds->cnt && ei < excludes->cnt) {
|
|
|
|
cmp = strcmp(cmds->names[ci]->name, excludes->names[ei]->name);
|
|
|
|
if (cmp < 0)
|
|
|
|
cmds->names[cj++] = cmds->names[ci++];
|
2012-07-25 20:01:12 +02:00
|
|
|
else if (cmp == 0) {
|
|
|
|
ei++;
|
|
|
|
free(cmds->names[ci++]);
|
|
|
|
} else if (cmp > 0)
|
2007-10-29 04:30:52 +01:00
|
|
|
ei++;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (ci < cmds->cnt)
|
|
|
|
cmds->names[cj++] = cmds->names[ci++];
|
|
|
|
|
|
|
|
cmds->cnt = cj;
|
|
|
|
}
|
|
|
|
|
2012-04-13 12:54:37 +02:00
|
|
|
static void pretty_print_string_list(struct cmdnames *cmds,
|
|
|
|
unsigned int colopts)
|
2006-04-21 19:27:34 +02:00
|
|
|
{
|
2012-04-13 12:54:37 +02:00
|
|
|
struct string_list list = STRING_LIST_INIT_NODUP;
|
|
|
|
struct column_options copts;
|
|
|
|
int i;
|
2006-04-21 19:27:34 +02:00
|
|
|
|
2012-04-13 12:54:37 +02:00
|
|
|
for (i = 0; i < cmds->cnt; i++)
|
|
|
|
string_list_append(&list, cmds->names[i]->name);
|
|
|
|
/*
|
|
|
|
* always enable column display, we only consult column.*
|
|
|
|
* about layout strategy and stuff
|
|
|
|
*/
|
|
|
|
colopts = (colopts & ~COL_ENABLE_MASK) | COL_ENABLED;
|
|
|
|
memset(&copts, 0, sizeof(copts));
|
|
|
|
copts.indent = " ";
|
|
|
|
copts.padding = 2;
|
|
|
|
print_columns(&list, colopts, &copts);
|
|
|
|
string_list_clear(&list, 0);
|
2006-04-21 19:27:34 +02:00
|
|
|
}
|
|
|
|
|
2008-01-14 14:05:33 +01:00
|
|
|
static int is_executable(const char *name)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (stat(name, &st) || /* stat, not lstat */
|
|
|
|
!S_ISREG(st.st_mode))
|
|
|
|
return 0;
|
|
|
|
|
2013-05-02 21:26:08 +02:00
|
|
|
#if defined(GIT_WINDOWS_NATIVE) || defined(__CYGWIN__)
|
help.c: Fix detection of custom merge strategy on cygwin
Test t7606-merge-custom.sh fails on cygwin when git-merge fails
with an "Could not find merge strategy 'theirs'" error, despite
the test correctly preparing an (executable) git-merge-theirs
script.
The cause of the failure is the mis-detection of the executable
status of the script, by the is_executable() function, while the
load_command_list() function is searching the path for additional
merge strategy programs.
Note that the l/stat() "functions" on cygwin are somewhat
schizophrenic (see commits adbc0b6, 7faee6b and 7974843), and
their behaviour depends on the timing of various git setup and
config function calls. In particular, until the "git_dir" has
been set (have_git_dir() returns true), the real cygwin (POSIX
emulating) l/stat() functions are called. Once "git_dir" has
been set, the "native Win32 API" implementations of l/stat()
may, or may not, be called depending on the setting of the
core.filemode and core.ignorecygwinfstricks config variables.
We also note that, since commit c869753, core.filemode is forced
to false, even on NTFS, by git-init and git-clone. A user (or a
test) can, of course, reset core.filemode to true explicitly if
the filesystem supports it (and he doesn't use any problematic
windows software). The test-suite currently runs all tests on
cygwin with core.filemode set to false.
Given the above, we see that the built-in merge strategies are
correctly detected as executable, since they are checked for
before "git_dir" is set, whereas all custom merge strategies are
not, since they are checked for after "git_dir" is set.
In order to fix the mis-detection problem, we change the code in
is_executable() to re-use the conditional WIN32 code section,
which actually looks at the content of the file to determine if
the file is executable. On cygwin we also make the additional
code conditional on the executable bit of the file mode returned
by the initial stat() call. (only the real cygwin function would
set the executable bit in the file mode.)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-06-16 22:22:16 +02:00
|
|
|
#if defined(__CYGWIN__)
|
|
|
|
if ((st.st_mode & S_IXUSR) == 0)
|
|
|
|
#endif
|
2009-09-16 10:20:17 +02:00
|
|
|
{ /* cannot trust the executable bit, peek into the file instead */
|
2008-01-14 14:05:33 +01:00
|
|
|
char buf[3] = { 0 };
|
|
|
|
int n;
|
|
|
|
int fd = open(name, O_RDONLY);
|
|
|
|
st.st_mode &= ~S_IXUSR;
|
|
|
|
if (fd >= 0) {
|
|
|
|
n = read(fd, buf, 2);
|
|
|
|
if (n == 2)
|
|
|
|
/* DOS executables start with "MZ" */
|
|
|
|
if (!strcmp(buf, "#!") || !strcmp(buf, "MZ"))
|
|
|
|
st.st_mode |= S_IXUSR;
|
|
|
|
close(fd);
|
|
|
|
}
|
2009-09-16 10:20:17 +02:00
|
|
|
}
|
2008-01-14 14:05:33 +01:00
|
|
|
#endif
|
|
|
|
return st.st_mode & S_IXUSR;
|
|
|
|
}
|
|
|
|
|
2008-08-28 19:15:33 +02:00
|
|
|
static void list_commands_in_dir(struct cmdnames *cmds,
|
2008-07-30 01:16:58 +02:00
|
|
|
const char *path,
|
|
|
|
const char *prefix)
|
2006-04-21 19:27:34 +02:00
|
|
|
{
|
2008-07-30 01:16:58 +02:00
|
|
|
int prefix_len;
|
2007-10-29 04:30:52 +01:00
|
|
|
DIR *dir = opendir(path);
|
2006-04-21 19:27:34 +02:00
|
|
|
struct dirent *de;
|
2008-07-27 22:34:14 +02:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
int len;
|
2006-04-21 19:27:34 +02:00
|
|
|
|
2008-07-27 22:34:14 +02:00
|
|
|
if (!dir)
|
2008-08-28 19:15:33 +02:00
|
|
|
return;
|
2008-07-30 01:16:58 +02:00
|
|
|
if (!prefix)
|
|
|
|
prefix = "git-";
|
|
|
|
prefix_len = strlen(prefix);
|
2006-04-21 19:27:34 +02:00
|
|
|
|
2008-07-27 22:34:14 +02:00
|
|
|
strbuf_addf(&buf, "%s/", path);
|
|
|
|
len = buf.len;
|
|
|
|
|
2006-04-21 19:27:34 +02:00
|
|
|
while ((de = readdir(dir)) != NULL) {
|
|
|
|
int entlen;
|
|
|
|
|
2007-10-27 10:36:50 +02:00
|
|
|
if (prefixcmp(de->d_name, prefix))
|
2006-04-21 19:27:34 +02:00
|
|
|
continue;
|
2007-10-27 10:36:52 +02:00
|
|
|
|
2008-07-27 22:34:14 +02:00
|
|
|
strbuf_setlen(&buf, len);
|
|
|
|
strbuf_addstr(&buf, de->d_name);
|
|
|
|
if (!is_executable(buf.buf))
|
2006-04-21 19:27:34 +02:00
|
|
|
continue;
|
|
|
|
|
2007-10-27 10:36:50 +02:00
|
|
|
entlen = strlen(de->d_name) - prefix_len;
|
2006-08-11 14:01:45 +02:00
|
|
|
if (has_extension(de->d_name, ".exe"))
|
2006-04-21 19:27:34 +02:00
|
|
|
entlen -= 4;
|
|
|
|
|
2007-10-29 04:30:52 +01:00
|
|
|
add_cmdname(cmds, de->d_name + prefix_len, entlen);
|
2006-04-21 19:27:34 +02:00
|
|
|
}
|
|
|
|
closedir(dir);
|
2008-07-27 22:34:14 +02:00
|
|
|
strbuf_release(&buf);
|
2007-10-29 04:30:52 +01:00
|
|
|
}
|
|
|
|
|
2008-08-28 19:15:33 +02:00
|
|
|
void load_command_list(const char *prefix,
|
2008-07-30 01:16:58 +02:00
|
|
|
struct cmdnames *main_cmds,
|
|
|
|
struct cmdnames *other_cmds)
|
2007-10-29 04:30:52 +01:00
|
|
|
{
|
|
|
|
const char *env_path = getenv("PATH");
|
|
|
|
const char *exec_path = git_exec_path();
|
|
|
|
|
2008-08-28 19:19:07 +02:00
|
|
|
if (exec_path) {
|
2008-08-28 19:15:33 +02:00
|
|
|
list_commands_in_dir(main_cmds, exec_path, prefix);
|
2008-08-28 19:19:07 +02:00
|
|
|
qsort(main_cmds->names, main_cmds->cnt,
|
|
|
|
sizeof(*main_cmds->names), cmdname_compare);
|
|
|
|
uniq(main_cmds);
|
2007-10-29 04:30:52 +01:00
|
|
|
}
|
|
|
|
|
2008-08-28 19:19:07 +02:00
|
|
|
if (env_path) {
|
|
|
|
char *paths, *path, *colon;
|
|
|
|
path = paths = xstrdup(env_path);
|
|
|
|
while (1) {
|
|
|
|
if ((colon = strchr(path, PATH_SEP)))
|
|
|
|
*colon = 0;
|
2008-09-10 17:54:28 +02:00
|
|
|
if (!exec_path || strcmp(path, exec_path))
|
|
|
|
list_commands_in_dir(other_cmds, path, prefix);
|
2007-10-29 04:30:52 +01:00
|
|
|
|
2008-08-28 19:19:07 +02:00
|
|
|
if (!colon)
|
|
|
|
break;
|
|
|
|
path = colon + 1;
|
|
|
|
}
|
|
|
|
free(paths);
|
2007-10-29 04:30:52 +01:00
|
|
|
|
2008-08-28 19:19:07 +02:00
|
|
|
qsort(other_cmds->names, other_cmds->cnt,
|
|
|
|
sizeof(*other_cmds->names), cmdname_compare);
|
|
|
|
uniq(other_cmds);
|
|
|
|
}
|
2008-07-30 01:16:58 +02:00
|
|
|
exclude_cmds(other_cmds, main_cmds);
|
2008-02-24 23:17:37 +01:00
|
|
|
}
|
|
|
|
|
2012-05-04 00:13:31 +02:00
|
|
|
void list_commands(unsigned int colopts,
|
2012-04-13 12:54:37 +02:00
|
|
|
struct cmdnames *main_cmds, struct cmdnames *other_cmds)
|
2008-02-24 23:17:37 +01:00
|
|
|
{
|
2008-07-30 01:16:58 +02:00
|
|
|
if (main_cmds->cnt) {
|
2008-08-28 19:19:42 +02:00
|
|
|
const char *exec_path = git_exec_path();
|
2012-04-25 13:21:53 +02:00
|
|
|
printf_ln(_("available git commands in '%s'"), exec_path);
|
2007-10-29 04:30:52 +01:00
|
|
|
putchar('\n');
|
2012-04-13 12:54:37 +02:00
|
|
|
pretty_print_string_list(main_cmds, colopts);
|
2007-10-29 04:30:52 +01:00
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
|
2008-07-30 01:16:58 +02:00
|
|
|
if (other_cmds->cnt) {
|
2012-04-25 13:21:53 +02:00
|
|
|
printf_ln(_("git commands available from elsewhere on your $PATH"));
|
2008-07-30 01:16:58 +02:00
|
|
|
putchar('\n');
|
2012-04-13 12:54:37 +02:00
|
|
|
pretty_print_string_list(other_cmds, colopts);
|
2007-10-29 04:30:52 +01:00
|
|
|
putchar('\n');
|
|
|
|
}
|
2006-04-21 19:27:34 +02:00
|
|
|
}
|
|
|
|
|
2013-01-19 07:35:04 +01:00
|
|
|
void list_common_cmds_help(void)
|
|
|
|
{
|
|
|
|
int i, longest = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(common_cmds); i++) {
|
|
|
|
if (longest < strlen(common_cmds[i].name))
|
|
|
|
longest = strlen(common_cmds[i].name);
|
|
|
|
}
|
|
|
|
|
|
|
|
puts(_("The most commonly used git commands are:"));
|
|
|
|
for (i = 0; i < ARRAY_SIZE(common_cmds); i++) {
|
|
|
|
printf(" %s ", common_cmds[i].name);
|
|
|
|
mput_char(' ', longest - strlen(common_cmds[i].name));
|
|
|
|
puts(_(common_cmds[i].help));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-30 01:16:58 +02:00
|
|
|
int is_in_cmdlist(struct cmdnames *c, const char *s)
|
2008-02-24 23:17:37 +01:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < c->cnt; i++)
|
|
|
|
if (!strcmp(s, c->names[i]->name))
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-08-31 15:54:58 +02:00
|
|
|
static int autocorrect;
|
2008-09-10 17:54:28 +02:00
|
|
|
static struct cmdnames aliases;
|
2008-08-31 15:54:58 +02:00
|
|
|
|
|
|
|
static int git_unknown_cmd_config(const char *var, const char *value, void *cb)
|
|
|
|
{
|
|
|
|
if (!strcmp(var, "help.autocorrect"))
|
|
|
|
autocorrect = git_config_int(var,value);
|
2008-09-10 17:54:28 +02:00
|
|
|
/* Also use aliases for command lookup */
|
|
|
|
if (!prefixcmp(var, "alias."))
|
|
|
|
add_cmdname(&aliases, var + 6, strlen(var + 6));
|
2008-08-31 15:54:58 +02:00
|
|
|
|
|
|
|
return git_default_config(var, value, cb);
|
|
|
|
}
|
|
|
|
|
2008-08-31 15:50:23 +02:00
|
|
|
static int levenshtein_compare(const void *p1, const void *p2)
|
2006-07-30 23:42:25 +02:00
|
|
|
{
|
2008-08-31 15:50:23 +02:00
|
|
|
const struct cmdname *const *c1 = p1, *const *c2 = p2;
|
|
|
|
const char *s1 = (*c1)->name, *s2 = (*c2)->name;
|
|
|
|
int l1 = (*c1)->len;
|
|
|
|
int l2 = (*c2)->len;
|
|
|
|
return l1 != l2 ? l1 - l2 : strcmp(s1, s2);
|
|
|
|
}
|
|
|
|
|
2008-09-10 17:54:28 +02:00
|
|
|
static void add_cmd_list(struct cmdnames *cmds, struct cmdnames *old)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
ALLOC_GROW(cmds->names, cmds->cnt + old->cnt, cmds->alloc);
|
|
|
|
|
|
|
|
for (i = 0; i < old->cnt; i++)
|
|
|
|
cmds->names[cmds->cnt++] = old->names[i];
|
|
|
|
free(old->names);
|
|
|
|
old->cnt = 0;
|
|
|
|
old->names = NULL;
|
|
|
|
}
|
|
|
|
|
2009-12-15 08:57:18 +01:00
|
|
|
/* An empirically derived magic number */
|
2010-11-26 17:00:39 +01:00
|
|
|
#define SIMILARITY_FLOOR 7
|
|
|
|
#define SIMILAR_ENOUGH(x) ((x) < SIMILARITY_FLOOR)
|
2009-12-15 08:57:18 +01:00
|
|
|
|
2011-07-08 12:08:49 +02:00
|
|
|
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?");
|
|
|
|
|
2008-08-31 15:50:23 +02:00
|
|
|
const char *help_unknown_cmd(const char *cmd)
|
2006-07-30 23:42:25 +02:00
|
|
|
{
|
2008-08-31 15:50:23 +02:00
|
|
|
int i, n, best_similarity = 0;
|
|
|
|
struct cmdnames main_cmds, other_cmds;
|
|
|
|
|
|
|
|
memset(&main_cmds, 0, sizeof(main_cmds));
|
2009-08-11 12:10:21 +02:00
|
|
|
memset(&other_cmds, 0, sizeof(other_cmds));
|
2008-09-10 17:54:28 +02:00
|
|
|
memset(&aliases, 0, sizeof(aliases));
|
2008-08-31 15:50:23 +02:00
|
|
|
|
2008-08-31 15:54:58 +02:00
|
|
|
git_config(git_unknown_cmd_config, NULL);
|
|
|
|
|
2008-08-31 15:50:23 +02:00
|
|
|
load_command_list("git-", &main_cmds, &other_cmds);
|
|
|
|
|
2008-09-10 17:54:28 +02:00
|
|
|
add_cmd_list(&main_cmds, &aliases);
|
|
|
|
add_cmd_list(&main_cmds, &other_cmds);
|
|
|
|
qsort(main_cmds.names, main_cmds.cnt,
|
|
|
|
sizeof(main_cmds.names), cmdname_compare);
|
|
|
|
uniq(&main_cmds);
|
2008-08-31 15:50:23 +02:00
|
|
|
|
2010-11-26 17:00:39 +01:00
|
|
|
/* This abuses cmdname->len for levenshtein distance */
|
|
|
|
for (i = 0, n = 0; i < main_cmds.cnt; i++) {
|
|
|
|
int cmp = 0; /* avoid compiler stupidity */
|
|
|
|
const char *candidate = main_cmds.names[i]->name;
|
|
|
|
|
2011-07-08 12:08:49 +02:00
|
|
|
/*
|
|
|
|
* 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);
|
|
|
|
|
2010-11-26 17:00:39 +01:00
|
|
|
/* Does the candidate appear in common_cmds list? */
|
|
|
|
while (n < ARRAY_SIZE(common_cmds) &&
|
|
|
|
(cmp = strcmp(common_cmds[n].name, candidate)) < 0)
|
|
|
|
n++;
|
|
|
|
if ((n < ARRAY_SIZE(common_cmds)) && !cmp) {
|
|
|
|
/* Yes, this is one of the common commands */
|
|
|
|
n++; /* use the entry from common_cmds[] */
|
|
|
|
if (!prefixcmp(candidate, cmd)) {
|
|
|
|
/* Give prefix match a very good score */
|
|
|
|
main_cmds.names[i]->len = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-31 15:50:23 +02:00
|
|
|
main_cmds.names[i]->len =
|
2012-05-27 18:02:58 +02:00
|
|
|
levenshtein(cmd, candidate, 0, 2, 1, 3) + 1;
|
2010-11-26 17:00:39 +01:00
|
|
|
}
|
2008-08-31 15:50:23 +02:00
|
|
|
|
|
|
|
qsort(main_cmds.names, main_cmds.cnt,
|
|
|
|
sizeof(*main_cmds.names), levenshtein_compare);
|
|
|
|
|
|
|
|
if (!main_cmds.cnt)
|
2012-04-23 14:30:24 +02:00
|
|
|
die(_("Uh oh. Your system reports no Git commands at all."));
|
2008-08-31 15:50:23 +02:00
|
|
|
|
2010-11-26 17:00:39 +01:00
|
|
|
/* skip and count prefix matches */
|
|
|
|
for (n = 0; n < main_cmds.cnt && !main_cmds.names[n]->len; n++)
|
|
|
|
; /* still counting */
|
|
|
|
|
|
|
|
if (main_cmds.cnt <= n) {
|
|
|
|
/* prefix matches with everything? that is too ambiguous */
|
|
|
|
best_similarity = SIMILARITY_FLOOR + 1;
|
|
|
|
} else {
|
|
|
|
/* count all the most similar ones */
|
|
|
|
for (best_similarity = main_cmds.names[n++]->len;
|
|
|
|
(n < main_cmds.cnt &&
|
|
|
|
best_similarity == main_cmds.names[n]->len);
|
|
|
|
n++)
|
|
|
|
; /* still counting */
|
|
|
|
}
|
2009-12-15 08:57:18 +01:00
|
|
|
if (autocorrect && n == 1 && SIMILAR_ENOUGH(best_similarity)) {
|
2008-08-31 15:50:23 +02:00
|
|
|
const char *assumed = main_cmds.names[0]->name;
|
|
|
|
main_cmds.names[0] = NULL;
|
|
|
|
clean_cmdnames(&main_cmds);
|
2012-04-23 14:30:24 +02:00
|
|
|
fprintf_ln(stderr,
|
|
|
|
_("WARNING: You called a Git command named '%s', "
|
|
|
|
"which does not exist.\n"
|
|
|
|
"Continuing under the assumption that you meant '%s'"),
|
2008-08-31 15:50:23 +02:00
|
|
|
cmd, assumed);
|
2008-08-31 15:54:58 +02:00
|
|
|
if (autocorrect > 0) {
|
2012-04-23 14:30:24 +02:00
|
|
|
fprintf_ln(stderr, _("in %0.1f seconds automatically..."),
|
2008-08-31 15:54:58 +02:00
|
|
|
(float)autocorrect/10.0);
|
|
|
|
poll(NULL, 0, autocorrect * 100);
|
|
|
|
}
|
2008-08-31 15:50:23 +02:00
|
|
|
return assumed;
|
|
|
|
}
|
|
|
|
|
2012-04-23 14:30:24 +02:00
|
|
|
fprintf_ln(stderr, _("git: '%s' is not a git command. See 'git --help'."), cmd);
|
2008-08-31 15:50:23 +02:00
|
|
|
|
2009-12-15 08:57:18 +01:00
|
|
|
if (SIMILAR_ENOUGH(best_similarity)) {
|
2012-04-23 14:30:24 +02:00
|
|
|
fprintf_ln(stderr,
|
|
|
|
Q_("\nDid you mean this?",
|
|
|
|
"\nDid you mean one of these?",
|
|
|
|
n));
|
2008-08-31 15:50:23 +02:00
|
|
|
|
|
|
|
for (i = 0; i < n; i++)
|
|
|
|
fprintf(stderr, "\t%s\n", main_cmds.names[i]->name);
|
|
|
|
}
|
|
|
|
|
2006-07-30 23:42:25 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2006-07-29 07:44:25 +02:00
|
|
|
int cmd_version(int argc, const char **argv, const char *prefix)
|
2006-04-21 19:27:34 +02:00
|
|
|
{
|
2013-04-16 22:33:25 +02:00
|
|
|
/*
|
|
|
|
* The format of this string should be kept stable for compatibility
|
|
|
|
* with external projects that rely on the output of "git version".
|
|
|
|
*/
|
2006-04-21 19:27:34 +02:00
|
|
|
printf("git version %s\n", git_version_string);
|
|
|
|
return 0;
|
|
|
|
}
|
2013-05-04 02:04:19 +02:00
|
|
|
|
|
|
|
struct similar_ref_cb {
|
|
|
|
const char *base_ref;
|
|
|
|
struct string_list *similar_refs;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int append_similar_ref(const char *refname, const unsigned char *sha1,
|
|
|
|
int flags, void *cb_data)
|
|
|
|
{
|
|
|
|
struct similar_ref_cb *cb = (struct similar_ref_cb *)(cb_data);
|
|
|
|
char *branch = strrchr(refname, '/') + 1;
|
|
|
|
/* A remote branch of the same name is deemed similar */
|
|
|
|
if (!prefixcmp(refname, "refs/remotes/") &&
|
|
|
|
!strcmp(branch, cb->base_ref))
|
|
|
|
string_list_append(cb->similar_refs,
|
|
|
|
refname + strlen("refs/remotes/"));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct string_list guess_refs(const char *ref)
|
|
|
|
{
|
|
|
|
struct similar_ref_cb ref_cb;
|
|
|
|
struct string_list similar_refs = STRING_LIST_INIT_NODUP;
|
|
|
|
|
|
|
|
ref_cb.base_ref = ref;
|
|
|
|
ref_cb.similar_refs = &similar_refs;
|
|
|
|
for_each_ref(append_similar_ref, &ref_cb);
|
|
|
|
return similar_refs;
|
|
|
|
}
|
|
|
|
|
|
|
|
void help_unknown_ref(const char *ref, const char *cmd, const char *error)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct string_list suggested_refs = guess_refs(ref);
|
|
|
|
|
|
|
|
fprintf_ln(stderr, _("%s: %s - %s"), cmd, ref, error);
|
|
|
|
|
|
|
|
if (suggested_refs.nr > 0) {
|
|
|
|
fprintf_ln(stderr,
|
|
|
|
Q_("\nDid you mean this?",
|
|
|
|
"\nDid you mean one of these?",
|
|
|
|
suggested_refs.nr));
|
|
|
|
for (i = 0; i < suggested_refs.nr; i++)
|
|
|
|
fprintf(stderr, "\t%s\n", suggested_refs.items[i].string);
|
|
|
|
}
|
|
|
|
|
|
|
|
string_list_clear(&suggested_refs, 0);
|
|
|
|
exit(1);
|
|
|
|
}
|