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