rebase -i: ignore patches that are already in the upstream
[git/jnareb-git.git] / git.c
blob25b8274d3ea49b5d9155f35e945122f579ea438d
1 #include "builtin.h"
2 #include "exec_cmd.h"
3 #include "cache.h"
4 #include "quote.h"
6 const char git_usage_string[] =
7 "git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]";
9 static void prepend_to_path(const char *dir, int len)
11 const char *old_path = getenv("PATH");
12 char *path;
13 int path_len = len;
15 if (!old_path)
16 old_path = "/usr/local/bin:/usr/bin:/bin";
18 path_len = len + strlen(old_path) + 1;
20 path = xmalloc(path_len + 1);
22 memcpy(path, dir, len);
23 path[len] = ':';
24 memcpy(path + len + 1, old_path, path_len - len);
26 setenv("PATH", path, 1);
28 free(path);
31 static int handle_options(const char*** argv, int* argc, int* envchanged)
33 int handled = 0;
35 while (*argc > 0) {
36 const char *cmd = (*argv)[0];
37 if (cmd[0] != '-')
38 break;
41 * For legacy reasons, the "version" and "help"
42 * commands can be written with "--" prepended
43 * to make them look like flags.
45 if (!strcmp(cmd, "--help") || !strcmp(cmd, "--version"))
46 break;
49 * Check remaining flags.
51 if (!prefixcmp(cmd, "--exec-path")) {
52 cmd += 11;
53 if (*cmd == '=')
54 git_set_exec_path(cmd + 1);
55 else {
56 puts(git_exec_path());
57 exit(0);
59 } else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) {
60 setup_pager();
61 } else if (!strcmp(cmd, "--git-dir")) {
62 if (*argc < 2) {
63 fprintf(stderr, "No directory given for --git-dir.\n" );
64 usage(git_usage_string);
66 setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1);
67 if (envchanged)
68 *envchanged = 1;
69 (*argv)++;
70 (*argc)--;
71 handled++;
72 } else if (!prefixcmp(cmd, "--git-dir=")) {
73 setenv(GIT_DIR_ENVIRONMENT, cmd + 10, 1);
74 if (envchanged)
75 *envchanged = 1;
76 } else if (!strcmp(cmd, "--work-tree")) {
77 if (*argc < 2) {
78 fprintf(stderr, "No directory given for --work-tree.\n" );
79 usage(git_usage_string);
81 setenv(GIT_WORK_TREE_ENVIRONMENT, (*argv)[1], 1);
82 if (envchanged)
83 *envchanged = 1;
84 (*argv)++;
85 (*argc)--;
86 } else if (!prefixcmp(cmd, "--work-tree=")) {
87 setenv(GIT_WORK_TREE_ENVIRONMENT, cmd + 12, 1);
88 if (envchanged)
89 *envchanged = 1;
90 } else if (!strcmp(cmd, "--bare")) {
91 static char git_dir[PATH_MAX+1];
92 setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, sizeof(git_dir)), 1);
93 if (envchanged)
94 *envchanged = 1;
95 } else {
96 fprintf(stderr, "Unknown option: %s\n", cmd);
97 usage(git_usage_string);
100 (*argv)++;
101 (*argc)--;
102 handled++;
104 return handled;
107 static const char *alias_command;
108 static char *alias_string;
110 static int git_alias_config(const char *var, const char *value)
112 if (!prefixcmp(var, "alias.") && !strcmp(var + 6, alias_command)) {
113 alias_string = xstrdup(value);
115 return 0;
118 static int split_cmdline(char *cmdline, const char ***argv)
120 int src, dst, count = 0, size = 16;
121 char quoted = 0;
123 *argv = xmalloc(sizeof(char*) * size);
125 /* split alias_string */
126 (*argv)[count++] = cmdline;
127 for (src = dst = 0; cmdline[src];) {
128 char c = cmdline[src];
129 if (!quoted && isspace(c)) {
130 cmdline[dst++] = 0;
131 while (cmdline[++src]
132 && isspace(cmdline[src]))
133 ; /* skip */
134 if (count >= size) {
135 size += 16;
136 *argv = xrealloc(*argv, sizeof(char*) * size);
138 (*argv)[count++] = cmdline + dst;
139 } else if(!quoted && (c == '\'' || c == '"')) {
140 quoted = c;
141 src++;
142 } else if (c == quoted) {
143 quoted = 0;
144 src++;
145 } else {
146 if (c == '\\' && quoted != '\'') {
147 src++;
148 c = cmdline[src];
149 if (!c) {
150 free(*argv);
151 *argv = NULL;
152 return error("cmdline ends with \\");
155 cmdline[dst++] = c;
156 src++;
160 cmdline[dst] = 0;
162 if (quoted) {
163 free(*argv);
164 *argv = NULL;
165 return error("unclosed quote");
168 return count;
171 static int handle_alias(int *argcp, const char ***argv)
173 int nongit = 0, envchanged = 0, ret = 0, saved_errno = errno;
174 const char *subdir;
175 int count, option_count;
176 const char** new_argv;
178 subdir = setup_git_directory_gently(&nongit);
180 alias_command = (*argv)[0];
181 git_config(git_alias_config);
182 if (alias_string) {
183 if (alias_string[0] == '!') {
184 if (*argcp > 1) {
185 int i, sz = PATH_MAX;
186 char *s = xmalloc(sz), *new_alias = s;
188 add_to_string(&s, &sz, alias_string, 0);
189 free(alias_string);
190 alias_string = new_alias;
191 for (i = 1; i < *argcp &&
192 !add_to_string(&s, &sz, " ", 0) &&
193 !add_to_string(&s, &sz, (*argv)[i], 1)
194 ; i++)
195 ; /* do nothing */
196 if (!sz)
197 die("Too many or long arguments");
199 trace_printf("trace: alias to shell cmd: %s => %s\n",
200 alias_command, alias_string + 1);
201 ret = system(alias_string + 1);
202 if (ret >= 0 && WIFEXITED(ret) &&
203 WEXITSTATUS(ret) != 127)
204 exit(WEXITSTATUS(ret));
205 die("Failed to run '%s' when expanding alias '%s'\n",
206 alias_string + 1, alias_command);
208 count = split_cmdline(alias_string, &new_argv);
209 option_count = handle_options(&new_argv, &count, &envchanged);
210 if (envchanged)
211 die("alias '%s' changes environment variables\n"
212 "You can use '!git' in the alias to do this.",
213 alias_command);
214 memmove(new_argv - option_count, new_argv,
215 count * sizeof(char *));
216 new_argv -= option_count;
218 if (count < 1)
219 die("empty alias for %s", alias_command);
221 if (!strcmp(alias_command, new_argv[0]))
222 die("recursive alias: %s", alias_command);
224 trace_argv_printf(new_argv, count,
225 "trace: alias expansion: %s =>",
226 alias_command);
228 new_argv = xrealloc(new_argv, sizeof(char*) *
229 (count + *argcp + 1));
230 /* insert after command name */
231 memcpy(new_argv + count, *argv + 1, sizeof(char*) * *argcp);
232 new_argv[count+*argcp] = NULL;
234 *argv = new_argv;
235 *argcp += count - 1;
237 ret = 1;
240 if (subdir)
241 chdir(subdir);
243 errno = saved_errno;
245 return ret;
248 const char git_version_string[] = GIT_VERSION;
250 #define RUN_SETUP (1<<0)
251 #define USE_PAGER (1<<1)
253 * require working tree to be present -- anything uses this needs
254 * RUN_SETUP for reading from the configuration file.
256 #define NEED_WORK_TREE (1<<2)
258 struct cmd_struct {
259 const char *cmd;
260 int (*fn)(int, const char **, const char *);
261 int option;
264 static int run_command(struct cmd_struct *p, int argc, const char **argv)
266 int status;
267 struct stat st;
268 const char *prefix;
270 prefix = NULL;
271 if (p->option & RUN_SETUP)
272 prefix = setup_git_directory();
273 if (p->option & USE_PAGER)
274 setup_pager();
275 if (p->option & NEED_WORK_TREE) {
276 const char *work_tree = get_git_work_tree();
277 const char *git_dir = get_git_dir();
278 if (!is_absolute_path(git_dir))
279 set_git_dir(make_absolute_path(git_dir));
280 if (!work_tree || chdir(work_tree))
281 die("%s must be run in a work tree", p->cmd);
283 trace_argv_printf(argv, argc, "trace: built-in: git");
285 status = p->fn(argc, argv, prefix);
286 if (status)
287 return status;
289 /* Somebody closed stdout? */
290 if (fstat(fileno(stdout), &st))
291 return 0;
292 /* Ignore write errors for pipes and sockets.. */
293 if (S_ISFIFO(st.st_mode) || S_ISSOCK(st.st_mode))
294 return 0;
296 /* Check for ENOSPC and EIO errors.. */
297 if (fflush(stdout))
298 die("write failure on standard output: %s", strerror(errno));
299 if (ferror(stdout))
300 die("unknown write failure on standard output");
301 if (fclose(stdout))
302 die("close failed on standard output: %s", strerror(errno));
303 return 0;
306 static void handle_internal_command(int argc, const char **argv)
308 const char *cmd = argv[0];
309 static struct cmd_struct commands[] = {
310 { "add", cmd_add, RUN_SETUP | NEED_WORK_TREE },
311 { "annotate", cmd_annotate, RUN_SETUP },
312 { "apply", cmd_apply },
313 { "archive", cmd_archive },
314 { "blame", cmd_blame, RUN_SETUP },
315 { "branch", cmd_branch, RUN_SETUP },
316 { "bundle", cmd_bundle },
317 { "cat-file", cmd_cat_file, RUN_SETUP },
318 { "checkout-index", cmd_checkout_index, RUN_SETUP },
319 { "check-ref-format", cmd_check_ref_format },
320 { "check-attr", cmd_check_attr, RUN_SETUP | NEED_WORK_TREE },
321 { "cherry", cmd_cherry, RUN_SETUP },
322 { "cherry-pick", cmd_cherry_pick, RUN_SETUP | NEED_WORK_TREE },
323 { "commit-tree", cmd_commit_tree, RUN_SETUP },
324 { "config", cmd_config },
325 { "count-objects", cmd_count_objects, RUN_SETUP },
326 { "describe", cmd_describe, RUN_SETUP },
327 { "diff", cmd_diff, USE_PAGER },
328 { "diff-files", cmd_diff_files },
329 { "diff-index", cmd_diff_index, RUN_SETUP },
330 { "diff-tree", cmd_diff_tree, RUN_SETUP },
331 { "fetch--tool", cmd_fetch__tool, RUN_SETUP },
332 { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
333 { "for-each-ref", cmd_for_each_ref, RUN_SETUP },
334 { "format-patch", cmd_format_patch, RUN_SETUP },
335 { "fsck", cmd_fsck, RUN_SETUP },
336 { "fsck-objects", cmd_fsck, RUN_SETUP },
337 { "gc", cmd_gc, RUN_SETUP },
338 { "get-tar-commit-id", cmd_get_tar_commit_id },
339 { "grep", cmd_grep, RUN_SETUP | USE_PAGER },
340 { "help", cmd_help },
341 { "init", cmd_init_db },
342 { "init-db", cmd_init_db },
343 { "log", cmd_log, RUN_SETUP | USE_PAGER },
344 { "ls-files", cmd_ls_files, RUN_SETUP },
345 { "ls-tree", cmd_ls_tree, RUN_SETUP },
346 { "mailinfo", cmd_mailinfo },
347 { "mailsplit", cmd_mailsplit },
348 { "merge-base", cmd_merge_base, RUN_SETUP },
349 { "merge-file", cmd_merge_file },
350 { "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE },
351 { "name-rev", cmd_name_rev, RUN_SETUP },
352 { "pack-objects", cmd_pack_objects, RUN_SETUP },
353 { "pickaxe", cmd_blame, RUN_SETUP },
354 { "prune", cmd_prune, RUN_SETUP },
355 { "prune-packed", cmd_prune_packed, RUN_SETUP },
356 { "push", cmd_push, RUN_SETUP },
357 { "read-tree", cmd_read_tree, RUN_SETUP },
358 { "reflog", cmd_reflog, RUN_SETUP },
359 { "repo-config", cmd_config },
360 { "rerere", cmd_rerere, RUN_SETUP },
361 { "rev-list", cmd_rev_list, RUN_SETUP },
362 { "rev-parse", cmd_rev_parse, RUN_SETUP },
363 { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
364 { "rm", cmd_rm, RUN_SETUP | NEED_WORK_TREE },
365 { "runstatus", cmd_runstatus, RUN_SETUP | NEED_WORK_TREE },
366 { "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER },
367 { "show-branch", cmd_show_branch, RUN_SETUP },
368 { "show", cmd_show, RUN_SETUP | USE_PAGER },
369 { "stripspace", cmd_stripspace },
370 { "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
371 { "tar-tree", cmd_tar_tree },
372 { "unpack-objects", cmd_unpack_objects, RUN_SETUP },
373 { "update-index", cmd_update_index, RUN_SETUP },
374 { "update-ref", cmd_update_ref, RUN_SETUP },
375 { "upload-archive", cmd_upload_archive },
376 { "version", cmd_version },
377 { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
378 { "write-tree", cmd_write_tree, RUN_SETUP },
379 { "verify-pack", cmd_verify_pack },
380 { "show-ref", cmd_show_ref, RUN_SETUP },
381 { "pack-refs", cmd_pack_refs, RUN_SETUP },
383 int i;
385 /* Turn "git cmd --help" into "git help cmd" */
386 if (argc > 1 && !strcmp(argv[1], "--help")) {
387 argv[1] = argv[0];
388 argv[0] = cmd = "help";
391 for (i = 0; i < ARRAY_SIZE(commands); i++) {
392 struct cmd_struct *p = commands+i;
393 if (strcmp(p->cmd, cmd))
394 continue;
395 exit(run_command(p, argc, argv));
399 int main(int argc, const char **argv)
401 const char *cmd = argv[0] ? argv[0] : "git-help";
402 char *slash = strrchr(cmd, '/');
403 const char *exec_path = NULL;
404 int done_alias = 0;
407 * Take the basename of argv[0] as the command
408 * name, and the dirname as the default exec_path
409 * if it's an absolute path and we don't have
410 * anything better.
412 if (slash) {
413 *slash++ = 0;
414 if (*cmd == '/')
415 exec_path = cmd;
416 cmd = slash;
420 * "git-xxxx" is the same as "git xxxx", but we obviously:
422 * - cannot take flags in between the "git" and the "xxxx".
423 * - cannot execute it externally (since it would just do
424 * the same thing over again)
426 * So we just directly call the internal command handler, and
427 * die if that one cannot handle it.
429 if (!prefixcmp(cmd, "git-")) {
430 cmd += 4;
431 argv[0] = cmd;
432 handle_internal_command(argc, argv);
433 die("cannot handle %s internally", cmd);
436 /* Look for flags.. */
437 argv++;
438 argc--;
439 handle_options(&argv, &argc, NULL);
440 if (argc > 0) {
441 if (!prefixcmp(argv[0], "--"))
442 argv[0] += 2;
443 } else {
444 /* Default command: "help" */
445 argv[0] = "help";
446 argc = 1;
448 cmd = argv[0];
451 * We execute external git command via execv_git_cmd(),
452 * which looks at "--exec-path" option, GIT_EXEC_PATH
453 * environment, and $(gitexecdir) in Makefile while built,
454 * in this order. For scripted commands, we prepend
455 * the value of the exec_path variable to the PATH.
457 if (exec_path)
458 prepend_to_path(exec_path, strlen(exec_path));
459 exec_path = git_exec_path();
460 prepend_to_path(exec_path, strlen(exec_path));
462 while (1) {
463 /* See if it's an internal command */
464 handle_internal_command(argc, argv);
466 /* .. then try the external ones */
467 execv_git_cmd(argv);
469 /* It could be an alias -- this works around the insanity
470 * of overriding "git log" with "git show" by having
471 * alias.log = show
473 if (done_alias || !handle_alias(&argc, &argv))
474 break;
475 done_alias = 1;
478 if (errno == ENOENT) {
479 if (done_alias) {
480 fprintf(stderr, "Expansion of alias '%s' failed; "
481 "'%s' is not a git-command\n",
482 cmd, argv[0]);
483 exit(1);
485 help_unknown_cmd(cmd);
488 fprintf(stderr, "Failed to run command '%s': %s\n",
489 cmd, strerror(errno));
491 return 1;