2006-12-19 23:34:12 +01:00
|
|
|
#include "builtin.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-07-30 23:42:25 +02:00
|
|
|
const char git_usage_string[] =
|
2006-10-03 22:11:25 +02:00
|
|
|
"git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate] [--bare] [--git-dir=GIT_DIR] [--help] COMMAND [ARGS]";
|
2006-07-30 23:42:25 +02:00
|
|
|
|
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;
|
|
|
|
|
2006-09-01 00:32:39 +02:00
|
|
|
path = xmalloc(path_len + 1);
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
memcpy(path, dir, len);
|
|
|
|
path[len] = ':';
|
|
|
|
memcpy(path + len + 1, old_path, path_len - len);
|
|
|
|
|
|
|
|
setenv("PATH", path, 1);
|
2006-09-05 08:22:16 +02:00
|
|
|
|
|
|
|
free(path);
|
2005-11-16 00:31:25 +01:00
|
|
|
}
|
|
|
|
|
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")) {
|
2006-12-22 14:56:25 +01:00
|
|
|
if (*argc < 2) {
|
|
|
|
fprintf(stderr, "No directory given for --git-dir.\n" );
|
|
|
|
usage(git_usage_string);
|
|
|
|
}
|
2006-12-31 05:29:11 +01:00
|
|
|
setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1);
|
2006-07-25 20:24:22 +02:00
|
|
|
(*argv)++;
|
|
|
|
(*argc)--;
|
|
|
|
} else if (!strncmp(cmd, "--git-dir=", 10)) {
|
2006-12-31 05:29:11 +01:00
|
|
|
setenv(GIT_DIR_ENVIRONMENT, cmd + 10, 1);
|
2006-07-25 20:24:22 +02:00
|
|
|
} else if (!strcmp(cmd, "--bare")) {
|
2006-12-31 05:28:53 +01:00
|
|
|
static char git_dir[PATH_MAX+1];
|
2006-12-31 05:29:11 +01:00
|
|
|
setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, sizeof(git_dir)), 1);
|
2006-07-25 20:24:22 +02:00
|
|
|
} 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;
|
2006-08-15 19:23:48 +02:00
|
|
|
static char *alias_string;
|
2006-06-05 19:43:52 +02:00
|
|
|
|
|
|
|
static int git_alias_config(const char *var, const char *value)
|
|
|
|
{
|
|
|
|
if (!strncmp(var, "alias.", 6) && !strcmp(var + 6, alias_command)) {
|
2006-09-02 06:16:31 +02:00
|
|
|
alias_string = xstrdup(value);
|
2006-06-05 19:43:52 +02:00
|
|
|
}
|
|
|
|
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;
|
2006-08-26 16:16:18 +02:00
|
|
|
*argv = xrealloc(*argv, sizeof(char*) * size);
|
2006-06-05 19:43:52 +02:00
|
|
|
}
|
|
|
|
(*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) {
|
2007-02-11 01:33:58 +01:00
|
|
|
if (alias_string[0] == '!') {
|
|
|
|
trace_printf("trace: alias to shell cmd: %s => %s\n",
|
|
|
|
alias_command, alias_string + 1);
|
|
|
|
ret = system(alias_string + 1);
|
|
|
|
if (ret >= 0 && WIFEXITED(ret) &&
|
|
|
|
WEXITSTATUS(ret) != 127)
|
|
|
|
exit(WEXITSTATUS(ret));
|
|
|
|
die("Failed to run '%s' when expanding alias '%s'\n",
|
|
|
|
alias_string + 1, alias_command);
|
|
|
|
}
|
2006-07-30 03:30:29 +02:00
|
|
|
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);
|
|
|
|
|
2006-09-02 18:23:48 +02:00
|
|
|
trace_argv_printf(new_argv, count,
|
|
|
|
"trace: alias expansion: %s =>",
|
|
|
|
alias_command);
|
2006-06-25 15:56:18 +02:00
|
|
|
|
2006-08-26 16:16:18 +02:00
|
|
|
new_argv = xrealloc(new_argv, sizeof(char*) *
|
|
|
|
(count + *argcp + 1));
|
2006-07-30 03:30:29 +02:00
|
|
|
/* 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-08-04 11:04:00 +02:00
|
|
|
#define RUN_SETUP (1<<0)
|
|
|
|
#define USE_PAGER (1<<1)
|
2006-12-31 05:32:38 +01:00
|
|
|
/*
|
|
|
|
* require working tree to be present -- anything uses this needs
|
|
|
|
* RUN_SETUP for reading from the configuration file.
|
|
|
|
*/
|
|
|
|
#define NOT_BARE (1<<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[] = {
|
2006-12-31 05:32:38 +01:00
|
|
|
{ "add", cmd_add, RUN_SETUP | NOT_BARE },
|
2007-01-24 15:04:37 +01:00
|
|
|
{ "annotate", cmd_annotate, USE_PAGER },
|
2006-08-04 10:51:04 +02:00
|
|
|
{ "apply", cmd_apply },
|
Add git-archive
git-archive is a command to make TAR and ZIP archives of a git tree.
It helps prevent a proliferation of git-{format}-tree commands.
Instead of directly calling git-{tar,zip}-tree command, it defines
a very simple API, that archiver should implement and register in
"git-archive.c". This API is made up by 2 functions whose prototype
is defined in "archive.h" file.
- The first one is used to parse 'extra' parameters which have
signification only for the specific archiver. That would allow
different archive backends to have different kind of options.
- The second one is used to ask to an archive backend to build
the archive given some already resolved parameters.
The main reason for making this API is to avoid using
git-{tar,zip}-tree commands, hence making them useless. Maybe it's
time for them to die ?
It also implements remote operations by defining a very simple
protocol: it first sends the name of the specific uploader followed
the repository name (git-upload-tar git://example.org/repo.git).
Then it sends options. It's done by sending a sequence of one
argument per packet, with prefix "argument ", followed by a flush.
The remote protocol is implemented in "git-archive.c" for client
side and is triggered by "--remote=<repo>" option. For example,
to fetch a TAR archive in a remote repo, you can issue:
$ git archive --format=tar --remote=git://xxx/yyy/zzz.git HEAD
We choose to not make a new command "git-fetch-archive" for example,
avoind one more GIT command which should be nice for users (less
commands to remember, keeps existing --remote option).
Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Acked-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-07 15:12:02 +02:00
|
|
|
{ "archive", cmd_archive },
|
2007-01-28 15:25:55 +01:00
|
|
|
{ "blame", cmd_blame, RUN_SETUP },
|
2006-11-01 21:53:13 +01:00
|
|
|
{ "branch", cmd_branch, RUN_SETUP },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "cat-file", cmd_cat_file, RUN_SETUP },
|
|
|
|
{ "checkout-index", cmd_checkout_index, RUN_SETUP },
|
2006-05-23 14:15:29 +02:00
|
|
|
{ "check-ref-format", cmd_check_ref_format },
|
2006-10-24 01:01:57 +02:00
|
|
|
{ "cherry", cmd_cherry, RUN_SETUP },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "commit-tree", cmd_commit_tree, RUN_SETUP },
|
2007-01-29 01:16:53 +01:00
|
|
|
{ "config", cmd_config },
|
2006-09-14 03:03:59 +02:00
|
|
|
{ "count-objects", cmd_count_objects, RUN_SETUP },
|
2007-01-10 12:36:36 +01:00
|
|
|
{ "describe", cmd_describe, RUN_SETUP },
|
2006-10-10 21:16:25 +02:00
|
|
|
{ "diff", cmd_diff, RUN_SETUP | USE_PAGER },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "diff-files", cmd_diff_files, RUN_SETUP },
|
|
|
|
{ "diff-index", cmd_diff_index, RUN_SETUP },
|
|
|
|
{ "diff-stages", cmd_diff_stages, RUN_SETUP },
|
|
|
|
{ "diff-tree", cmd_diff_tree, RUN_SETUP },
|
2007-01-16 09:23:24 +01:00
|
|
|
{ "fetch--tool", cmd_fetch__tool, RUN_SETUP },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
|
2006-09-15 22:30:02 +02:00
|
|
|
{ "for-each-ref", cmd_for_each_ref, RUN_SETUP },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "format-patch", cmd_format_patch, RUN_SETUP },
|
2007-01-29 16:48:06 +01:00
|
|
|
{ "fsck", cmd_fsck, RUN_SETUP },
|
|
|
|
{ "fsck-objects", cmd_fsck, RUN_SETUP },
|
2006-08-04 10:51:04 +02:00
|
|
|
{ "get-tar-commit-id", cmd_get_tar_commit_id },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "grep", cmd_grep, RUN_SETUP },
|
2006-08-04 10:51:04 +02:00
|
|
|
{ "help", cmd_help },
|
2007-01-07 18:31:29 +01:00
|
|
|
{ "init", cmd_init_db },
|
2006-08-04 10:51:04 +02:00
|
|
|
{ "init-db", cmd_init_db },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "log", cmd_log, RUN_SETUP | USE_PAGER },
|
|
|
|
{ "ls-files", cmd_ls_files, RUN_SETUP },
|
|
|
|
{ "ls-tree", cmd_ls_tree, RUN_SETUP },
|
2006-08-04 10:51:04 +02:00
|
|
|
{ "mailinfo", cmd_mailinfo },
|
|
|
|
{ "mailsplit", cmd_mailsplit },
|
2006-12-06 16:26:06 +01:00
|
|
|
{ "merge-file", cmd_merge_file },
|
2006-12-31 05:32:38 +01:00
|
|
|
{ "mv", cmd_mv, RUN_SETUP | NOT_BARE },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "name-rev", cmd_name_rev, RUN_SETUP },
|
|
|
|
{ "pack-objects", cmd_pack_objects, RUN_SETUP },
|
2006-11-09 03:47:54 +01:00
|
|
|
{ "pickaxe", cmd_blame, RUN_SETUP | USE_PAGER },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "prune", cmd_prune, RUN_SETUP },
|
|
|
|
{ "prune-packed", cmd_prune_packed, RUN_SETUP },
|
2006-08-09 00:42:20 +02:00
|
|
|
{ "push", cmd_push, RUN_SETUP },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "read-tree", cmd_read_tree, RUN_SETUP },
|
2006-12-19 09:23:12 +01:00
|
|
|
{ "reflog", cmd_reflog, RUN_SETUP },
|
2007-01-29 01:16:53 +01:00
|
|
|
{ "repo-config", cmd_config },
|
2006-12-20 17:39:41 +01:00
|
|
|
{ "rerere", cmd_rerere, RUN_SETUP },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "rev-list", cmd_rev_list, RUN_SETUP },
|
|
|
|
{ "rev-parse", cmd_rev_parse, RUN_SETUP },
|
2006-12-31 05:32:38 +01:00
|
|
|
{ "rm", cmd_rm, RUN_SETUP | NOT_BARE },
|
|
|
|
{ "runstatus", cmd_runstatus, RUN_SETUP | NOT_BARE },
|
2006-11-28 00:29:21 +01:00
|
|
|
{ "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "show-branch", cmd_show_branch, RUN_SETUP },
|
|
|
|
{ "show", cmd_show, RUN_SETUP | USE_PAGER },
|
2006-08-04 10:51:04 +02:00
|
|
|
{ "stripspace", cmd_stripspace },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
|
2006-10-08 15:44:50 +02:00
|
|
|
{ "tar-tree", cmd_tar_tree },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "unpack-objects", cmd_unpack_objects, RUN_SETUP },
|
|
|
|
{ "update-index", cmd_update_index, RUN_SETUP },
|
|
|
|
{ "update-ref", cmd_update_ref, RUN_SETUP },
|
2006-09-07 15:12:05 +02:00
|
|
|
{ "upload-archive", cmd_upload_archive },
|
2006-08-04 10:51:04 +02:00
|
|
|
{ "version", cmd_version },
|
2006-08-04 11:04:00 +02:00
|
|
|
{ "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
|
|
|
|
{ "write-tree", cmd_write_tree, RUN_SETUP },
|
2006-08-10 17:02:38 +02:00
|
|
|
{ "verify-pack", cmd_verify_pack },
|
Add "git show-ref" builtin command
It's kind of like "git peek-remote", but works only locally (and thus
avoids the whole overhead of git_connect()) and has some extra
verification features.
For example, it allows you to filter the results, and to choose whether
you want the tag dereferencing or not. You can also use it to just test
whether a particular ref exists.
For example:
git show-ref master
will show all references called "master", whether tags or heads or
anything else, and regardless of how deep in the reference naming
hierarchy they are (so it would show "refs/heads/master" but also
"refs/remote/other-repo/master").
When using the "--verify" flag, the command requires an exact ref path:
git show-ref --verify refs/heads/master
will only match the exact branch called "master".
If nothing matches, show-ref will return an error code of 1, and in the
case of verification, it will show an error message.
For scripting, you can ask it to be quiet with the "--quiet" flag, which
allows you to do things like
git-show-ref --quiet --verify -- "refs/heads/$headname" ||
echo "$headname is not a valid branch"
to check whether a particular branch exists or not (notice how we don't
actually want to show any results, and we want to use the full refname for
it in order to not trigger the problem with ambiguous partial matches).
To show only tags, or only proper branch heads, use "--tags" and/or
"--heads" respectively (using both means that it shows tags _and_ heads,
but not other random references under the refs/ subdirectory).
To do automatic tag object dereferencing, use the "-d" or "--dereference"
flag, so you can do
git show-ref --tags --dereference
to get a listing of all tags together with what they dereference.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-15 20:19:32 +02:00
|
|
|
{ "show-ref", cmd_show_ref, RUN_SETUP },
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 01:37:32 +02:00
|
|
|
{ "pack-refs", cmd_pack_refs, RUN_SETUP },
|
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-08-04 11:04:00 +02:00
|
|
|
if (p->option & RUN_SETUP)
|
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();
|
2007-01-23 13:30:20 +01:00
|
|
|
if ((p->option & NOT_BARE) &&
|
|
|
|
(is_bare_repository() || is_inside_git_dir()))
|
|
|
|
die("%s must be run in a work tree", cmd);
|
2006-09-02 18:23:48 +02:00
|
|
|
trace_argv_printf(argv, argc, "trace: built-in: git");
|
2006-06-25 15:56:18 +02:00
|
|
|
|
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-09-14 03:04:09 +02:00
|
|
|
const char *cmd = argv[0] ? argv[0] : "git-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
|
|
|
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
|
|
|
|
2007-02-11 01:33:57 +01:00
|
|
|
if (errno == ENOENT) {
|
|
|
|
if (done_alias) {
|
|
|
|
fprintf(stderr, "Expansion of alias '%s' failed; "
|
|
|
|
"'%s' is not a git-command\n",
|
|
|
|
cmd, argv[0]);
|
|
|
|
exit(1);
|
|
|
|
}
|
2006-07-30 23:42:25 +02:00
|
|
|
help_unknown_cmd(cmd);
|
2007-02-11 01:33:57 +01:00
|
|
|
}
|
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;
|
|
|
|
}
|