2005-11-16 00:31:25 +01:00
|
|
|
#include <stdio.h>
|
2005-11-16 08:13:30 +01:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <dirent.h>
|
2005-11-16 00:31:25 +01:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <limits.h>
|
|
|
|
#include <stdarg.h>
|
2005-12-05 20:54:29 +01:00
|
|
|
#include "git-compat-util.h"
|
2006-01-11 03:12:17 +01:00
|
|
|
#include "exec_cmd.h"
|
2006-06-05 19:43:52 +02:00
|
|
|
#include "cache.h"
|
2006-06-25 15:56:18 +02:00
|
|
|
#include "quote.h"
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2006-04-21 19:27:34 +02:00
|
|
|
#include "builtin.h"
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2006-07-30 23:42:25 +02:00
|
|
|
const char git_usage_string[] =
|
|
|
|
"git [--version] [--exec-path[=GIT_EXEC_PATH]] [--help] COMMAND [ ARGS ]";
|
|
|
|
|
2005-11-16 00:31:25 +01:00
|
|
|
static void prepend_to_path(const char *dir, int len)
|
|
|
|
{
|
2006-06-28 11:04:39 +02:00
|
|
|
const char *old_path = getenv("PATH");
|
|
|
|
char *path;
|
2005-11-16 00:31:25 +01:00
|
|
|
int path_len = len;
|
|
|
|
|
|
|
|
if (!old_path)
|
2005-11-16 08:13:30 +01:00
|
|
|
old_path = "/usr/local/bin:/usr/bin:/bin";
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
path_len = len + strlen(old_path) + 1;
|
|
|
|
|
|
|
|
path = malloc(path_len + 1);
|
|
|
|
|
|
|
|
memcpy(path, dir, len);
|
|
|
|
path[len] = ':';
|
|
|
|
memcpy(path + len + 1, old_path, path_len - len);
|
|
|
|
|
|
|
|
setenv("PATH", path, 1);
|
|
|
|
}
|
|
|
|
|
2006-07-24 14:10:45 +02:00
|
|
|
static int handle_options(const char*** argv, int* argc)
|
|
|
|
{
|
|
|
|
int handled = 0;
|
|
|
|
|
|
|
|
while (*argc > 0) {
|
|
|
|
const char *cmd = (*argv)[0];
|
|
|
|
if (cmd[0] != '-')
|
|
|
|
break;
|
|
|
|
|
2006-07-25 20:24:22 +02:00
|
|
|
/*
|
|
|
|
* For legacy reasons, the "version" and "help"
|
|
|
|
* commands can be written with "--" prepended
|
|
|
|
* to make them look like flags.
|
|
|
|
*/
|
|
|
|
if (!strcmp(cmd, "--help") || !strcmp(cmd, "--version"))
|
|
|
|
break;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check remaining flags.
|
|
|
|
*/
|
|
|
|
if (!strncmp(cmd, "--exec-path", 11)) {
|
|
|
|
cmd += 11;
|
|
|
|
if (*cmd == '=')
|
|
|
|
git_set_exec_path(cmd + 1);
|
|
|
|
else {
|
|
|
|
puts(git_exec_path());
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
} else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) {
|
2006-07-24 14:10:45 +02:00
|
|
|
setup_pager();
|
2006-07-25 20:24:22 +02:00
|
|
|
} else if (!strcmp(cmd, "--git-dir")) {
|
|
|
|
if (*argc < 1)
|
|
|
|
return -1;
|
|
|
|
setenv("GIT_DIR", (*argv)[1], 1);
|
|
|
|
(*argv)++;
|
|
|
|
(*argc)--;
|
|
|
|
} else if (!strncmp(cmd, "--git-dir=", 10)) {
|
|
|
|
setenv("GIT_DIR", cmd + 10, 1);
|
|
|
|
} else if (!strcmp(cmd, "--bare")) {
|
|
|
|
static char git_dir[1024];
|
|
|
|
setenv("GIT_DIR", getcwd(git_dir, 1024), 1);
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, "Unknown option: %s\n", cmd);
|
2006-07-30 23:42:25 +02:00
|
|
|
usage(git_usage_string);
|
2006-07-25 20:24:22 +02:00
|
|
|
}
|
2006-07-24 14:10:45 +02:00
|
|
|
|
|
|
|
(*argv)++;
|
|
|
|
(*argc)--;
|
|
|
|
handled++;
|
|
|
|
}
|
|
|
|
return handled;
|
|
|
|
}
|
|
|
|
|
2006-06-05 19:43:52 +02:00
|
|
|
static const char *alias_command;
|
|
|
|
static char *alias_string = NULL;
|
|
|
|
|
|
|
|
static int git_alias_config(const char *var, const char *value)
|
|
|
|
{
|
|
|
|
if (!strncmp(var, "alias.", 6) && !strcmp(var + 6, alias_command)) {
|
|
|
|
alias_string = strdup(value);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int split_cmdline(char *cmdline, const char ***argv)
|
|
|
|
{
|
|
|
|
int src, dst, count = 0, size = 16;
|
|
|
|
char quoted = 0;
|
|
|
|
|
|
|
|
*argv = malloc(sizeof(char*) * size);
|
|
|
|
|
|
|
|
/* split alias_string */
|
|
|
|
(*argv)[count++] = cmdline;
|
|
|
|
for (src = dst = 0; cmdline[src];) {
|
|
|
|
char c = cmdline[src];
|
|
|
|
if (!quoted && isspace(c)) {
|
|
|
|
cmdline[dst++] = 0;
|
|
|
|
while (cmdline[++src]
|
|
|
|
&& isspace(cmdline[src]))
|
|
|
|
; /* skip */
|
|
|
|
if (count >= size) {
|
|
|
|
size += 16;
|
|
|
|
*argv = realloc(*argv, sizeof(char*) * size);
|
|
|
|
}
|
|
|
|
(*argv)[count++] = cmdline + dst;
|
|
|
|
} else if(!quoted && (c == '\'' || c == '"')) {
|
|
|
|
quoted = c;
|
|
|
|
src++;
|
|
|
|
} else if (c == quoted) {
|
|
|
|
quoted = 0;
|
|
|
|
src++;
|
|
|
|
} else {
|
|
|
|
if (c == '\\' && quoted != '\'') {
|
|
|
|
src++;
|
|
|
|
c = cmdline[src];
|
|
|
|
if (!c) {
|
|
|
|
free(*argv);
|
|
|
|
*argv = NULL;
|
|
|
|
return error("cmdline ends with \\");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
cmdline[dst++] = c;
|
|
|
|
src++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
cmdline[dst] = 0;
|
|
|
|
|
|
|
|
if (quoted) {
|
|
|
|
free(*argv);
|
|
|
|
*argv = NULL;
|
|
|
|
return error("unclosed quote");
|
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int handle_alias(int *argcp, const char ***argv)
|
|
|
|
{
|
2006-06-28 12:45:27 +02:00
|
|
|
int nongit = 0, ret = 0, saved_errno = errno;
|
2006-06-05 19:43:52 +02:00
|
|
|
const char *subdir;
|
2006-07-30 03:30:29 +02:00
|
|
|
int count, option_count;
|
|
|
|
const char** new_argv;
|
2006-06-05 19:43:52 +02:00
|
|
|
|
|
|
|
subdir = setup_git_directory_gently(&nongit);
|
2006-07-30 03:30:29 +02:00
|
|
|
|
|
|
|
alias_command = (*argv)[0];
|
|
|
|
git_config(git_alias_config);
|
|
|
|
if (alias_string) {
|
|
|
|
count = split_cmdline(alias_string, &new_argv);
|
|
|
|
option_count = handle_options(&new_argv, &count);
|
|
|
|
memmove(new_argv - option_count, new_argv,
|
|
|
|
count * sizeof(char *));
|
|
|
|
new_argv -= option_count;
|
|
|
|
|
|
|
|
if (count < 1)
|
|
|
|
die("empty alias for %s", alias_command);
|
|
|
|
|
|
|
|
if (!strcmp(alias_command, new_argv[0]))
|
|
|
|
die("recursive alias: %s", alias_command);
|
|
|
|
|
|
|
|
if (getenv("GIT_TRACE")) {
|
|
|
|
int i;
|
|
|
|
fprintf(stderr, "trace: alias expansion: %s =>",
|
|
|
|
alias_command);
|
|
|
|
for (i = 0; i < count; ++i) {
|
|
|
|
fputc(' ', stderr);
|
|
|
|
sq_quote_print(stderr, new_argv[i]);
|
2006-06-25 15:56:18 +02:00
|
|
|
}
|
2006-07-30 03:30:29 +02:00
|
|
|
fputc('\n', stderr);
|
|
|
|
fflush(stderr);
|
|
|
|
}
|
2006-06-25 15:56:18 +02:00
|
|
|
|
2006-07-30 03:30:29 +02:00
|
|
|
new_argv = realloc(new_argv, sizeof(char*) *
|
|
|
|
(count + *argcp + 1));
|
|
|
|
/* insert after command name */
|
|
|
|
memcpy(new_argv + count, *argv + 1, sizeof(char*) * *argcp);
|
|
|
|
new_argv[count+*argcp] = NULL;
|
2006-06-05 19:43:52 +02:00
|
|
|
|
2006-07-30 03:30:29 +02:00
|
|
|
*argv = new_argv;
|
|
|
|
*argcp += count - 1;
|
2006-06-05 19:43:52 +02:00
|
|
|
|
2006-07-30 03:30:29 +02:00
|
|
|
ret = 1;
|
2006-06-05 19:43:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (subdir)
|
|
|
|
chdir(subdir);
|
|
|
|
|
2006-06-28 12:45:27 +02:00
|
|
|
errno = saved_errno;
|
|
|
|
|
2006-06-05 19:43:52 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-04-21 19:27:34 +02:00
|
|
|
const char git_version_string[] = GIT_VERSION;
|
2006-04-16 09:07:41 +02:00
|
|
|
|
2006-07-29 07:44:25 +02:00
|
|
|
#define NEEDS_PREFIX 1
|
2006-07-31 11:53:46 +02:00
|
|
|
#define USE_PAGER 2
|
2006-07-29 07:44:25 +02:00
|
|
|
|
2006-03-05 11:47:29 +01:00
|
|
|
static void handle_internal_command(int argc, const char **argv, char **envp)
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
{
|
|
|
|
const char *cmd = argv[0];
|
|
|
|
static struct cmd_struct {
|
|
|
|
const char *cmd;
|
2006-07-29 07:44:25 +02:00
|
|
|
int (*fn)(int, const char **, const char *);
|
2006-07-31 11:53:46 +02:00
|
|
|
int option;
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
} commands[] = {
|
|
|
|
{ "version", cmd_version },
|
|
|
|
{ "help", cmd_help },
|
2006-07-31 11:53:46 +02:00
|
|
|
{ "log", cmd_log, NEEDS_PREFIX | USE_PAGER },
|
|
|
|
{ "whatchanged", cmd_whatchanged, NEEDS_PREFIX | USE_PAGER },
|
|
|
|
{ "show", cmd_show, NEEDS_PREFIX | USE_PAGER },
|
git builtin "push"
This adds a builtin "push" command, which is largely just a C'ification of
the "git-push.sh" script.
Now, the reason I did it as a built-in is partly because it's yet another
step on relying less on shell, but it's actually mostly because I've
wanted to be able to push to _multiple_ repositories, and the most obvious
and simplest interface for that would seem be to just have a "remotes"
file that has multiple URL entries.
(For "pull", having multiple entries should either just select the first
one, or you could fall back on the others on failure - your choice).
And quite frankly, it just became too damn messy to do that in shell.
Besides, we actually have a fair amount of infrastructure in C, so it just
wasn't that hard to do.
Of course, this is almost totally untested. It probably doesn't work for
anything but the one trial I threw at it. "Simple" doesn't necessarily
mean "obviously correct".
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-30 06:22:49 +02:00
|
|
|
{ "push", cmd_push },
|
2006-07-29 07:44:25 +02:00
|
|
|
{ "format-patch", cmd_format_patch, NEEDS_PREFIX },
|
2006-04-28 00:37:18 +02:00
|
|
|
{ "count-objects", cmd_count_objects },
|
2006-07-29 07:44:25 +02:00
|
|
|
{ "diff", cmd_diff, NEEDS_PREFIX },
|
|
|
|
{ "grep", cmd_grep, NEEDS_PREFIX },
|
|
|
|
{ "rm", cmd_rm, NEEDS_PREFIX },
|
|
|
|
{ "add", cmd_add, NEEDS_PREFIX },
|
|
|
|
{ "rev-list", cmd_rev_list, NEEDS_PREFIX },
|
2006-05-19 12:03:57 +02:00
|
|
|
{ "init-db", cmd_init_db },
|
2006-06-10 16:13:41 +02:00
|
|
|
{ "get-tar-commit-id", cmd_get_tar_commit_id },
|
2006-05-19 03:46:44 +02:00
|
|
|
{ "upload-tar", cmd_upload_tar },
|
2006-05-23 14:15:29 +02:00
|
|
|
{ "check-ref-format", cmd_check_ref_format },
|
2006-07-29 07:44:25 +02:00
|
|
|
{ "ls-files", cmd_ls_files, NEEDS_PREFIX },
|
|
|
|
{ "ls-tree", cmd_ls_tree, NEEDS_PREFIX },
|
|
|
|
{ "tar-tree", cmd_tar_tree, NEEDS_PREFIX },
|
|
|
|
{ "read-tree", cmd_read_tree, NEEDS_PREFIX },
|
|
|
|
{ "commit-tree", cmd_commit_tree, NEEDS_PREFIX },
|
2006-05-23 14:15:35 +02:00
|
|
|
{ "apply", cmd_apply },
|
2006-07-29 07:44:25 +02:00
|
|
|
{ "show-branch", cmd_show_branch, NEEDS_PREFIX },
|
|
|
|
{ "diff-files", cmd_diff_files, NEEDS_PREFIX },
|
|
|
|
{ "diff-index", cmd_diff_index, NEEDS_PREFIX },
|
|
|
|
{ "diff-stages", cmd_diff_stages, NEEDS_PREFIX },
|
|
|
|
{ "diff-tree", cmd_diff_tree, NEEDS_PREFIX },
|
|
|
|
{ "cat-file", cmd_cat_file, NEEDS_PREFIX },
|
|
|
|
{ "rev-parse", cmd_rev_parse, NEEDS_PREFIX },
|
|
|
|
{ "write-tree", cmd_write_tree, NEEDS_PREFIX },
|
2006-06-13 22:21:50 +02:00
|
|
|
{ "mailsplit", cmd_mailsplit },
|
2006-06-13 22:21:53 +02:00
|
|
|
{ "mailinfo", cmd_mailinfo },
|
2006-06-13 22:21:57 +02:00
|
|
|
{ "stripspace", cmd_stripspace },
|
2006-07-29 07:44:25 +02:00
|
|
|
{ "update-index", cmd_update_index, NEEDS_PREFIX },
|
|
|
|
{ "update-ref", cmd_update_ref, NEEDS_PREFIX },
|
|
|
|
{ "fmt-merge-msg", cmd_fmt_merge_msg, NEEDS_PREFIX },
|
|
|
|
{ "prune", cmd_prune, NEEDS_PREFIX },
|
2006-07-29 10:54:54 +02:00
|
|
|
{ "mv", cmd_mv, NEEDS_PREFIX },
|
2006-08-02 18:32:32 +02:00
|
|
|
{ "prune-packed", cmd_prune_packed, NEEDS_PREFIX },
|
2006-08-02 23:51:59 +02:00
|
|
|
{ "repo-config", cmd_repo_config },
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
};
|
|
|
|
int i;
|
|
|
|
|
2006-04-15 20:13:49 +02:00
|
|
|
/* Turn "git cmd --help" into "git help cmd" */
|
|
|
|
if (argc > 1 && !strcmp(argv[1], "--help")) {
|
|
|
|
argv[1] = argv[0];
|
|
|
|
argv[0] = cmd = "help";
|
|
|
|
}
|
|
|
|
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
for (i = 0; i < ARRAY_SIZE(commands); i++) {
|
|
|
|
struct cmd_struct *p = commands+i;
|
2006-07-29 07:44:25 +02:00
|
|
|
const char *prefix;
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
if (strcmp(p->cmd, cmd))
|
|
|
|
continue;
|
2006-06-25 15:56:18 +02:00
|
|
|
|
2006-07-29 07:44:25 +02:00
|
|
|
prefix = NULL;
|
2006-07-31 11:53:46 +02:00
|
|
|
if (p->option & NEEDS_PREFIX)
|
2006-07-29 07:44:25 +02:00
|
|
|
prefix = setup_git_directory();
|
2006-07-31 11:53:46 +02:00
|
|
|
if (p->option & USE_PAGER)
|
|
|
|
setup_pager();
|
2006-06-25 15:56:18 +02:00
|
|
|
if (getenv("GIT_TRACE")) {
|
|
|
|
int i;
|
|
|
|
fprintf(stderr, "trace: built-in: git");
|
|
|
|
for (i = 0; i < argc; ++i) {
|
|
|
|
fputc(' ', stderr);
|
|
|
|
sq_quote_print(stderr, argv[i]);
|
|
|
|
}
|
|
|
|
putc('\n', stderr);
|
|
|
|
fflush(stderr);
|
|
|
|
}
|
|
|
|
|
2006-07-29 07:44:25 +02:00
|
|
|
exit(p->fn(argc, argv, prefix));
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-05 11:47:29 +01:00
|
|
|
int main(int argc, const char **argv, char **envp)
|
2005-11-16 00:31:25 +01:00
|
|
|
{
|
2006-03-05 11:47:29 +01:00
|
|
|
const char *cmd = argv[0];
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
char *slash = strrchr(cmd, '/');
|
|
|
|
const char *exec_path = NULL;
|
2006-06-06 03:09:40 +02:00
|
|
|
int done_alias = 0;
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Take the basename of argv[0] as the command
|
|
|
|
* name, and the dirname as the default exec_path
|
|
|
|
* if it's an absolute path and we don't have
|
|
|
|
* anything better.
|
|
|
|
*/
|
|
|
|
if (slash) {
|
|
|
|
*slash++ = 0;
|
|
|
|
if (*cmd == '/')
|
|
|
|
exec_path = cmd;
|
|
|
|
cmd = slash;
|
|
|
|
}
|
2005-11-16 00:31:25 +01:00
|
|
|
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
/*
|
|
|
|
* "git-xxxx" is the same as "git xxxx", but we obviously:
|
|
|
|
*
|
|
|
|
* - cannot take flags in between the "git" and the "xxxx".
|
|
|
|
* - cannot execute it externally (since it would just do
|
|
|
|
* the same thing over again)
|
|
|
|
*
|
|
|
|
* So we just directly call the internal command handler, and
|
|
|
|
* die if that one cannot handle it.
|
|
|
|
*/
|
|
|
|
if (!strncmp(cmd, "git-", 4)) {
|
|
|
|
cmd += 4;
|
|
|
|
argv[0] = cmd;
|
|
|
|
handle_internal_command(argc, argv, envp);
|
|
|
|
die("cannot handle %s internally", cmd);
|
|
|
|
}
|
2005-11-16 00:31:25 +01:00
|
|
|
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
/* Look for flags.. */
|
2006-07-25 20:24:22 +02:00
|
|
|
argv++;
|
|
|
|
argc--;
|
|
|
|
handle_options(&argv, &argc);
|
|
|
|
if (argc > 0) {
|
|
|
|
if (!strncmp(argv[0], "--", 2))
|
|
|
|
argv[0] += 2;
|
|
|
|
} else {
|
|
|
|
/* Default command: "help" */
|
|
|
|
argv[0] = "help";
|
|
|
|
argc = 1;
|
2005-11-16 00:31:25 +01:00
|
|
|
}
|
2006-07-25 20:24:22 +02:00
|
|
|
cmd = argv[0];
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We search for git commands in the following order:
|
|
|
|
* - git_exec_path()
|
|
|
|
* - the path of the "git" command if we could find it
|
|
|
|
* in $0
|
|
|
|
* - the regular PATH.
|
|
|
|
*/
|
|
|
|
if (exec_path)
|
|
|
|
prepend_to_path(exec_path, strlen(exec_path));
|
2006-01-11 03:12:17 +01:00
|
|
|
exec_path = git_exec_path();
|
|
|
|
prepend_to_path(exec_path, strlen(exec_path));
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2006-06-06 03:09:40 +02:00
|
|
|
while (1) {
|
|
|
|
/* See if it's an internal command */
|
|
|
|
handle_internal_command(argc, argv, envp);
|
2006-06-05 19:43:52 +02:00
|
|
|
|
2006-06-06 03:09:40 +02:00
|
|
|
/* .. then try the external ones */
|
|
|
|
execv_git_cmd(argv);
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
|
2006-06-06 03:09:40 +02:00
|
|
|
/* It could be an alias -- this works around the insanity
|
|
|
|
* of overriding "git log" with "git show" by having
|
|
|
|
* alias.log = show
|
|
|
|
*/
|
|
|
|
if (done_alias || !handle_alias(&argc, &argv))
|
|
|
|
break;
|
|
|
|
done_alias = 1;
|
|
|
|
}
|
2005-12-01 13:48:35 +01:00
|
|
|
|
|
|
|
if (errno == ENOENT)
|
2006-07-30 23:42:25 +02:00
|
|
|
help_unknown_cmd(cmd);
|
2005-12-01 13:48:35 +01:00
|
|
|
|
|
|
|
fprintf(stderr, "Failed to run command '%s': %s\n",
|
2006-06-28 11:17:21 +02:00
|
|
|
cmd, strerror(errno));
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|