merge-tree: fix where two branches share no changes
[git/git-svn.git] / git.c
blob6bae30545b85f19eb51c4b055f303f70909f0cf2
1 #include "builtin.h"
2 #include "exec_cmd.h"
3 #include "cache.h"
4 #include "quote.h"
5 #include "run-command.h"
7 const char git_usage_string[] =
8 "git [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path]\n"
9 " [-p|--paginate|--no-pager] [--no-replace-objects]\n"
10 " [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]\n"
11 " [--help] COMMAND [ARGS]";
13 const char git_more_info_string[] =
14 "See 'git help COMMAND' for more information on a specific command.";
16 static int use_pager = -1;
17 struct pager_config {
18 const char *cmd;
19 int val;
22 static int pager_command_config(const char *var, const char *value, void *data)
24 struct pager_config *c = data;
25 if (!prefixcmp(var, "pager.") && !strcmp(var + 6, c->cmd))
26 c->val = git_config_bool(var, value);
27 return 0;
30 /* returns 0 for "no pager", 1 for "use pager", and -1 for "not specified" */
31 int check_pager_config(const char *cmd)
33 struct pager_config c;
34 c.cmd = cmd;
35 c.val = -1;
36 git_config(pager_command_config, &c);
37 return c.val;
40 static void commit_pager_choice(void) {
41 switch (use_pager) {
42 case 0:
43 setenv("GIT_PAGER", "cat", 1);
44 break;
45 case 1:
46 setup_pager();
47 break;
48 default:
49 break;
53 static int handle_options(const char ***argv, int *argc, int *envchanged)
55 int handled = 0;
57 if (!getenv("GIT_ASKPASS") && getenv("SSH_ASKPASS"))
58 setenv("GIT_ASKPASS", getenv("SSH_ASKPASS"), 1);
60 while (*argc > 0) {
61 const char *cmd = (*argv)[0];
62 if (cmd[0] != '-')
63 break;
66 * For legacy reasons, the "version" and "help"
67 * commands can be written with "--" prepended
68 * to make them look like flags.
70 if (!strcmp(cmd, "--help") || !strcmp(cmd, "--version"))
71 break;
74 * Check remaining flags.
76 if (!prefixcmp(cmd, "--exec-path")) {
77 cmd += 11;
78 if (*cmd == '=')
79 git_set_argv_exec_path(cmd + 1);
80 else {
81 puts(git_exec_path());
82 exit(0);
84 } else if (!strcmp(cmd, "--html-path")) {
85 puts(system_path(GIT_HTML_PATH));
86 exit(0);
87 } else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) {
88 use_pager = 1;
89 } else if (!strcmp(cmd, "--no-pager")) {
90 use_pager = 0;
91 if (envchanged)
92 *envchanged = 1;
93 } else if (!strcmp(cmd, "--no-replace-objects")) {
94 read_replace_refs = 0;
95 setenv(NO_REPLACE_OBJECTS_ENVIRONMENT, "1", 1);
96 if (envchanged)
97 *envchanged = 1;
98 } else if (!strcmp(cmd, "--git-dir")) {
99 if (*argc < 2) {
100 fprintf(stderr, "No directory given for --git-dir.\n" );
101 usage(git_usage_string);
103 setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1);
104 if (envchanged)
105 *envchanged = 1;
106 (*argv)++;
107 (*argc)--;
108 handled++;
109 } else if (!prefixcmp(cmd, "--git-dir=")) {
110 setenv(GIT_DIR_ENVIRONMENT, cmd + 10, 1);
111 if (envchanged)
112 *envchanged = 1;
113 } else if (!strcmp(cmd, "--work-tree")) {
114 if (*argc < 2) {
115 fprintf(stderr, "No directory given for --work-tree.\n" );
116 usage(git_usage_string);
118 setenv(GIT_WORK_TREE_ENVIRONMENT, (*argv)[1], 1);
119 if (envchanged)
120 *envchanged = 1;
121 (*argv)++;
122 (*argc)--;
123 } else if (!prefixcmp(cmd, "--work-tree=")) {
124 setenv(GIT_WORK_TREE_ENVIRONMENT, cmd + 12, 1);
125 if (envchanged)
126 *envchanged = 1;
127 } else if (!strcmp(cmd, "--bare")) {
128 static char git_dir[PATH_MAX+1];
129 is_bare_repository_cfg = 1;
130 setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, sizeof(git_dir)), 0);
131 if (envchanged)
132 *envchanged = 1;
133 } else {
134 fprintf(stderr, "Unknown option: %s\n", cmd);
135 usage(git_usage_string);
138 (*argv)++;
139 (*argc)--;
140 handled++;
142 return handled;
145 static int handle_alias(int *argcp, const char ***argv)
147 int envchanged = 0, ret = 0, saved_errno = errno;
148 const char *subdir;
149 int count, option_count;
150 const char **new_argv;
151 const char *alias_command;
152 char *alias_string;
153 int unused_nongit;
155 subdir = setup_git_directory_gently(&unused_nongit);
157 alias_command = (*argv)[0];
158 alias_string = alias_lookup(alias_command);
159 if (alias_string) {
160 if (alias_string[0] == '!') {
161 if (*argcp > 1) {
162 struct strbuf buf;
164 strbuf_init(&buf, PATH_MAX);
165 strbuf_addstr(&buf, alias_string);
166 sq_quote_argv(&buf, (*argv) + 1, PATH_MAX);
167 free(alias_string);
168 alias_string = buf.buf;
170 trace_printf("trace: alias to shell cmd: %s => %s\n",
171 alias_command, alias_string + 1);
172 ret = system(alias_string + 1);
173 if (ret >= 0 && WIFEXITED(ret) &&
174 WEXITSTATUS(ret) != 127)
175 exit(WEXITSTATUS(ret));
176 die("Failed to run '%s' when expanding alias '%s'",
177 alias_string + 1, alias_command);
179 count = split_cmdline(alias_string, &new_argv);
180 if (count < 0)
181 die("Bad alias.%s string", alias_command);
182 option_count = handle_options(&new_argv, &count, &envchanged);
183 if (envchanged)
184 die("alias '%s' changes environment variables\n"
185 "You can use '!git' in the alias to do this.",
186 alias_command);
187 memmove(new_argv - option_count, new_argv,
188 count * sizeof(char *));
189 new_argv -= option_count;
191 if (count < 1)
192 die("empty alias for %s", alias_command);
194 if (!strcmp(alias_command, new_argv[0]))
195 die("recursive alias: %s", alias_command);
197 trace_argv_printf(new_argv,
198 "trace: alias expansion: %s =>",
199 alias_command);
201 new_argv = xrealloc(new_argv, sizeof(char *) *
202 (count + *argcp));
203 /* insert after command name */
204 memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp);
206 *argv = new_argv;
207 *argcp += count - 1;
209 ret = 1;
212 if (subdir && chdir(subdir))
213 die_errno("Cannot change to '%s'", subdir);
215 errno = saved_errno;
217 return ret;
220 const char git_version_string[] = GIT_VERSION;
222 #define RUN_SETUP (1<<0)
223 #define USE_PAGER (1<<1)
225 * require working tree to be present -- anything uses this needs
226 * RUN_SETUP for reading from the configuration file.
228 #define NEED_WORK_TREE (1<<2)
230 struct cmd_struct {
231 const char *cmd;
232 int (*fn)(int, const char **, const char *);
233 int option;
236 static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
238 int status, help;
239 struct stat st;
240 const char *prefix;
242 prefix = NULL;
243 help = argc == 2 && !strcmp(argv[1], "-h");
244 if (!help) {
245 if (p->option & RUN_SETUP)
246 prefix = setup_git_directory();
248 if (use_pager == -1 && p->option & RUN_SETUP)
249 use_pager = check_pager_config(p->cmd);
250 if (use_pager == -1 && p->option & USE_PAGER)
251 use_pager = 1;
253 commit_pager_choice();
255 if (!help && p->option & NEED_WORK_TREE)
256 setup_work_tree();
258 trace_argv_printf(argv, "trace: built-in: git");
260 status = p->fn(argc, argv, prefix);
261 if (status)
262 return status;
264 /* Somebody closed stdout? */
265 if (fstat(fileno(stdout), &st))
266 return 0;
267 /* Ignore write errors for pipes and sockets.. */
268 if (S_ISFIFO(st.st_mode) || S_ISSOCK(st.st_mode))
269 return 0;
271 /* Check for ENOSPC and EIO errors.. */
272 if (fflush(stdout))
273 die_errno("write failure on standard output");
274 if (ferror(stdout))
275 die("unknown write failure on standard output");
276 if (fclose(stdout))
277 die_errno("close failed on standard output");
278 return 0;
281 static void handle_internal_command(int argc, const char **argv)
283 const char *cmd = argv[0];
284 static struct cmd_struct commands[] = {
285 { "add", cmd_add, RUN_SETUP | NEED_WORK_TREE },
286 { "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE },
287 { "annotate", cmd_annotate, RUN_SETUP },
288 { "apply", cmd_apply },
289 { "archive", cmd_archive },
290 { "bisect--helper", cmd_bisect__helper, RUN_SETUP | NEED_WORK_TREE },
291 { "blame", cmd_blame, RUN_SETUP },
292 { "branch", cmd_branch, RUN_SETUP },
293 { "bundle", cmd_bundle },
294 { "cat-file", cmd_cat_file, RUN_SETUP },
295 { "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE },
296 { "checkout-index", cmd_checkout_index,
297 RUN_SETUP | NEED_WORK_TREE},
298 { "check-ref-format", cmd_check_ref_format },
299 { "check-attr", cmd_check_attr, RUN_SETUP },
300 { "cherry", cmd_cherry, RUN_SETUP },
301 { "cherry-pick", cmd_cherry_pick, RUN_SETUP | NEED_WORK_TREE },
302 { "clone", cmd_clone },
303 { "clean", cmd_clean, RUN_SETUP | NEED_WORK_TREE },
304 { "commit", cmd_commit, RUN_SETUP | NEED_WORK_TREE },
305 { "commit-tree", cmd_commit_tree, RUN_SETUP },
306 { "config", cmd_config },
307 { "count-objects", cmd_count_objects, RUN_SETUP },
308 { "describe", cmd_describe, RUN_SETUP },
309 { "diff", cmd_diff },
310 { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE },
311 { "diff-index", cmd_diff_index, RUN_SETUP },
312 { "diff-tree", cmd_diff_tree, RUN_SETUP },
313 { "fast-export", cmd_fast_export, RUN_SETUP },
314 { "fetch", cmd_fetch, RUN_SETUP },
315 { "fetch-pack", cmd_fetch_pack, RUN_SETUP },
316 { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
317 { "for-each-ref", cmd_for_each_ref, RUN_SETUP },
318 { "format-patch", cmd_format_patch, RUN_SETUP },
319 { "fsck", cmd_fsck, RUN_SETUP },
320 { "fsck-objects", cmd_fsck, RUN_SETUP },
321 { "gc", cmd_gc, RUN_SETUP },
322 { "get-tar-commit-id", cmd_get_tar_commit_id },
323 { "grep", cmd_grep, USE_PAGER },
324 { "hash-object", cmd_hash_object },
325 { "help", cmd_help },
326 { "index-pack", cmd_index_pack },
327 { "init", cmd_init_db },
328 { "init-db", cmd_init_db },
329 { "log", cmd_log, RUN_SETUP | USE_PAGER },
330 { "ls-files", cmd_ls_files, RUN_SETUP },
331 { "ls-tree", cmd_ls_tree, RUN_SETUP },
332 { "ls-remote", cmd_ls_remote },
333 { "mailinfo", cmd_mailinfo },
334 { "mailsplit", cmd_mailsplit },
335 { "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
336 { "merge-base", cmd_merge_base, RUN_SETUP },
337 { "merge-file", cmd_merge_file },
338 { "merge-index", cmd_merge_index, RUN_SETUP },
339 { "merge-ours", cmd_merge_ours, RUN_SETUP },
340 { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
341 { "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
342 { "merge-recursive-theirs", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
343 { "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
344 { "merge-tree", cmd_merge_tree, RUN_SETUP },
345 { "mktag", cmd_mktag, RUN_SETUP },
346 { "mktree", cmd_mktree, RUN_SETUP },
347 { "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE },
348 { "name-rev", cmd_name_rev, RUN_SETUP },
349 { "notes", cmd_notes, RUN_SETUP },
350 { "pack-objects", cmd_pack_objects, RUN_SETUP },
351 { "pack-redundant", cmd_pack_redundant, RUN_SETUP },
352 { "patch-id", cmd_patch_id },
353 { "peek-remote", cmd_ls_remote },
354 { "pickaxe", cmd_blame, RUN_SETUP },
355 { "prune", cmd_prune, RUN_SETUP },
356 { "prune-packed", cmd_prune_packed, RUN_SETUP },
357 { "push", cmd_push, RUN_SETUP },
358 { "read-tree", cmd_read_tree, RUN_SETUP },
359 { "receive-pack", cmd_receive_pack },
360 { "reflog", cmd_reflog, RUN_SETUP },
361 { "remote", cmd_remote, RUN_SETUP },
362 { "replace", cmd_replace, RUN_SETUP },
363 { "repo-config", cmd_config },
364 { "rerere", cmd_rerere, RUN_SETUP },
365 { "reset", cmd_reset, RUN_SETUP },
366 { "rev-list", cmd_rev_list, RUN_SETUP },
367 { "rev-parse", cmd_rev_parse },
368 { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
369 { "rm", cmd_rm, RUN_SETUP },
370 { "send-pack", cmd_send_pack, RUN_SETUP },
371 { "shortlog", cmd_shortlog, USE_PAGER },
372 { "show-branch", cmd_show_branch, RUN_SETUP },
373 { "show", cmd_show, RUN_SETUP | USE_PAGER },
374 { "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
375 { "stripspace", cmd_stripspace },
376 { "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
377 { "tag", cmd_tag, RUN_SETUP },
378 { "tar-tree", cmd_tar_tree },
379 { "unpack-file", cmd_unpack_file, RUN_SETUP },
380 { "unpack-objects", cmd_unpack_objects, RUN_SETUP },
381 { "update-index", cmd_update_index, RUN_SETUP },
382 { "update-ref", cmd_update_ref, RUN_SETUP },
383 { "update-server-info", cmd_update_server_info, RUN_SETUP },
384 { "upload-archive", cmd_upload_archive },
385 { "var", cmd_var },
386 { "verify-tag", cmd_verify_tag, RUN_SETUP },
387 { "version", cmd_version },
388 { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
389 { "write-tree", cmd_write_tree, RUN_SETUP },
390 { "verify-pack", cmd_verify_pack },
391 { "show-ref", cmd_show_ref, RUN_SETUP },
392 { "pack-refs", cmd_pack_refs, RUN_SETUP },
394 int i;
395 static const char ext[] = STRIP_EXTENSION;
397 if (sizeof(ext) > 1) {
398 i = strlen(argv[0]) - strlen(ext);
399 if (i > 0 && !strcmp(argv[0] + i, ext)) {
400 char *argv0 = xstrdup(argv[0]);
401 argv[0] = cmd = argv0;
402 argv0[i] = '\0';
406 /* Turn "git cmd --help" into "git help cmd" */
407 if (argc > 1 && !strcmp(argv[1], "--help")) {
408 argv[1] = argv[0];
409 argv[0] = cmd = "help";
412 for (i = 0; i < ARRAY_SIZE(commands); i++) {
413 struct cmd_struct *p = commands+i;
414 if (strcmp(p->cmd, cmd))
415 continue;
416 exit(run_builtin(p, argc, argv));
420 static void execv_dashed_external(const char **argv)
422 struct strbuf cmd = STRBUF_INIT;
423 const char *tmp;
424 int status;
426 strbuf_addf(&cmd, "git-%s", argv[0]);
429 * argv[0] must be the git command, but the argv array
430 * belongs to the caller, and may be reused in
431 * subsequent loop iterations. Save argv[0] and
432 * restore it on error.
434 tmp = argv[0];
435 argv[0] = cmd.buf;
437 trace_argv_printf(argv, "trace: exec:");
440 * if we fail because the command is not found, it is
441 * OK to return. Otherwise, we just pass along the status code.
443 status = run_command_v_opt(argv, RUN_SILENT_EXEC_FAILURE);
444 if (status >= 0 || errno != ENOENT)
445 exit(status);
447 argv[0] = tmp;
449 strbuf_release(&cmd);
452 static int run_argv(int *argcp, const char ***argv)
454 int done_alias = 0;
456 while (1) {
457 /* See if it's an internal command */
458 handle_internal_command(*argcp, *argv);
460 /* .. then try the external ones */
461 execv_dashed_external(*argv);
463 /* It could be an alias -- this works around the insanity
464 * of overriding "git log" with "git show" by having
465 * alias.log = show
467 if (done_alias || !handle_alias(argcp, argv))
468 break;
469 done_alias = 1;
472 return done_alias;
476 int main(int argc, const char **argv)
478 const char *cmd;
480 cmd = git_extract_argv0_path(argv[0]);
481 if (!cmd)
482 cmd = "git-help";
485 * "git-xxxx" is the same as "git xxxx", but we obviously:
487 * - cannot take flags in between the "git" and the "xxxx".
488 * - cannot execute it externally (since it would just do
489 * the same thing over again)
491 * So we just directly call the internal command handler, and
492 * die if that one cannot handle it.
494 if (!prefixcmp(cmd, "git-")) {
495 cmd += 4;
496 argv[0] = cmd;
497 handle_internal_command(argc, argv);
498 die("cannot handle %s internally", cmd);
501 /* Look for flags.. */
502 argv++;
503 argc--;
504 handle_options(&argv, &argc, NULL);
505 commit_pager_choice();
506 if (argc > 0) {
507 if (!prefixcmp(argv[0], "--"))
508 argv[0] += 2;
509 } else {
510 /* The user didn't specify a command; give them help */
511 printf("usage: %s\n\n", git_usage_string);
512 list_common_cmds_help();
513 printf("\n%s\n", git_more_info_string);
514 exit(1);
516 cmd = argv[0];
519 * We use PATH to find git commands, but we prepend some higher
520 * precedence paths: the "--exec-path" option, the GIT_EXEC_PATH
521 * environment, and the $(gitexecdir) from the Makefile at build
522 * time.
524 setup_path();
526 while (1) {
527 static int done_help = 0;
528 static int was_alias = 0;
529 was_alias = run_argv(&argc, &argv);
530 if (errno != ENOENT)
531 break;
532 if (was_alias) {
533 fprintf(stderr, "Expansion of alias '%s' failed; "
534 "'%s' is not a git command\n",
535 cmd, argv[0]);
536 exit(1);
538 if (!done_help) {
539 cmd = argv[0] = help_unknown_cmd(cmd);
540 done_help = 1;
541 } else
542 break;
545 fprintf(stderr, "Failed to run command '%s': %s\n",
546 cmd, strerror(errno));
548 return 1;