builtin-checkout.con commit builtin-checkout.c: Remove unused prefix arguments in switch_branches path (75ea38d)
   1#include "cache.h"
   2#include "builtin.h"
   3#include "parse-options.h"
   4#include "refs.h"
   5#include "commit.h"
   6#include "tree.h"
   7#include "tree-walk.h"
   8#include "unpack-trees.h"
   9#include "dir.h"
  10#include "run-command.h"
  11#include "merge-recursive.h"
  12#include "branch.h"
  13#include "diff.h"
  14#include "revision.h"
  15#include "remote.h"
  16
  17static const char * const checkout_usage[] = {
  18        "git checkout [options] <branch>",
  19        "git checkout [options] [<branch>] -- <file>...",
  20        NULL,
  21};
  22
  23static int post_checkout_hook(struct commit *old, struct commit *new,
  24                              int changed)
  25{
  26        struct child_process proc;
  27        const char *name = git_path("hooks/post-checkout");
  28        const char *argv[5];
  29
  30        if (access(name, X_OK) < 0)
  31                return 0;
  32
  33        memset(&proc, 0, sizeof(proc));
  34        argv[0] = name;
  35        argv[1] = xstrdup(sha1_to_hex(old->object.sha1));
  36        argv[2] = xstrdup(sha1_to_hex(new->object.sha1));
  37        argv[3] = changed ? "1" : "0";
  38        argv[4] = NULL;
  39        proc.argv = argv;
  40        proc.no_stdin = 1;
  41        proc.stdout_to_stderr = 1;
  42        return run_command(&proc);
  43}
  44
  45static int update_some(const unsigned char *sha1, const char *base, int baselen,
  46                       const char *pathname, unsigned mode, int stage)
  47{
  48        int len;
  49        struct cache_entry *ce;
  50
  51        if (S_ISGITLINK(mode))
  52                return 0;
  53
  54        if (S_ISDIR(mode))
  55                return READ_TREE_RECURSIVE;
  56
  57        len = baselen + strlen(pathname);
  58        ce = xcalloc(1, cache_entry_size(len));
  59        hashcpy(ce->sha1, sha1);
  60        memcpy(ce->name, base, baselen);
  61        memcpy(ce->name + baselen, pathname, len - baselen);
  62        ce->ce_flags = create_ce_flags(len, 0);
  63        ce->ce_mode = create_ce_mode(mode);
  64        add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
  65        return 0;
  66}
  67
  68static int read_tree_some(struct tree *tree, const char **pathspec)
  69{
  70        int newfd;
  71        struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
  72        newfd = hold_locked_index(lock_file, 1);
  73        read_cache();
  74
  75        read_tree_recursive(tree, "", 0, 0, pathspec, update_some);
  76
  77        if (write_cache(newfd, active_cache, active_nr) ||
  78            commit_locked_index(lock_file))
  79                die("unable to write new index file");
  80
  81        /* update the index with the given tree's info
  82         * for all args, expanding wildcards, and exit
  83         * with any non-zero return code.
  84         */
  85        return 0;
  86}
  87
  88static int checkout_paths(const char **pathspec)
  89{
  90        int pos;
  91        struct checkout state;
  92        static char *ps_matched;
  93        unsigned char rev[20];
  94        int flag;
  95        struct commit *head;
  96
  97        for (pos = 0; pathspec[pos]; pos++)
  98                ;
  99        ps_matched = xcalloc(1, pos);
 100
 101        for (pos = 0; pos < active_nr; pos++) {
 102                struct cache_entry *ce = active_cache[pos];
 103                pathspec_match(pathspec, ps_matched, ce->name, 0);
 104        }
 105
 106        if (report_path_error(ps_matched, pathspec, 0))
 107                return 1;
 108
 109        memset(&state, 0, sizeof(state));
 110        state.force = 1;
 111        state.refresh_cache = 1;
 112        for (pos = 0; pos < active_nr; pos++) {
 113                struct cache_entry *ce = active_cache[pos];
 114                if (pathspec_match(pathspec, NULL, ce->name, 0)) {
 115                        checkout_entry(ce, &state, NULL);
 116                }
 117        }
 118
 119        resolve_ref("HEAD", rev, 0, &flag);
 120        head = lookup_commit_reference_gently(rev, 1);
 121
 122        return post_checkout_hook(head, head, 0);
 123}
 124
 125static void show_local_changes(struct object *head)
 126{
 127        struct rev_info rev;
 128        /* I think we want full paths, even if we're in a subdirectory. */
 129        init_revisions(&rev, NULL);
 130        rev.abbrev = 0;
 131        rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
 132        add_pending_object(&rev, head, NULL);
 133        run_diff_index(&rev, 0);
 134}
 135
 136static void describe_detached_head(char *msg, struct commit *commit)
 137{
 138        struct strbuf sb;
 139        strbuf_init(&sb, 0);
 140        parse_commit(commit);
 141        pretty_print_commit(CMIT_FMT_ONELINE, commit, &sb, 0, "", "", 0, 0);
 142        fprintf(stderr, "%s %s... %s\n", msg,
 143                find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), sb.buf);
 144        strbuf_release(&sb);
 145}
 146
 147static int reset_to_new(struct tree *tree, int quiet)
 148{
 149        struct unpack_trees_options opts;
 150        struct tree_desc tree_desc;
 151        memset(&opts, 0, sizeof(opts));
 152        opts.head_idx = -1;
 153        opts.update = 1;
 154        opts.reset = 1;
 155        opts.merge = 1;
 156        opts.fn = oneway_merge;
 157        opts.verbose_update = !quiet;
 158        parse_tree(tree);
 159        init_tree_desc(&tree_desc, tree->buffer, tree->size);
 160        if (unpack_trees(1, &tree_desc, &opts))
 161                return 128;
 162        return 0;
 163}
 164
 165static void reset_clean_to_new(struct tree *tree, int quiet)
 166{
 167        struct unpack_trees_options opts;
 168        struct tree_desc tree_desc;
 169        memset(&opts, 0, sizeof(opts));
 170        opts.head_idx = -1;
 171        opts.skip_unmerged = 1;
 172        opts.reset = 1;
 173        opts.merge = 1;
 174        opts.fn = oneway_merge;
 175        opts.verbose_update = !quiet;
 176        parse_tree(tree);
 177        init_tree_desc(&tree_desc, tree->buffer, tree->size);
 178        if (unpack_trees(1, &tree_desc, &opts))
 179                exit(128);
 180}
 181
 182struct checkout_opts {
 183        int quiet;
 184        int merge;
 185        int force;
 186
 187        char *new_branch;
 188        int new_branch_log;
 189        int track;
 190};
 191
 192struct branch_info {
 193        const char *name; /* The short name used */
 194        const char *path; /* The full name of a real branch */
 195        struct commit *commit; /* The named commit */
 196};
 197
 198static void setup_branch_path(struct branch_info *branch)
 199{
 200        struct strbuf buf;
 201        strbuf_init(&buf, 0);
 202        strbuf_addstr(&buf, "refs/heads/");
 203        strbuf_addstr(&buf, branch->name);
 204        branch->path = strbuf_detach(&buf, NULL);
 205}
 206
 207static int merge_working_tree(struct checkout_opts *opts,
 208                              struct branch_info *old, struct branch_info *new)
 209{
 210        int ret;
 211        struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
 212        int newfd = hold_locked_index(lock_file, 1);
 213        read_cache();
 214
 215        if (opts->force) {
 216                ret = reset_to_new(new->commit->tree, opts->quiet);
 217                if (ret)
 218                        return ret;
 219        } else {
 220                struct tree_desc trees[2];
 221                struct tree *tree;
 222                struct unpack_trees_options topts;
 223                memset(&topts, 0, sizeof(topts));
 224                topts.head_idx = -1;
 225
 226                refresh_cache(REFRESH_QUIET);
 227
 228                if (unmerged_cache()) {
 229                        ret = opts->merge ? -1 :
 230                                error("you need to resolve your current index first");
 231                } else {
 232                        topts.update = 1;
 233                        topts.merge = 1;
 234                        topts.gently = opts->merge;
 235                        topts.fn = twoway_merge;
 236                        topts.dir = xcalloc(1, sizeof(*topts.dir));
 237                        topts.dir->show_ignored = 1;
 238                        topts.dir->exclude_per_dir = ".gitignore";
 239                        tree = parse_tree_indirect(old->commit->object.sha1);
 240                        init_tree_desc(&trees[0], tree->buffer, tree->size);
 241                        tree = parse_tree_indirect(new->commit->object.sha1);
 242                        init_tree_desc(&trees[1], tree->buffer, tree->size);
 243                        ret = unpack_trees(2, trees, &topts);
 244                }
 245                if (ret) {
 246                        /*
 247                         * Unpack couldn't do a trivial merge; either
 248                         * give up or do a real merge, depending on
 249                         * whether the merge flag was used.
 250                         */
 251                        struct tree *result;
 252                        struct tree *work;
 253                        if (!opts->merge)
 254                                return 1;
 255                        parse_commit(old->commit);
 256
 257                        /* Do more real merge */
 258
 259                        /*
 260                         * We update the index fully, then write the
 261                         * tree from the index, then merge the new
 262                         * branch with the current tree, with the old
 263                         * branch as the base. Then we reset the index
 264                         * (but not the working tree) to the new
 265                         * branch, leaving the working tree as the
 266                         * merged version, but skipping unmerged
 267                         * entries in the index.
 268                         */
 269
 270                        add_files_to_cache(0, NULL, NULL);
 271                        work = write_tree_from_memory();
 272
 273                        ret = reset_to_new(new->commit->tree, opts->quiet);
 274                        if (ret)
 275                                return ret;
 276                        merge_trees(new->commit->tree, work, old->commit->tree,
 277                                    new->name, "local", &result);
 278                        reset_clean_to_new(new->commit->tree, opts->quiet);
 279                }
 280        }
 281
 282        if (write_cache(newfd, active_cache, active_nr) ||
 283            commit_locked_index(lock_file))
 284                die("unable to write new index file");
 285
 286        if (!opts->force)
 287                show_local_changes(&new->commit->object);
 288
 289        return 0;
 290}
 291
 292static void adjust_to_tracking(struct branch_info *new, struct checkout_opts *opts)
 293{
 294        /*
 295         * We have switched to a new branch; is it building on
 296         * top of another branch, and if so does that other branch
 297         * have changes we do not have yet?
 298         */
 299        char *base;
 300        unsigned char sha1[20];
 301        struct commit *ours, *theirs;
 302        char symmetric[84];
 303        struct rev_info revs;
 304        const char *rev_argv[10];
 305        int rev_argc;
 306        int num_ours, num_theirs;
 307        const char *remote_msg;
 308        struct branch *branch = branch_get(NULL);
 309
 310        /*
 311         * Nothing to report unless we are marked to build on top of
 312         * somebody else.
 313         */
 314        if (!branch || !branch->merge)
 315                return;
 316
 317        /*
 318         * If what we used to build on no longer exists, there is
 319         * nothing to report.
 320         */
 321        base = branch->merge[0]->dst;
 322        if (!resolve_ref(base, sha1, 1, NULL))
 323                return;
 324
 325        theirs = lookup_commit(sha1);
 326        ours = new->commit;
 327        if (!hashcmp(sha1, ours->object.sha1))
 328                return; /* we are the same */
 329
 330        /* Run "rev-list --left-right ours...theirs" internally... */
 331        rev_argc = 0;
 332        rev_argv[rev_argc++] = NULL;
 333        rev_argv[rev_argc++] = "--left-right";
 334        rev_argv[rev_argc++] = symmetric;
 335        rev_argv[rev_argc++] = "--";
 336        rev_argv[rev_argc] = NULL;
 337
 338        strcpy(symmetric, sha1_to_hex(ours->object.sha1));
 339        strcpy(symmetric + 40, "...");
 340        strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1));
 341
 342        init_revisions(&revs, NULL);
 343        setup_revisions(rev_argc, rev_argv, &revs, NULL);
 344        prepare_revision_walk(&revs);
 345
 346        /* ... and count the commits on each side. */
 347        num_ours = 0;
 348        num_theirs = 0;
 349        while (1) {
 350                struct commit *c = get_revision(&revs);
 351                if (!c)
 352                        break;
 353                if (c->object.flags & SYMMETRIC_LEFT)
 354                        num_ours++;
 355                else
 356                        num_theirs++;
 357        }
 358
 359        if (!prefixcmp(base, "refs/remotes/")) {
 360                remote_msg = " remote";
 361                base += strlen("refs/remotes/");
 362        } else {
 363                remote_msg = "";
 364        }
 365
 366        if (!num_theirs)
 367                printf("Your branch is ahead of the tracked%s branch '%s' "
 368                       "by %d commit%s.\n",
 369                       remote_msg, base,
 370                       num_ours, (num_ours == 1) ? "" : "s");
 371        else if (!num_ours)
 372                printf("Your branch is behind of the tracked%s branch '%s' "
 373                       "by %d commit%s,\n"
 374                       "and can be fast-forwarded.\n",
 375                       remote_msg, base,
 376                       num_theirs, (num_theirs == 1) ? "" : "s");
 377        else
 378                printf("Your branch and the tracked%s branch '%s' "
 379                       "have diverged,\nand respectively "
 380                       "have %d and %d different commit(s) each.\n",
 381                       remote_msg, base,
 382                       num_ours, num_theirs);
 383}
 384
 385static void update_refs_for_switch(struct checkout_opts *opts,
 386                                   struct branch_info *old,
 387                                   struct branch_info *new)
 388{
 389        struct strbuf msg;
 390        const char *old_desc;
 391        if (opts->new_branch) {
 392                create_branch(old->name, opts->new_branch, new->name, 0,
 393                              opts->new_branch_log, opts->track);
 394                new->name = opts->new_branch;
 395                setup_branch_path(new);
 396        }
 397
 398        strbuf_init(&msg, 0);
 399        old_desc = old->name;
 400        if (!old_desc)
 401                old_desc = sha1_to_hex(old->commit->object.sha1);
 402        strbuf_addf(&msg, "checkout: moving from %s to %s",
 403                    old_desc, new->name);
 404
 405        if (new->path) {
 406                create_symref("HEAD", new->path, msg.buf);
 407                if (!opts->quiet) {
 408                        if (old->path && !strcmp(new->path, old->path))
 409                                fprintf(stderr, "Already on \"%s\"\n",
 410                                        new->name);
 411                        else
 412                                fprintf(stderr, "Switched to%s branch \"%s\"\n",
 413                                        opts->new_branch ? " a new" : "",
 414                                        new->name);
 415                }
 416        } else if (strcmp(new->name, "HEAD")) {
 417                update_ref(msg.buf, "HEAD", new->commit->object.sha1, NULL,
 418                           REF_NODEREF, DIE_ON_ERR);
 419                if (!opts->quiet) {
 420                        if (old->path)
 421                                fprintf(stderr, "Note: moving to \"%s\" which isn't a local branch\nIf you want to create a new branch from this checkout, you may do so\n(now or later) by using -b with the checkout command again. Example:\n  git checkout -b <new_branch_name>\n", new->name);
 422                        describe_detached_head("HEAD is now at", new->commit);
 423                }
 424        }
 425        remove_branch_state();
 426        strbuf_release(&msg);
 427        if (!opts->quiet && (new->path || !strcmp(new->name, "HEAD")))
 428                adjust_to_tracking(new, opts);
 429}
 430
 431static int switch_branches(struct checkout_opts *opts, struct branch_info *new)
 432{
 433        int ret = 0;
 434        struct branch_info old;
 435        unsigned char rev[20];
 436        int flag;
 437        memset(&old, 0, sizeof(old));
 438        old.path = resolve_ref("HEAD", rev, 0, &flag);
 439        old.commit = lookup_commit_reference_gently(rev, 1);
 440        if (!(flag & REF_ISSYMREF))
 441                old.path = NULL;
 442
 443        if (old.path && !prefixcmp(old.path, "refs/heads/"))
 444                old.name = old.path + strlen("refs/heads/");
 445
 446        if (!new->name) {
 447                new->name = "HEAD";
 448                new->commit = old.commit;
 449                if (!new->commit)
 450                        die("You are on a branch yet to be born");
 451                parse_commit(new->commit);
 452        }
 453
 454        /*
 455         * If the new thing isn't a branch and isn't HEAD and we're
 456         * not starting a new branch, and we want messages, and we
 457         * weren't on a branch, and we're moving to a new commit,
 458         * describe the old commit.
 459         */
 460        if (!new->path && strcmp(new->name, "HEAD") && !opts->new_branch &&
 461            !opts->quiet && !old.path && new->commit != old.commit)
 462                describe_detached_head("Previous HEAD position was", old.commit);
 463
 464        if (!old.commit) {
 465                if (!opts->quiet) {
 466                        fprintf(stderr, "warning: You appear to be on a branch yet to be born.\n");
 467                        fprintf(stderr, "warning: Forcing checkout of %s.\n", new->name);
 468                }
 469                opts->force = 1;
 470        }
 471
 472        ret = merge_working_tree(opts, &old, new);
 473        if (ret)
 474                return ret;
 475
 476        update_refs_for_switch(opts, &old, new);
 477
 478        return post_checkout_hook(old.commit, new->commit, 1);
 479}
 480
 481static int branch_track = 0;
 482
 483static int git_checkout_config(const char *var, const char *value)
 484{
 485        if (!strcmp(var, "branch.autosetupmerge"))
 486                branch_track = git_config_bool(var, value);
 487
 488        return git_default_config(var, value);
 489}
 490
 491int cmd_checkout(int argc, const char **argv, const char *prefix)
 492{
 493        struct checkout_opts opts;
 494        unsigned char rev[20];
 495        const char *arg;
 496        struct branch_info new;
 497        struct tree *source_tree = NULL;
 498        struct option options[] = {
 499                OPT__QUIET(&opts.quiet),
 500                OPT_STRING('b', NULL, &opts.new_branch, "new branch", "branch"),
 501                OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "log for new branch"),
 502                OPT_BOOLEAN( 0 , "track", &opts.track, "track"),
 503                OPT_BOOLEAN('f', NULL, &opts.force, "force"),
 504                OPT_BOOLEAN('m', NULL, &opts.merge, "merge"),
 505                OPT_END(),
 506        };
 507
 508        memset(&opts, 0, sizeof(opts));
 509        memset(&new, 0, sizeof(new));
 510
 511        git_config(git_checkout_config);
 512
 513        opts.track = branch_track;
 514
 515        argc = parse_options(argc, argv, options, checkout_usage, 0);
 516        if (argc) {
 517                arg = argv[0];
 518                if (get_sha1(arg, rev))
 519                        ;
 520                else if ((new.commit = lookup_commit_reference_gently(rev, 1))) {
 521                        new.name = arg;
 522                        setup_branch_path(&new);
 523                        if (resolve_ref(new.path, rev, 1, NULL))
 524                                new.commit = lookup_commit_reference(rev);
 525                        else
 526                                new.path = NULL;
 527                        parse_commit(new.commit);
 528                        source_tree = new.commit->tree;
 529                        argv++;
 530                        argc--;
 531                } else if ((source_tree = parse_tree_indirect(rev))) {
 532                        argv++;
 533                        argc--;
 534                }
 535        }
 536
 537        if (argc && !strcmp(argv[0], "--")) {
 538                argv++;
 539                argc--;
 540        }
 541
 542        if (!opts.new_branch && (opts.track != branch_track))
 543                die("git checkout: --track and --no-track require -b");
 544
 545        if (opts.force && opts.merge)
 546                die("git checkout: -f and -m are incompatible");
 547
 548        if (argc) {
 549                const char **pathspec = get_pathspec(prefix, argv);
 550                /* Checkout paths */
 551                if (opts.new_branch || opts.force || opts.merge) {
 552                        if (argc == 1) {
 553                                die("git checkout: updating paths is incompatible with switching branches/forcing\nDid you intend to checkout '%s' which can not be resolved as commit?", argv[0]);
 554                        } else {
 555                                die("git checkout: updating paths is incompatible with switching branches/forcing");
 556                        }
 557                }
 558
 559                if (source_tree)
 560                        read_tree_some(source_tree, pathspec);
 561                else
 562                        read_cache();
 563                return checkout_paths(pathspec);
 564        }
 565
 566        if (new.name && !new.commit) {
 567                die("Cannot switch branch to a non-commit.");
 568        }
 569
 570        return switch_branches(&opts, &new);
 571}