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