t6021: add a new test for git-merge-resolve
[git/dscho.git] / git.c
blob770aadd0a4ad358ec3dc290eed417df1698fd18e
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|--no-pager] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]";
9 const char git_more_info_string[] =
10 "See 'git help COMMAND' for more information on a specific command.";
12 static int handle_options(const char*** argv, int* argc, int* envchanged)
14 int handled = 0;
16 while (*argc > 0) {
17 const char *cmd = (*argv)[0];
18 if (cmd[0] != '-')
19 break;
22 * For legacy reasons, the "version" and "help"
23 * commands can be written with "--" prepended
24 * to make them look like flags.
26 if (!strcmp(cmd, "--help") || !strcmp(cmd, "--version"))
27 break;
30 * Check remaining flags.
32 if (!prefixcmp(cmd, "--exec-path")) {
33 cmd += 11;
34 if (*cmd == '=')
35 git_set_argv_exec_path(cmd + 1);
36 else {
37 puts(git_exec_path());
38 exit(0);
40 } else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) {
41 setup_pager();
42 } else if (!strcmp(cmd, "--no-pager")) {
43 setenv("GIT_PAGER", "cat", 1);
44 if (envchanged)
45 *envchanged = 1;
46 } else if (!strcmp(cmd, "--git-dir")) {
47 if (*argc < 2) {
48 fprintf(stderr, "No directory given for --git-dir.\n" );
49 usage(git_usage_string);
51 setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1);
52 if (envchanged)
53 *envchanged = 1;
54 (*argv)++;
55 (*argc)--;
56 handled++;
57 } else if (!prefixcmp(cmd, "--git-dir=")) {
58 setenv(GIT_DIR_ENVIRONMENT, cmd + 10, 1);
59 if (envchanged)
60 *envchanged = 1;
61 } else if (!strcmp(cmd, "--work-tree")) {
62 if (*argc < 2) {
63 fprintf(stderr, "No directory given for --work-tree.\n" );
64 usage(git_usage_string);
66 setenv(GIT_WORK_TREE_ENVIRONMENT, (*argv)[1], 1);
67 if (envchanged)
68 *envchanged = 1;
69 (*argv)++;
70 (*argc)--;
71 } else if (!prefixcmp(cmd, "--work-tree=")) {
72 setenv(GIT_WORK_TREE_ENVIRONMENT, cmd + 12, 1);
73 if (envchanged)
74 *envchanged = 1;
75 } else if (!strcmp(cmd, "--bare")) {
76 static char git_dir[PATH_MAX+1];
77 is_bare_repository_cfg = 1;
78 setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, sizeof(git_dir)), 0);
79 if (envchanged)
80 *envchanged = 1;
81 } else {
82 fprintf(stderr, "Unknown option: %s\n", cmd);
83 usage(git_usage_string);
86 (*argv)++;
87 (*argc)--;
88 handled++;
90 return handled;
93 static int handle_alias(int *argcp, const char ***argv)
95 int envchanged = 0, ret = 0, saved_errno = errno;
96 const char *subdir;
97 int count, option_count;
98 const char** new_argv;
99 const char *alias_command;
100 char *alias_string;
101 int unused_nongit;
103 subdir = setup_git_directory_gently(&unused_nongit);
105 alias_command = (*argv)[0];
106 alias_string = alias_lookup(alias_command);
107 if (alias_string) {
108 if (alias_string[0] == '!') {
109 if (*argcp > 1) {
110 struct strbuf buf;
112 strbuf_init(&buf, PATH_MAX);
113 strbuf_addstr(&buf, alias_string);
114 sq_quote_argv(&buf, (*argv) + 1, PATH_MAX);
115 free(alias_string);
116 alias_string = buf.buf;
118 trace_printf("trace: alias to shell cmd: %s => %s\n",
119 alias_command, alias_string + 1);
120 ret = system(alias_string + 1);
121 if (ret >= 0 && WIFEXITED(ret) &&
122 WEXITSTATUS(ret) != 127)
123 exit(WEXITSTATUS(ret));
124 die("Failed to run '%s' when expanding alias '%s'\n",
125 alias_string + 1, alias_command);
127 count = split_cmdline(alias_string, &new_argv);
128 option_count = handle_options(&new_argv, &count, &envchanged);
129 if (envchanged)
130 die("alias '%s' changes environment variables\n"
131 "You can use '!git' in the alias to do this.",
132 alias_command);
133 memmove(new_argv - option_count, new_argv,
134 count * sizeof(char *));
135 new_argv -= option_count;
137 if (count < 1)
138 die("empty alias for %s", alias_command);
140 if (!strcmp(alias_command, new_argv[0]))
141 die("recursive alias: %s", alias_command);
143 trace_argv_printf(new_argv,
144 "trace: alias expansion: %s =>",
145 alias_command);
147 new_argv = xrealloc(new_argv, sizeof(char*) *
148 (count + *argcp + 1));
149 /* insert after command name */
150 memcpy(new_argv + count, *argv + 1, sizeof(char*) * *argcp);
151 new_argv[count+*argcp] = NULL;
153 *argv = new_argv;
154 *argcp += count - 1;
156 ret = 1;
159 if (subdir)
160 chdir(subdir);
162 errno = saved_errno;
164 return ret;
167 const char git_version_string[] = GIT_VERSION;
169 #define RUN_SETUP (1<<0)
170 #define USE_PAGER (1<<1)
172 * require working tree to be present -- anything uses this needs
173 * RUN_SETUP for reading from the configuration file.
175 #define NEED_WORK_TREE (1<<2)
177 struct cmd_struct {
178 const char *cmd;
179 int (*fn)(int, const char **, const char *);
180 int option;
183 static int run_command(struct cmd_struct *p, int argc, const char **argv)
185 int status;
186 struct stat st;
187 const char *prefix;
189 prefix = NULL;
190 if (p->option & RUN_SETUP)
191 prefix = setup_git_directory();
192 if (p->option & USE_PAGER)
193 setup_pager();
194 if (p->option & NEED_WORK_TREE)
195 setup_work_tree();
197 trace_argv_printf(argv, "trace: built-in: git");
199 status = p->fn(argc, argv, prefix);
200 if (status)
201 return status & 0xff;
203 /* Somebody closed stdout? */
204 if (fstat(fileno(stdout), &st))
205 return 0;
206 /* Ignore write errors for pipes and sockets.. */
207 if (S_ISFIFO(st.st_mode) || S_ISSOCK(st.st_mode))
208 return 0;
210 /* Check for ENOSPC and EIO errors.. */
211 if (fflush(stdout))
212 die("write failure on standard output: %s", strerror(errno));
213 if (ferror(stdout))
214 die("unknown write failure on standard output");
215 if (fclose(stdout))
216 die("close failed on standard output: %s", strerror(errno));
217 return 0;
220 static void handle_internal_command(int argc, const char **argv)
222 const char *cmd = argv[0];
223 static struct cmd_struct commands[] = {
224 { "add", cmd_add, RUN_SETUP | NEED_WORK_TREE },
225 { "annotate", cmd_annotate, RUN_SETUP },
226 { "apply", cmd_apply },
227 { "archive", cmd_archive },
228 { "blame", cmd_blame, RUN_SETUP },
229 { "branch", cmd_branch, RUN_SETUP },
230 { "bundle", cmd_bundle },
231 { "cat-file", cmd_cat_file, RUN_SETUP },
232 { "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE },
233 { "checkout-index", cmd_checkout_index,
234 RUN_SETUP | NEED_WORK_TREE},
235 { "check-ref-format", cmd_check_ref_format },
236 { "check-attr", cmd_check_attr, RUN_SETUP },
237 { "cherry", cmd_cherry, RUN_SETUP },
238 { "cherry-pick", cmd_cherry_pick, RUN_SETUP | NEED_WORK_TREE },
239 { "clone", cmd_clone },
240 { "clean", cmd_clean, RUN_SETUP | NEED_WORK_TREE },
241 { "commit", cmd_commit, RUN_SETUP | NEED_WORK_TREE },
242 { "commit-tree", cmd_commit_tree, RUN_SETUP },
243 { "config", cmd_config },
244 { "count-objects", cmd_count_objects, RUN_SETUP },
245 { "describe", cmd_describe, RUN_SETUP },
246 { "diff", cmd_diff },
247 { "diff-files", cmd_diff_files, RUN_SETUP },
248 { "diff-index", cmd_diff_index, RUN_SETUP },
249 { "diff-tree", cmd_diff_tree, RUN_SETUP },
250 { "fast-export", cmd_fast_export, RUN_SETUP },
251 { "fetch", cmd_fetch, RUN_SETUP },
252 { "fetch-pack", cmd_fetch_pack, RUN_SETUP },
253 { "fetch--tool", cmd_fetch__tool, RUN_SETUP },
254 { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
255 { "for-each-ref", cmd_for_each_ref, RUN_SETUP },
256 { "format-patch", cmd_format_patch, RUN_SETUP },
257 { "fsck", cmd_fsck, RUN_SETUP },
258 { "fsck-objects", cmd_fsck, RUN_SETUP },
259 { "gc", cmd_gc, RUN_SETUP },
260 { "get-tar-commit-id", cmd_get_tar_commit_id },
261 { "grep", cmd_grep, RUN_SETUP | USE_PAGER },
262 { "help", cmd_help },
263 #ifndef NO_CURL
264 { "http-fetch", cmd_http_fetch, RUN_SETUP },
265 #endif
266 { "init", cmd_init_db },
267 { "init-db", cmd_init_db },
268 { "log", cmd_log, RUN_SETUP | USE_PAGER },
269 { "ls-files", cmd_ls_files, RUN_SETUP },
270 { "ls-tree", cmd_ls_tree, RUN_SETUP },
271 { "ls-remote", cmd_ls_remote },
272 { "mailinfo", cmd_mailinfo },
273 { "mailsplit", cmd_mailsplit },
274 { "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
275 { "merge-base", cmd_merge_base, RUN_SETUP },
276 { "merge-file", cmd_merge_file },
277 { "merge-ours", cmd_merge_ours, RUN_SETUP },
278 { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
279 { "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
280 { "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE },
281 { "name-rev", cmd_name_rev, RUN_SETUP },
282 { "pack-objects", cmd_pack_objects, RUN_SETUP },
283 { "peek-remote", cmd_ls_remote },
284 { "pickaxe", cmd_blame, RUN_SETUP },
285 { "prune", cmd_prune, RUN_SETUP },
286 { "prune-packed", cmd_prune_packed, RUN_SETUP },
287 { "push", cmd_push, RUN_SETUP },
288 { "read-tree", cmd_read_tree, RUN_SETUP },
289 { "reflog", cmd_reflog, RUN_SETUP },
290 { "remote", cmd_remote, RUN_SETUP },
291 { "repo-config", cmd_config },
292 { "rerere", cmd_rerere, RUN_SETUP },
293 { "reset", cmd_reset, RUN_SETUP },
294 { "rev-list", cmd_rev_list, RUN_SETUP },
295 { "rev-parse", cmd_rev_parse },
296 { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
297 { "rm", cmd_rm, RUN_SETUP },
298 { "send-pack", cmd_send_pack, RUN_SETUP },
299 { "shortlog", cmd_shortlog, USE_PAGER },
300 { "show-branch", cmd_show_branch, RUN_SETUP },
301 { "show", cmd_show, RUN_SETUP | USE_PAGER },
302 { "status", cmd_status, RUN_SETUP | NEED_WORK_TREE | USE_PAGER },
303 { "stripspace", cmd_stripspace },
304 { "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
305 { "tag", cmd_tag, RUN_SETUP },
306 { "tar-tree", cmd_tar_tree },
307 { "unpack-objects", cmd_unpack_objects, RUN_SETUP },
308 { "update-index", cmd_update_index, RUN_SETUP },
309 { "update-ref", cmd_update_ref, RUN_SETUP },
310 { "upload-archive", cmd_upload_archive },
311 { "verify-tag", cmd_verify_tag, RUN_SETUP },
312 { "version", cmd_version },
313 { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
314 { "write-tree", cmd_write_tree, RUN_SETUP },
315 { "verify-pack", cmd_verify_pack },
316 { "show-ref", cmd_show_ref, RUN_SETUP },
317 { "pack-refs", cmd_pack_refs, RUN_SETUP },
319 int i;
321 /* Turn "git cmd --help" into "git help cmd" */
322 if (argc > 1 && !strcmp(argv[1], "--help")) {
323 argv[1] = argv[0];
324 argv[0] = cmd = "help";
327 for (i = 0; i < ARRAY_SIZE(commands); i++) {
328 struct cmd_struct *p = commands+i;
329 if (strcmp(p->cmd, cmd))
330 continue;
331 exit(run_command(p, argc, argv));
335 int main(int argc, const char **argv)
337 const char *cmd = argv[0] ? argv[0] : "git-help";
338 char *slash = strrchr(cmd, '/');
339 const char *cmd_path = NULL;
340 int done_alias = 0;
343 * Take the basename of argv[0] as the command
344 * name, and the dirname as the default exec_path
345 * if we don't have anything better.
347 if (slash) {
348 *slash++ = 0;
349 cmd_path = cmd;
350 cmd = slash;
354 * "git-xxxx" is the same as "git xxxx", but we obviously:
356 * - cannot take flags in between the "git" and the "xxxx".
357 * - cannot execute it externally (since it would just do
358 * the same thing over again)
360 * So we just directly call the internal command handler, and
361 * die if that one cannot handle it.
363 if (!prefixcmp(cmd, "git-")) {
364 cmd += 4;
365 argv[0] = cmd;
366 handle_internal_command(argc, argv);
367 die("cannot handle %s internally", cmd);
370 /* Look for flags.. */
371 argv++;
372 argc--;
373 handle_options(&argv, &argc, NULL);
374 if (argc > 0) {
375 if (!prefixcmp(argv[0], "--"))
376 argv[0] += 2;
377 } else {
378 /* The user didn't specify a command; give them help */
379 printf("usage: %s\n\n", git_usage_string);
380 list_common_cmds_help();
381 printf("\n%s\n", git_more_info_string);
382 exit(1);
384 cmd = argv[0];
387 * We use PATH to find git commands, but we prepend some higher
388 * precidence paths: the "--exec-path" option, the GIT_EXEC_PATH
389 * environment, and the $(gitexecdir) from the Makefile at build
390 * time.
392 setup_path(cmd_path);
394 while (1) {
395 /* See if it's an internal command */
396 handle_internal_command(argc, argv);
398 /* .. then try the external ones */
399 execv_git_cmd(argv);
401 /* It could be an alias -- this works around the insanity
402 * of overriding "git log" with "git show" by having
403 * alias.log = show
405 if (done_alias || !handle_alias(&argc, &argv))
406 break;
407 done_alias = 1;
410 if (errno == ENOENT) {
411 if (done_alias) {
412 fprintf(stderr, "Expansion of alias '%s' failed; "
413 "'%s' is not a git-command\n",
414 cmd, argv[0]);
415 exit(1);
417 help_unknown_cmd(cmd);
420 fprintf(stderr, "Failed to run command '%s': %s\n",
421 cmd, strerror(errno));
423 return 1;