Ignore merged status of the file-level merge
[git/mergetool.git] / git.c
blobf20090721aa799a8dfd780291c8a83bd834b45b5
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] [--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)
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 (*argv)++;
68 (*argc)--;
69 handled++;
70 } else if (!prefixcmp(cmd, "--git-dir=")) {
71 setenv(GIT_DIR_ENVIRONMENT, cmd + 10, 1);
72 } else if (!strcmp(cmd, "--bare")) {
73 static char git_dir[PATH_MAX+1];
74 setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, sizeof(git_dir)), 1);
75 } else {
76 fprintf(stderr, "Unknown option: %s\n", cmd);
77 usage(git_usage_string);
80 (*argv)++;
81 (*argc)--;
82 handled++;
84 return handled;
87 static const char *alias_command;
88 static char *alias_string;
90 static int git_alias_config(const char *var, const char *value)
92 if (!prefixcmp(var, "alias.") && !strcmp(var + 6, alias_command)) {
93 alias_string = xstrdup(value);
95 return 0;
98 static int split_cmdline(char *cmdline, const char ***argv)
100 int src, dst, count = 0, size = 16;
101 char quoted = 0;
103 *argv = xmalloc(sizeof(char*) * size);
105 /* split alias_string */
106 (*argv)[count++] = cmdline;
107 for (src = dst = 0; cmdline[src];) {
108 char c = cmdline[src];
109 if (!quoted && isspace(c)) {
110 cmdline[dst++] = 0;
111 while (cmdline[++src]
112 && isspace(cmdline[src]))
113 ; /* skip */
114 if (count >= size) {
115 size += 16;
116 *argv = xrealloc(*argv, sizeof(char*) * size);
118 (*argv)[count++] = cmdline + dst;
119 } else if(!quoted && (c == '\'' || c == '"')) {
120 quoted = c;
121 src++;
122 } else if (c == quoted) {
123 quoted = 0;
124 src++;
125 } else {
126 if (c == '\\' && quoted != '\'') {
127 src++;
128 c = cmdline[src];
129 if (!c) {
130 free(*argv);
131 *argv = NULL;
132 return error("cmdline ends with \\");
135 cmdline[dst++] = c;
136 src++;
140 cmdline[dst] = 0;
142 if (quoted) {
143 free(*argv);
144 *argv = NULL;
145 return error("unclosed quote");
148 return count;
151 static int handle_alias(int *argcp, const char ***argv)
153 int nongit = 0, ret = 0, saved_errno = errno;
154 const char *subdir;
155 int count, option_count;
156 const char** new_argv;
158 subdir = setup_git_directory_gently(&nongit);
160 alias_command = (*argv)[0];
161 git_config(git_alias_config);
162 if (alias_string) {
163 if (alias_string[0] == '!') {
164 trace_printf("trace: alias to shell cmd: %s => %s\n",
165 alias_command, alias_string + 1);
166 ret = system(alias_string + 1);
167 if (ret >= 0 && WIFEXITED(ret) &&
168 WEXITSTATUS(ret) != 127)
169 exit(WEXITSTATUS(ret));
170 die("Failed to run '%s' when expanding alias '%s'\n",
171 alias_string + 1, alias_command);
173 count = split_cmdline(alias_string, &new_argv);
174 option_count = handle_options(&new_argv, &count);
175 memmove(new_argv - option_count, new_argv,
176 count * sizeof(char *));
177 new_argv -= option_count;
179 if (count < 1)
180 die("empty alias for %s", alias_command);
182 if (!strcmp(alias_command, new_argv[0]))
183 die("recursive alias: %s", alias_command);
185 trace_argv_printf(new_argv, count,
186 "trace: alias expansion: %s =>",
187 alias_command);
189 new_argv = xrealloc(new_argv, sizeof(char*) *
190 (count + *argcp + 1));
191 /* insert after command name */
192 memcpy(new_argv + count, *argv + 1, sizeof(char*) * *argcp);
193 new_argv[count+*argcp] = NULL;
195 *argv = new_argv;
196 *argcp += count - 1;
198 ret = 1;
201 if (subdir)
202 chdir(subdir);
204 errno = saved_errno;
206 return ret;
209 const char git_version_string[] = GIT_VERSION;
211 #define RUN_SETUP (1<<0)
212 #define USE_PAGER (1<<1)
214 * require working tree to be present -- anything uses this needs
215 * RUN_SETUP for reading from the configuration file.
217 #define NOT_BARE (1<<2)
219 static void handle_internal_command(int argc, const char **argv, char **envp)
221 const char *cmd = argv[0];
222 static struct cmd_struct {
223 const char *cmd;
224 int (*fn)(int, const char **, const char *);
225 int option;
226 } commands[] = {
227 { "add", cmd_add, RUN_SETUP | NOT_BARE },
228 { "annotate", cmd_annotate, USE_PAGER },
229 { "apply", cmd_apply },
230 { "archive", cmd_archive },
231 { "blame", cmd_blame, RUN_SETUP },
232 { "branch", cmd_branch, RUN_SETUP },
233 { "bundle", cmd_bundle },
234 { "cat-file", cmd_cat_file, RUN_SETUP },
235 { "checkout-index", cmd_checkout_index, RUN_SETUP },
236 { "check-ref-format", cmd_check_ref_format },
237 { "check-attr", cmd_check_attr, RUN_SETUP | NOT_BARE },
238 { "cherry", cmd_cherry, RUN_SETUP },
239 { "cherry-pick", cmd_cherry_pick, RUN_SETUP | NOT_BARE },
240 { "commit-tree", cmd_commit_tree, RUN_SETUP },
241 { "config", cmd_config },
242 { "count-objects", cmd_count_objects, RUN_SETUP },
243 { "describe", cmd_describe, RUN_SETUP },
244 { "diff", cmd_diff, USE_PAGER },
245 { "diff-files", cmd_diff_files },
246 { "diff-index", cmd_diff_index, RUN_SETUP },
247 { "diff-tree", cmd_diff_tree, RUN_SETUP },
248 { "fetch--tool", cmd_fetch__tool, RUN_SETUP },
249 { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
250 { "for-each-ref", cmd_for_each_ref, RUN_SETUP },
251 { "format-patch", cmd_format_patch, RUN_SETUP },
252 { "fsck", cmd_fsck, RUN_SETUP },
253 { "fsck-objects", cmd_fsck, RUN_SETUP },
254 { "gc", cmd_gc, RUN_SETUP },
255 { "get-tar-commit-id", cmd_get_tar_commit_id },
256 { "grep", cmd_grep, RUN_SETUP | USE_PAGER },
257 { "help", cmd_help },
258 { "init", cmd_init_db },
259 { "init-db", cmd_init_db },
260 { "log", cmd_log, RUN_SETUP | USE_PAGER },
261 { "ls-files", cmd_ls_files, RUN_SETUP },
262 { "ls-tree", cmd_ls_tree, RUN_SETUP },
263 { "mailinfo", cmd_mailinfo },
264 { "mailsplit", cmd_mailsplit },
265 { "merge-base", cmd_merge_base, RUN_SETUP },
266 { "merge-file", cmd_merge_file },
267 { "mv", cmd_mv, RUN_SETUP | NOT_BARE },
268 { "name-rev", cmd_name_rev, RUN_SETUP },
269 { "pack-objects", cmd_pack_objects, RUN_SETUP },
270 { "pickaxe", cmd_blame, RUN_SETUP | USE_PAGER },
271 { "prune", cmd_prune, RUN_SETUP },
272 { "prune-packed", cmd_prune_packed, RUN_SETUP },
273 { "push", cmd_push, RUN_SETUP },
274 { "read-tree", cmd_read_tree, RUN_SETUP },
275 { "reflog", cmd_reflog, RUN_SETUP },
276 { "repo-config", cmd_config },
277 { "rerere", cmd_rerere, RUN_SETUP },
278 { "rev-list", cmd_rev_list, RUN_SETUP },
279 { "rev-parse", cmd_rev_parse, RUN_SETUP },
280 { "revert", cmd_revert, RUN_SETUP | NOT_BARE },
281 { "rm", cmd_rm, RUN_SETUP | NOT_BARE },
282 { "runstatus", cmd_runstatus, RUN_SETUP | NOT_BARE },
283 { "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER },
284 { "show-branch", cmd_show_branch, RUN_SETUP },
285 { "show", cmd_show, RUN_SETUP | USE_PAGER },
286 { "stripspace", cmd_stripspace },
287 { "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
288 { "tar-tree", cmd_tar_tree },
289 { "unpack-objects", cmd_unpack_objects, RUN_SETUP },
290 { "update-index", cmd_update_index, RUN_SETUP },
291 { "update-ref", cmd_update_ref, RUN_SETUP },
292 { "upload-archive", cmd_upload_archive },
293 { "version", cmd_version },
294 { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
295 { "write-tree", cmd_write_tree, RUN_SETUP },
296 { "verify-pack", cmd_verify_pack },
297 { "show-ref", cmd_show_ref, RUN_SETUP },
298 { "pack-refs", cmd_pack_refs, RUN_SETUP },
300 int i;
302 /* Turn "git cmd --help" into "git help cmd" */
303 if (argc > 1 && !strcmp(argv[1], "--help")) {
304 argv[1] = argv[0];
305 argv[0] = cmd = "help";
308 for (i = 0; i < ARRAY_SIZE(commands); i++) {
309 struct cmd_struct *p = commands+i;
310 const char *prefix;
311 if (strcmp(p->cmd, cmd))
312 continue;
314 prefix = NULL;
315 if (p->option & RUN_SETUP)
316 prefix = setup_git_directory();
317 if (p->option & USE_PAGER)
318 setup_pager();
319 if ((p->option & NOT_BARE) &&
320 (is_bare_repository() || is_inside_git_dir()))
321 die("%s must be run in a work tree", cmd);
322 trace_argv_printf(argv, argc, "trace: built-in: git");
324 exit(p->fn(argc, argv, prefix));
328 int main(int argc, const char **argv, char **envp)
330 const char *cmd = argv[0] ? argv[0] : "git-help";
331 char *slash = strrchr(cmd, '/');
332 const char *exec_path = NULL;
333 int done_alias = 0;
336 * Take the basename of argv[0] as the command
337 * name, and the dirname as the default exec_path
338 * if it's an absolute path and we don't have
339 * anything better.
341 if (slash) {
342 *slash++ = 0;
343 if (*cmd == '/')
344 exec_path = cmd;
345 cmd = slash;
349 * "git-xxxx" is the same as "git xxxx", but we obviously:
351 * - cannot take flags in between the "git" and the "xxxx".
352 * - cannot execute it externally (since it would just do
353 * the same thing over again)
355 * So we just directly call the internal command handler, and
356 * die if that one cannot handle it.
358 if (!prefixcmp(cmd, "git-")) {
359 cmd += 4;
360 argv[0] = cmd;
361 handle_internal_command(argc, argv, envp);
362 die("cannot handle %s internally", cmd);
365 /* Look for flags.. */
366 argv++;
367 argc--;
368 handle_options(&argv, &argc);
369 if (argc > 0) {
370 if (!prefixcmp(argv[0], "--"))
371 argv[0] += 2;
372 } else {
373 /* Default command: "help" */
374 argv[0] = "help";
375 argc = 1;
377 cmd = argv[0];
380 * We search for git commands in the following order:
381 * - git_exec_path()
382 * - the path of the "git" command if we could find it
383 * in $0
384 * - the regular PATH.
386 if (exec_path)
387 prepend_to_path(exec_path, strlen(exec_path));
388 exec_path = git_exec_path();
389 prepend_to_path(exec_path, strlen(exec_path));
391 while (1) {
392 /* See if it's an internal command */
393 handle_internal_command(argc, argv, envp);
395 /* .. then try the external ones */
396 execv_git_cmd(argv);
398 /* It could be an alias -- this works around the insanity
399 * of overriding "git log" with "git show" by having
400 * alias.log = show
402 if (done_alias || !handle_alias(&argc, &argv))
403 break;
404 done_alias = 1;
407 if (errno == ENOENT) {
408 if (done_alias) {
409 fprintf(stderr, "Expansion of alias '%s' failed; "
410 "'%s' is not a git-command\n",
411 cmd, argv[0]);
412 exit(1);
414 help_unknown_cmd(cmd);
417 fprintf(stderr, "Failed to run command '%s': %s\n",
418 cmd, strerror(errno));
420 return 1;