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-18 21:15:58 +01:00
|
|
|
#include <sys/ioctl.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-03-09 17:24:19 +01:00
|
|
|
#include "common-cmds.h"
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2006-02-28 20:30:19 +01:00
|
|
|
#include "cache.h"
|
|
|
|
#include "commit.h"
|
2006-04-09 10:59:03 +02:00
|
|
|
#include "diff.h"
|
2006-04-11 03:14:54 +02:00
|
|
|
#include "revision.h"
|
2006-04-09 10:59:03 +02:00
|
|
|
#include "log-tree.h"
|
2006-02-28 20:30:19 +01:00
|
|
|
|
2005-11-16 00:31:25 +01:00
|
|
|
#ifndef PATH_MAX
|
|
|
|
# define PATH_MAX 4096
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static const char git_usage[] =
|
|
|
|
"Usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [--help] COMMAND [ ARGS ]";
|
|
|
|
|
|
|
|
/* most gui terms set COLUMNS (although some don't export it) */
|
|
|
|
static int term_columns(void)
|
|
|
|
{
|
|
|
|
char *col_string = getenv("COLUMNS");
|
|
|
|
int n_cols = 0;
|
|
|
|
|
|
|
|
if (col_string && (n_cols = atoi(col_string)) > 0)
|
|
|
|
return n_cols;
|
|
|
|
|
2005-12-18 21:15:58 +01:00
|
|
|
#ifdef TIOCGWINSZ
|
|
|
|
{
|
|
|
|
struct winsize ws;
|
|
|
|
if (!ioctl(1, TIOCGWINSZ, &ws)) {
|
|
|
|
if (ws.ws_col)
|
|
|
|
return ws.ws_col;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-11-16 00:31:25 +01:00
|
|
|
return 80;
|
|
|
|
}
|
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
static void oom(void)
|
|
|
|
{
|
|
|
|
fprintf(stderr, "git: out of memory\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2005-11-16 00:31:25 +01:00
|
|
|
static inline void mput_char(char c, unsigned int num)
|
|
|
|
{
|
|
|
|
while(num--)
|
|
|
|
putchar(c);
|
|
|
|
}
|
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
static struct cmdname {
|
|
|
|
size_t len;
|
|
|
|
char name[1];
|
|
|
|
} **cmdname;
|
|
|
|
static int cmdname_alloc, cmdname_cnt;
|
|
|
|
|
|
|
|
static void add_cmdname(const char *name, int len)
|
|
|
|
{
|
|
|
|
struct cmdname *ent;
|
|
|
|
if (cmdname_alloc <= cmdname_cnt) {
|
|
|
|
cmdname_alloc = cmdname_alloc + 200;
|
|
|
|
cmdname = realloc(cmdname, cmdname_alloc * sizeof(*cmdname));
|
|
|
|
if (!cmdname)
|
|
|
|
oom();
|
|
|
|
}
|
|
|
|
ent = malloc(sizeof(*ent) + len);
|
|
|
|
if (!ent)
|
|
|
|
oom();
|
|
|
|
ent->len = len;
|
2005-11-19 00:40:22 +01:00
|
|
|
memcpy(ent->name, name, len);
|
|
|
|
ent->name[len] = 0;
|
2005-11-16 08:13:30 +01:00
|
|
|
cmdname[cmdname_cnt++] = ent;
|
|
|
|
}
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void pretty_print_string_list(struct cmdname **cmdname, int longest)
|
2005-11-16 00:31:25 +01:00
|
|
|
{
|
2005-12-18 21:41:10 +01:00
|
|
|
int cols = 1, rows;
|
2005-11-16 00:31:25 +01:00
|
|
|
int space = longest + 1; /* min 1 SP between words */
|
|
|
|
int max_cols = term_columns() - 1; /* don't print *on* the edge */
|
2005-12-18 21:41:10 +01:00
|
|
|
int i, j;
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
if (space < max_cols)
|
|
|
|
cols = max_cols / space;
|
2005-12-18 21:41:10 +01:00
|
|
|
rows = (cmdname_cnt + cols - 1) / cols;
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
qsort(cmdname, cmdname_cnt, sizeof(*cmdname), cmdname_compare);
|
|
|
|
|
2005-12-18 21:41:10 +01:00
|
|
|
for (i = 0; i < rows; i++) {
|
2005-11-16 00:31:25 +01:00
|
|
|
printf(" ");
|
|
|
|
|
2005-12-18 21:41:10 +01:00
|
|
|
for (j = 0; j < cols; j++) {
|
|
|
|
int n = j * rows + i;
|
|
|
|
int size = space;
|
|
|
|
if (n >= cmdname_cnt)
|
|
|
|
break;
|
|
|
|
if (j == cols-1 || n + rows >= cmdname_cnt)
|
|
|
|
size = 1;
|
|
|
|
printf("%-*s", size, cmdname[n]->name);
|
2005-11-16 00:31:25 +01:00
|
|
|
}
|
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void list_commands(const char *exec_path, const char *pattern)
|
|
|
|
{
|
2005-11-16 08:13:30 +01:00
|
|
|
unsigned int longest = 0;
|
|
|
|
char path[PATH_MAX];
|
|
|
|
int dirlen;
|
|
|
|
DIR *dir = opendir(exec_path);
|
|
|
|
struct dirent *de;
|
|
|
|
|
|
|
|
if (!dir) {
|
|
|
|
fprintf(stderr, "git: '%s': %s\n", exec_path, strerror(errno));
|
2005-11-16 00:31:25 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
dirlen = strlen(exec_path);
|
|
|
|
if (PATH_MAX - 20 < dirlen) {
|
|
|
|
fprintf(stderr, "git: insanely long exec-path '%s'\n",
|
|
|
|
exec_path);
|
2005-11-16 00:31:25 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
memcpy(path, exec_path, dirlen);
|
|
|
|
path[dirlen++] = '/';
|
|
|
|
|
|
|
|
while ((de = readdir(dir)) != NULL) {
|
|
|
|
struct stat st;
|
|
|
|
int entlen;
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
if (strncmp(de->d_name, "git-", 4))
|
|
|
|
continue;
|
|
|
|
strcpy(path+dirlen, de->d_name);
|
|
|
|
if (stat(path, &st) || /* stat, not lstat */
|
|
|
|
!S_ISREG(st.st_mode) ||
|
|
|
|
!(st.st_mode & S_IXUSR))
|
2005-11-16 00:31:25 +01:00
|
|
|
continue;
|
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
entlen = strlen(de->d_name);
|
2005-11-19 00:40:22 +01:00
|
|
|
if (4 < entlen && !strcmp(de->d_name + entlen - 4, ".exe"))
|
|
|
|
entlen -= 4;
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
if (longest < entlen)
|
|
|
|
longest = entlen;
|
|
|
|
|
|
|
|
add_cmdname(de->d_name + 4, entlen-4);
|
2005-11-16 00:31:25 +01:00
|
|
|
}
|
2005-11-16 08:13:30 +01:00
|
|
|
closedir(dir);
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
printf("git commands available in '%s'\n", exec_path);
|
|
|
|
printf("----------------------------");
|
|
|
|
mput_char('-', strlen(exec_path));
|
|
|
|
putchar('\n');
|
2005-11-16 08:13:30 +01:00
|
|
|
pretty_print_string_list(cmdname, longest - 4);
|
2005-11-16 00:31:25 +01:00
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
|
2006-04-02 13:13:10 +02:00
|
|
|
static void list_common_cmds_help(void)
|
2006-03-09 17:24:19 +01:00
|
|
|
{
|
|
|
|
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) + 4);
|
|
|
|
puts(common_cmds[i].help);
|
|
|
|
}
|
|
|
|
puts("(use 'git help -a' to get a list of all installed git commands)");
|
|
|
|
}
|
|
|
|
|
2005-11-16 00:31:25 +01:00
|
|
|
#ifdef __GNUC__
|
2006-03-09 17:24:19 +01:00
|
|
|
static void cmd_usage(int show_all, const char *exec_path, const char *fmt, ...)
|
|
|
|
__attribute__((__format__(__printf__, 3, 4), __noreturn__));
|
2005-11-16 00:31:25 +01:00
|
|
|
#endif
|
2006-03-09 17:24:19 +01:00
|
|
|
static void cmd_usage(int show_all, const char *exec_path, const char *fmt, ...)
|
2005-11-16 00:31:25 +01:00
|
|
|
{
|
|
|
|
if (fmt) {
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
printf("git: ");
|
|
|
|
vprintf(fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
else
|
|
|
|
puts(git_usage);
|
|
|
|
|
2006-03-09 17:24:19 +01:00
|
|
|
if (exec_path) {
|
|
|
|
putchar('\n');
|
|
|
|
if (show_all)
|
|
|
|
list_commands(exec_path, "git-*");
|
|
|
|
else
|
|
|
|
list_common_cmds_help();
|
|
|
|
}
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void prepend_to_path(const char *dir, int len)
|
|
|
|
{
|
|
|
|
char *path, *old_path = getenv("PATH");
|
|
|
|
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-03-05 11:47:29 +01:00
|
|
|
static void show_man_page(const char *git_cmd)
|
2005-11-16 00:31:25 +01:00
|
|
|
{
|
2006-03-05 11:47:29 +01:00
|
|
|
const char *page;
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
if (!strncmp(git_cmd, "git", 3))
|
|
|
|
page = git_cmd;
|
|
|
|
else {
|
|
|
|
int page_len = strlen(git_cmd) + 4;
|
2006-03-05 11:47:29 +01:00
|
|
|
char *p = malloc(page_len + 1);
|
|
|
|
strcpy(p, "git-");
|
|
|
|
strcpy(p + 4, git_cmd);
|
|
|
|
p[page_len] = 0;
|
|
|
|
page = p;
|
2005-11-16 00:31:25 +01:00
|
|
|
}
|
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
execlp("man", "man", page, NULL);
|
2005-11-16 00:31:25 +01:00
|
|
|
}
|
|
|
|
|
2006-03-05 11:47:29 +01:00
|
|
|
static int cmd_version(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
|
|
|
{
|
|
|
|
printf("git version %s\n", GIT_VERSION);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-03-05 11:47:29 +01:00
|
|
|
static int cmd_help(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
|
|
|
{
|
2006-03-05 11:47:29 +01:00
|
|
|
const char *help_cmd = argv[1];
|
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 (!help_cmd)
|
2006-03-09 17:24:19 +01:00
|
|
|
cmd_usage(0, git_exec_path(), NULL);
|
|
|
|
else if (!strcmp(help_cmd, "--all") || !strcmp(help_cmd, "-a"))
|
|
|
|
cmd_usage(1, git_exec_path(), NULL);
|
|
|
|
else
|
|
|
|
show_man_page(help_cmd);
|
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
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-02-28 20:30:19 +01:00
|
|
|
#define LOGSIZE (65536)
|
|
|
|
|
2006-03-05 11:47:29 +01:00
|
|
|
static int cmd_log(int argc, const char **argv, char **envp)
|
2006-02-28 20:30:19 +01:00
|
|
|
{
|
|
|
|
struct rev_info rev;
|
|
|
|
struct commit *commit;
|
|
|
|
char *buf = xmalloc(LOGSIZE);
|
2006-03-01 09:58:56 +01:00
|
|
|
static enum cmit_fmt commit_format = CMIT_FMT_DEFAULT;
|
|
|
|
int abbrev = DEFAULT_ABBREV;
|
2006-04-08 07:34:11 +02:00
|
|
|
int abbrev_commit = 0;
|
2006-03-01 09:58:56 +01:00
|
|
|
const char *commit_prefix = "commit ";
|
2006-04-09 10:59:03 +02:00
|
|
|
struct log_tree_opt opt;
|
2006-04-11 01:40:40 +02:00
|
|
|
int shown = 0;
|
2006-04-09 10:59:03 +02:00
|
|
|
int do_diff = 0;
|
2006-04-11 01:40:40 +02:00
|
|
|
int full_diff = 0;
|
2006-02-28 20:30:19 +01:00
|
|
|
|
2006-04-09 10:59:03 +02:00
|
|
|
init_log_tree_opt(&opt);
|
2006-02-28 20:30:19 +01:00
|
|
|
argc = setup_revisions(argc, argv, &rev, "HEAD");
|
2006-03-01 09:58:56 +01:00
|
|
|
while (1 < argc) {
|
2006-03-05 11:47:29 +01:00
|
|
|
const char *arg = argv[1];
|
2006-03-03 00:24:01 +01:00
|
|
|
if (!strncmp(arg, "--pretty", 8)) {
|
2006-03-01 09:58:56 +01:00
|
|
|
commit_format = get_commit_format(arg + 8);
|
|
|
|
if (commit_format == CMIT_FMT_ONELINE)
|
|
|
|
commit_prefix = "";
|
|
|
|
}
|
|
|
|
else if (!strcmp(arg, "--no-abbrev")) {
|
|
|
|
abbrev = 0;
|
|
|
|
}
|
2006-04-08 07:34:11 +02:00
|
|
|
else if (!strcmp(arg, "--abbrev")) {
|
|
|
|
abbrev = DEFAULT_ABBREV;
|
|
|
|
}
|
|
|
|
else if (!strcmp(arg, "--abbrev-commit")) {
|
|
|
|
abbrev_commit = 1;
|
|
|
|
}
|
2006-03-01 09:58:56 +01:00
|
|
|
else if (!strncmp(arg, "--abbrev=", 9)) {
|
|
|
|
abbrev = strtoul(arg + 9, NULL, 10);
|
|
|
|
if (abbrev && abbrev < MINIMUM_ABBREV)
|
|
|
|
abbrev = MINIMUM_ABBREV;
|
|
|
|
else if (40 < abbrev)
|
|
|
|
abbrev = 40;
|
|
|
|
}
|
2006-04-11 01:40:40 +02:00
|
|
|
else if (!strcmp(arg, "--full-diff")) {
|
|
|
|
do_diff = 1;
|
|
|
|
full_diff = 1;
|
|
|
|
}
|
2006-04-09 10:59:03 +02:00
|
|
|
else {
|
|
|
|
int cnt = log_tree_opt_parse(&opt, argv+1, argc-1);
|
|
|
|
if (0 < cnt) {
|
|
|
|
do_diff = 1;
|
|
|
|
argv += cnt;
|
|
|
|
argc -= cnt;
|
|
|
|
continue;
|
|
|
|
}
|
2006-03-01 09:58:56 +01:00
|
|
|
die("unrecognized argument: %s", arg);
|
2006-04-09 10:59:03 +02:00
|
|
|
}
|
|
|
|
|
2006-03-01 09:58:56 +01:00
|
|
|
argc--; argv++;
|
|
|
|
}
|
2006-04-11 01:40:40 +02:00
|
|
|
|
2006-04-09 10:59:03 +02:00
|
|
|
if (do_diff) {
|
|
|
|
opt.diffopt.abbrev = abbrev;
|
|
|
|
opt.verbose_header = 0;
|
|
|
|
opt.always_show_header = 0;
|
|
|
|
opt.no_commit_id = 1;
|
|
|
|
if (opt.combine_merges)
|
|
|
|
opt.ignore_merges = 0;
|
|
|
|
if (opt.dense_combined_merges)
|
|
|
|
opt.diffopt.output_format = DIFF_FORMAT_PATCH;
|
2006-04-11 01:40:40 +02:00
|
|
|
if (!full_diff && rev.prune_data)
|
|
|
|
diff_tree_setup_paths(rev.prune_data, &opt.diffopt);
|
2006-04-09 10:59:03 +02:00
|
|
|
diff_setup_done(&opt.diffopt);
|
|
|
|
}
|
2006-03-01 09:58:56 +01:00
|
|
|
|
2006-02-28 20:30:19 +01:00
|
|
|
prepare_revision_walk(&rev);
|
|
|
|
setup_pager();
|
|
|
|
while ((commit = get_revision(&rev)) != NULL) {
|
2006-04-13 09:26:21 +02:00
|
|
|
if (shown && do_diff && commit_format != CMIT_FMT_ONELINE)
|
2006-04-11 01:40:40 +02:00
|
|
|
putchar('\n');
|
2006-04-08 07:34:11 +02:00
|
|
|
fputs(commit_prefix, stdout);
|
|
|
|
if (abbrev_commit && abbrev)
|
|
|
|
fputs(find_unique_abbrev(commit->object.sha1, abbrev),
|
|
|
|
stdout);
|
|
|
|
else
|
|
|
|
fputs(sha1_to_hex(commit->object.sha1), stdout);
|
2006-03-31 02:52:42 +02:00
|
|
|
if (rev.parents) {
|
2006-03-01 09:58:56 +01:00
|
|
|
struct commit_list *parents = commit->parents;
|
|
|
|
while (parents) {
|
|
|
|
struct object *o = &(parents->item->object);
|
|
|
|
parents = parents->next;
|
|
|
|
if (o->flags & TMP_MARK)
|
|
|
|
continue;
|
|
|
|
printf(" %s", sha1_to_hex(o->sha1));
|
|
|
|
o->flags |= TMP_MARK;
|
|
|
|
}
|
|
|
|
/* TMP_MARK is a general purpose flag that can
|
|
|
|
* be used locally, but the user should clean
|
|
|
|
* things up after it is done with them.
|
|
|
|
*/
|
|
|
|
for (parents = commit->parents;
|
|
|
|
parents;
|
|
|
|
parents = parents->next)
|
|
|
|
parents->item->object.flags &= ~TMP_MARK;
|
|
|
|
}
|
|
|
|
if (commit_format == CMIT_FMT_ONELINE)
|
|
|
|
putchar(' ');
|
|
|
|
else
|
|
|
|
putchar('\n');
|
|
|
|
pretty_print_commit(commit_format, commit, ~0, buf,
|
|
|
|
LOGSIZE, abbrev);
|
2006-02-28 20:30:19 +01:00
|
|
|
printf("%s\n", buf);
|
2006-04-15 23:02:10 +02:00
|
|
|
if (do_diff) {
|
|
|
|
printf("---\n");
|
2006-04-09 10:59:03 +02:00
|
|
|
log_tree_commit(&opt, commit);
|
2006-04-15 23:02:10 +02:00
|
|
|
}
|
2006-04-11 01:40:40 +02:00
|
|
|
shown = 1;
|
Use less memory in "git log"
This trivially avoids keeping the commit message data around after we
don't need it any more, avoiding a continually growing "git log" memory
footprint.
It's not a huge deal, but it's somewhat noticeable. For the current kernel
tree, doing a full "git log" I got
- before: /usr/bin/time git log > /dev/null
0.81user 0.02system 0:00.84elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+8851minor)pagefaults 0swaps
- after: /usr/bin/time git log > /dev/null
0.79user 0.03system 0:00.83elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+5039minor)pagefaults 0swaps
ie the touched pages dropped from 8851 to 5039. For the historic kernel
archive, the numbers are 18357->11037 minor page faults.
We could/should in theory free the commits themselves, but that's really a
lot harder, since during revision traversal we may hit the same commit
twice through different children having it as a parent, even after we've
shown it once (when that happens, we'll silently ignore it next time, but
we still need the "struct commit" to know).
And as the commit message data is clearly the biggest part of the commit,
this is the really easy 60% solution.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-13 19:01:02 +02:00
|
|
|
free(commit->buffer);
|
|
|
|
commit->buffer = NULL;
|
2006-02-28 20:30:19 +01:00
|
|
|
}
|
|
|
|
free(buf);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
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-03-05 11:47:29 +01:00
|
|
|
int (*fn)(int, const char **, char **);
|
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-02-28 20:30:19 +01:00
|
|
|
{ "log", cmd_log },
|
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;
|
|
|
|
if (strcmp(p->cmd, cmd))
|
|
|
|
continue;
|
|
|
|
exit(p->fn(argc, argv, envp));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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, '/');
|
2005-11-16 00:31:25 +01:00
|
|
|
char git_command[PATH_MAX + 1];
|
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 *exec_path = NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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
|
|
|
/* Default command: "help" */
|
|
|
|
cmd = "help";
|
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.. */
|
|
|
|
while (argc > 1) {
|
|
|
|
cmd = *++argv;
|
|
|
|
argc--;
|
2006-01-03 10:53:54 +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
|
|
|
if (strncmp(cmd, "--", 2))
|
2005-11-16 00:31:25 +01:00
|
|
|
break;
|
|
|
|
|
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
|
|
|
cmd += 2;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For legacy reasons, the "version" and "help"
|
|
|
|
* commands can be written with "--" prepended
|
|
|
|
* to make them look like flags.
|
|
|
|
*/
|
|
|
|
if (!strcmp(cmd, "help"))
|
|
|
|
break;
|
|
|
|
if (!strcmp(cmd, "version"))
|
|
|
|
break;
|
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
|
|
|
/*
|
|
|
|
* Check remaining flags (which by now must be
|
|
|
|
* "--exec-path", but maybe we will accept
|
|
|
|
* other arguments some day)
|
|
|
|
*/
|
|
|
|
if (!strncmp(cmd, "exec-path", 9)) {
|
|
|
|
cmd += 9;
|
|
|
|
if (*cmd == '=') {
|
|
|
|
git_set_exec_path(cmd + 1);
|
|
|
|
continue;
|
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
|
|
|
puts(git_exec_path());
|
2005-11-16 00:31:25 +01:00
|
|
|
exit(0);
|
|
|
|
}
|
2006-03-09 17:24:19 +01:00
|
|
|
cmd_usage(0, NULL, NULL);
|
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
|
|
|
argv[0] = cmd;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
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
|
|
|
/* See if it's an internal command */
|
|
|
|
handle_internal_command(argc, argv, envp);
|
|
|
|
|
|
|
|
/* .. then try the external ones */
|
|
|
|
execv_git_cmd(argv);
|
2005-12-01 13:48:35 +01:00
|
|
|
|
|
|
|
if (errno == ENOENT)
|
2006-03-09 17:24:19 +01:00
|
|
|
cmd_usage(0, exec_path, "'%s' is not a git-command", cmd);
|
2005-12-01 13:48:35 +01:00
|
|
|
|
|
|
|
fprintf(stderr, "Failed to run command '%s': %s\n",
|
|
|
|
git_command, strerror(errno));
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|