1#include"builtin.h" 2#include"config.h" 3#include"checkout.h" 4#include"lockfile.h" 5#include"parse-options.h" 6#include"refs.h" 7#include"object-store.h" 8#include"commit.h" 9#include"tree.h" 10#include"tree-walk.h" 11#include"cache-tree.h" 12#include"unpack-trees.h" 13#include"dir.h" 14#include"run-command.h" 15#include"merge-recursive.h" 16#include"branch.h" 17#include"diff.h" 18#include"revision.h" 19#include"remote.h" 20#include"blob.h" 21#include"xdiff-interface.h" 22#include"ll-merge.h" 23#include"resolve-undo.h" 24#include"submodule-config.h" 25#include"submodule.h" 26#include"advice.h" 27 28static int checkout_optimize_new_branch; 29 30static const char*const checkout_usage[] = { 31N_("git checkout [<options>] <branch>"), 32N_("git checkout [<options>] [<branch>] -- <file>..."), 33 NULL, 34}; 35 36struct checkout_opts { 37int patch_mode; 38int quiet; 39int merge; 40int force; 41int force_detach; 42int writeout_stage; 43int overwrite_ignore; 44int ignore_skipworktree; 45int ignore_other_worktrees; 46int show_progress; 47/* 48 * If new checkout options are added, skip_merge_working_tree 49 * should be updated accordingly. 50 */ 51 52const char*new_branch; 53const char*new_branch_force; 54const char*new_orphan_branch; 55int new_branch_log; 56enum branch_track track; 57struct diff_options diff_options; 58 59int branch_exists; 60const char*prefix; 61struct pathspec pathspec; 62struct tree *source_tree; 63}; 64 65static intpost_checkout_hook(struct commit *old_commit,struct commit *new_commit, 66int changed) 67{ 68returnrun_hook_le(NULL,"post-checkout", 69oid_to_hex(old_commit ? &old_commit->object.oid : &null_oid), 70oid_to_hex(new_commit ? &new_commit->object.oid : &null_oid), 71 changed ?"1":"0", NULL); 72/* "new_commit" can be NULL when checking out from the index before 73 a commit exists. */ 74 75} 76 77static intupdate_some(const struct object_id *oid,struct strbuf *base, 78const char*pathname,unsigned mode,int stage,void*context) 79{ 80int len; 81struct cache_entry *ce; 82int pos; 83 84if(S_ISDIR(mode)) 85return READ_TREE_RECURSIVE; 86 87 len = base->len +strlen(pathname); 88 ce =make_empty_cache_entry(&the_index, len); 89oidcpy(&ce->oid, oid); 90memcpy(ce->name, base->buf, base->len); 91memcpy(ce->name + base->len, pathname, len - base->len); 92 ce->ce_flags =create_ce_flags(0) | CE_UPDATE; 93 ce->ce_namelen = len; 94 ce->ce_mode =create_ce_mode(mode); 95 96/* 97 * If the entry is the same as the current index, we can leave the old 98 * entry in place. Whether it is UPTODATE or not, checkout_entry will 99 * do the right thing. 100 */ 101 pos =cache_name_pos(ce->name, ce->ce_namelen); 102if(pos >=0) { 103struct cache_entry *old = active_cache[pos]; 104if(ce->ce_mode == old->ce_mode && 105oideq(&ce->oid, &old->oid)) { 106 old->ce_flags |= CE_UPDATE; 107discard_cache_entry(ce); 108return0; 109} 110} 111 112add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); 113return0; 114} 115 116static intread_tree_some(struct tree *tree,const struct pathspec *pathspec) 117{ 118read_tree_recursive(tree,"",0,0, pathspec, update_some, NULL); 119 120/* update the index with the given tree's info 121 * for all args, expanding wildcards, and exit 122 * with any non-zero return code. 123 */ 124return0; 125} 126 127static intskip_same_name(const struct cache_entry *ce,int pos) 128{ 129while(++pos < active_nr && 130!strcmp(active_cache[pos]->name, ce->name)) 131;/* skip */ 132return pos; 133} 134 135static intcheck_stage(int stage,const struct cache_entry *ce,int pos) 136{ 137while(pos < active_nr && 138!strcmp(active_cache[pos]->name, ce->name)) { 139if(ce_stage(active_cache[pos]) == stage) 140return0; 141 pos++; 142} 143if(stage ==2) 144returnerror(_("path '%s' does not have our version"), ce->name); 145else 146returnerror(_("path '%s' does not have their version"), ce->name); 147} 148 149static intcheck_stages(unsigned stages,const struct cache_entry *ce,int pos) 150{ 151unsigned seen =0; 152const char*name = ce->name; 153 154while(pos < active_nr) { 155 ce = active_cache[pos]; 156if(strcmp(name, ce->name)) 157break; 158 seen |= (1<<ce_stage(ce)); 159 pos++; 160} 161if((stages & seen) != stages) 162returnerror(_("path '%s' does not have all necessary versions"), 163 name); 164return0; 165} 166 167static intcheckout_stage(int stage,const struct cache_entry *ce,int pos, 168const struct checkout *state) 169{ 170while(pos < active_nr && 171!strcmp(active_cache[pos]->name, ce->name)) { 172if(ce_stage(active_cache[pos]) == stage) 173returncheckout_entry(active_cache[pos], state, NULL); 174 pos++; 175} 176if(stage ==2) 177returnerror(_("path '%s' does not have our version"), ce->name); 178else 179returnerror(_("path '%s' does not have their version"), ce->name); 180} 181 182static intcheckout_merged(int pos,const struct checkout *state) 183{ 184struct cache_entry *ce = active_cache[pos]; 185const char*path = ce->name; 186 mmfile_t ancestor, ours, theirs; 187int status; 188struct object_id oid; 189 mmbuffer_t result_buf; 190struct object_id threeway[3]; 191unsigned mode =0; 192 193memset(threeway,0,sizeof(threeway)); 194while(pos < active_nr) { 195int stage; 196 stage =ce_stage(ce); 197if(!stage ||strcmp(path, ce->name)) 198break; 199oidcpy(&threeway[stage -1], &ce->oid); 200if(stage ==2) 201 mode =create_ce_mode(ce->ce_mode); 202 pos++; 203 ce = active_cache[pos]; 204} 205if(is_null_oid(&threeway[1]) ||is_null_oid(&threeway[2])) 206returnerror(_("path '%s' does not have necessary versions"), path); 207 208read_mmblob(&ancestor, &threeway[0]); 209read_mmblob(&ours, &threeway[1]); 210read_mmblob(&theirs, &threeway[2]); 211 212/* 213 * NEEDSWORK: re-create conflicts from merges with 214 * merge.renormalize set, too 215 */ 216 status =ll_merge(&result_buf, path, &ancestor,"base", 217&ours,"ours", &theirs,"theirs", NULL); 218free(ancestor.ptr); 219free(ours.ptr); 220free(theirs.ptr); 221if(status <0|| !result_buf.ptr) { 222free(result_buf.ptr); 223returnerror(_("path '%s': cannot merge"), path); 224} 225 226/* 227 * NEEDSWORK: 228 * There is absolutely no reason to write this as a blob object 229 * and create a phony cache entry. This hack is primarily to get 230 * to the write_entry() machinery that massages the contents to 231 * work-tree format and writes out which only allows it for a 232 * cache entry. The code in write_entry() needs to be refactored 233 * to allow us to feed a <buffer, size, mode> instead of a cache 234 * entry. Such a refactoring would help merge_recursive as well 235 * (it also writes the merge result to the object database even 236 * when it may contain conflicts). 237 */ 238if(write_object_file(result_buf.ptr, result_buf.size, blob_type, &oid)) 239die(_("Unable to add merge result for '%s'"), path); 240free(result_buf.ptr); 241 ce =make_transient_cache_entry(mode, &oid, path,2); 242if(!ce) 243die(_("make_cache_entry failed for path '%s'"), path); 244 status =checkout_entry(ce, state, NULL); 245discard_cache_entry(ce); 246return status; 247} 248 249static intcheckout_paths(const struct checkout_opts *opts, 250const char*revision) 251{ 252int pos; 253struct checkout state = CHECKOUT_INIT; 254static char*ps_matched; 255struct object_id rev; 256struct commit *head; 257int errs =0; 258struct lock_file lock_file = LOCK_INIT; 259 260if(opts->track != BRANCH_TRACK_UNSPECIFIED) 261die(_("'%s' cannot be used with updating paths"),"--track"); 262 263if(opts->new_branch_log) 264die(_("'%s' cannot be used with updating paths"),"-l"); 265 266if(opts->force && opts->patch_mode) 267die(_("'%s' cannot be used with updating paths"),"-f"); 268 269if(opts->force_detach) 270die(_("'%s' cannot be used with updating paths"),"--detach"); 271 272if(opts->merge && opts->patch_mode) 273die(_("'%s' cannot be used with%s"),"--merge","--patch"); 274 275if(opts->force && opts->merge) 276die(_("'%s' cannot be used with%s"),"-f","-m"); 277 278if(opts->new_branch) 279die(_("Cannot update paths and switch to branch '%s' at the same time."), 280 opts->new_branch); 281 282if(opts->patch_mode) 283returnrun_add_interactive(revision,"--patch=checkout", 284&opts->pathspec); 285 286hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); 287if(read_cache_preload(&opts->pathspec) <0) 288returnerror(_("index file corrupt")); 289 290if(opts->source_tree) 291read_tree_some(opts->source_tree, &opts->pathspec); 292 293 ps_matched =xcalloc(opts->pathspec.nr,1); 294 295/* 296 * Make sure all pathspecs participated in locating the paths 297 * to be checked out. 298 */ 299for(pos =0; pos < active_nr; pos++) { 300struct cache_entry *ce = active_cache[pos]; 301 ce->ce_flags &= ~CE_MATCHED; 302if(!opts->ignore_skipworktree &&ce_skip_worktree(ce)) 303continue; 304if(opts->source_tree && !(ce->ce_flags & CE_UPDATE)) 305/* 306 * "git checkout tree-ish -- path", but this entry 307 * is in the original index; it will not be checked 308 * out to the working tree and it does not matter 309 * if pathspec matched this entry. We will not do 310 * anything to this entry at all. 311 */ 312continue; 313/* 314 * Either this entry came from the tree-ish we are 315 * checking the paths out of, or we are checking out 316 * of the index. 317 * 318 * If it comes from the tree-ish, we already know it 319 * matches the pathspec and could just stamp 320 * CE_MATCHED to it from update_some(). But we still 321 * need ps_matched and read_tree_recursive (and 322 * eventually tree_entry_interesting) cannot fill 323 * ps_matched yet. Once it can, we can avoid calling 324 * match_pathspec() for _all_ entries when 325 * opts->source_tree != NULL. 326 */ 327if(ce_path_match(&the_index, ce, &opts->pathspec, ps_matched)) 328 ce->ce_flags |= CE_MATCHED; 329} 330 331if(report_path_error(ps_matched, &opts->pathspec, opts->prefix)) { 332free(ps_matched); 333return1; 334} 335free(ps_matched); 336 337/* "checkout -m path" to recreate conflicted state */ 338if(opts->merge) 339unmerge_marked_index(&the_index); 340 341/* Any unmerged paths? */ 342for(pos =0; pos < active_nr; pos++) { 343const struct cache_entry *ce = active_cache[pos]; 344if(ce->ce_flags & CE_MATCHED) { 345if(!ce_stage(ce)) 346continue; 347if(opts->force) { 348warning(_("path '%s' is unmerged"), ce->name); 349}else if(opts->writeout_stage) { 350 errs |=check_stage(opts->writeout_stage, ce, pos); 351}else if(opts->merge) { 352 errs |=check_stages((1<<2) | (1<<3), ce, pos); 353}else{ 354 errs =1; 355error(_("path '%s' is unmerged"), ce->name); 356} 357 pos =skip_same_name(ce, pos) -1; 358} 359} 360if(errs) 361return1; 362 363/* Now we are committed to check them out */ 364 state.force =1; 365 state.refresh_cache =1; 366 state.istate = &the_index; 367 368enable_delayed_checkout(&state); 369for(pos =0; pos < active_nr; pos++) { 370struct cache_entry *ce = active_cache[pos]; 371if(ce->ce_flags & CE_MATCHED) { 372if(!ce_stage(ce)) { 373 errs |=checkout_entry(ce, &state, NULL); 374continue; 375} 376if(opts->writeout_stage) 377 errs |=checkout_stage(opts->writeout_stage, ce, pos, &state); 378else if(opts->merge) 379 errs |=checkout_merged(pos, &state); 380 pos =skip_same_name(ce, pos) -1; 381} 382} 383 errs |=finish_delayed_checkout(&state); 384 385if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) 386die(_("unable to write new index file")); 387 388read_ref_full("HEAD",0, &rev, NULL); 389 head =lookup_commit_reference_gently(the_repository, &rev,1); 390 391 errs |=post_checkout_hook(head, head,0); 392return errs; 393} 394 395static voidshow_local_changes(struct object *head, 396const struct diff_options *opts) 397{ 398struct rev_info rev; 399/* I think we want full paths, even if we're in a subdirectory. */ 400init_revisions(&rev, NULL); 401 rev.diffopt.flags = opts->flags; 402 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; 403diff_setup_done(&rev.diffopt); 404add_pending_object(&rev, head, NULL); 405run_diff_index(&rev,0); 406} 407 408static voiddescribe_detached_head(const char*msg,struct commit *commit) 409{ 410struct strbuf sb = STRBUF_INIT; 411 412if(!parse_commit(commit)) 413pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 414if(print_sha1_ellipsis()) { 415fprintf(stderr,"%s %s...%s\n", msg, 416find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV), sb.buf); 417}else{ 418fprintf(stderr,"%s %s %s\n", msg, 419find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV), sb.buf); 420} 421strbuf_release(&sb); 422} 423 424static intreset_tree(struct tree *tree,const struct checkout_opts *o, 425int worktree,int*writeout_error) 426{ 427struct unpack_trees_options opts; 428struct tree_desc tree_desc; 429 430memset(&opts,0,sizeof(opts)); 431 opts.head_idx = -1; 432 opts.update = worktree; 433 opts.skip_unmerged = !worktree; 434 opts.reset =1; 435 opts.merge =1; 436 opts.fn = oneway_merge; 437 opts.verbose_update = o->show_progress; 438 opts.src_index = &the_index; 439 opts.dst_index = &the_index; 440parse_tree(tree); 441init_tree_desc(&tree_desc, tree->buffer, tree->size); 442switch(unpack_trees(1, &tree_desc, &opts)) { 443case-2: 444*writeout_error =1; 445/* 446 * We return 0 nevertheless, as the index is all right 447 * and more importantly we have made best efforts to 448 * update paths in the work tree, and we cannot revert 449 * them. 450 */ 451/* fallthrough */ 452case0: 453return0; 454default: 455return128; 456} 457} 458 459struct branch_info { 460const char*name;/* The short name used */ 461const char*path;/* The full name of a real branch */ 462struct commit *commit;/* The named commit */ 463/* 464 * if not null the branch is detached because it's already 465 * checked out in this checkout 466 */ 467char*checkout; 468}; 469 470static voidsetup_branch_path(struct branch_info *branch) 471{ 472struct strbuf buf = STRBUF_INIT; 473 474strbuf_branchname(&buf, branch->name, INTERPRET_BRANCH_LOCAL); 475if(strcmp(buf.buf, branch->name)) 476 branch->name =xstrdup(buf.buf); 477strbuf_splice(&buf,0,0,"refs/heads/",11); 478 branch->path =strbuf_detach(&buf, NULL); 479} 480 481/* 482 * Skip merging the trees, updating the index and working directory if and 483 * only if we are creating a new branch via "git checkout -b <new_branch>." 484 */ 485static intskip_merge_working_tree(const struct checkout_opts *opts, 486const struct branch_info *old_branch_info, 487const struct branch_info *new_branch_info) 488{ 489/* 490 * Do the merge if sparse checkout is on and the user has not opted in 491 * to the optimized behavior 492 */ 493if(core_apply_sparse_checkout && !checkout_optimize_new_branch) 494return0; 495 496/* 497 * We must do the merge if we are actually moving to a new commit. 498 */ 499if(!old_branch_info->commit || !new_branch_info->commit || 500oidcmp(&old_branch_info->commit->object.oid, &new_branch_info->commit->object.oid)) 501return0; 502 503/* 504 * opts->patch_mode cannot be used with switching branches so is 505 * not tested here 506 */ 507 508/* 509 * opts->quiet only impacts output so doesn't require a merge 510 */ 511 512/* 513 * Honor the explicit request for a three-way merge or to throw away 514 * local changes 515 */ 516if(opts->merge || opts->force) 517return0; 518 519/* 520 * --detach is documented as "updating the index and the files in the 521 * working tree" but this optimization skips those steps so fall through 522 * to the regular code path. 523 */ 524if(opts->force_detach) 525return0; 526 527/* 528 * opts->writeout_stage cannot be used with switching branches so is 529 * not tested here 530 */ 531 532/* 533 * Honor the explicit ignore requests 534 */ 535if(!opts->overwrite_ignore || opts->ignore_skipworktree || 536 opts->ignore_other_worktrees) 537return0; 538 539/* 540 * opts->show_progress only impacts output so doesn't require a merge 541 */ 542 543/* 544 * If we aren't creating a new branch any changes or updates will 545 * happen in the existing branch. Since that could only be updating 546 * the index and working directory, we don't want to skip those steps 547 * or we've defeated any purpose in running the command. 548 */ 549if(!opts->new_branch) 550return0; 551 552/* 553 * new_branch_force is defined to "create/reset and checkout a branch" 554 * so needs to go through the merge to do the reset 555 */ 556if(opts->new_branch_force) 557return0; 558 559/* 560 * A new orphaned branch requrires the index and the working tree to be 561 * adjusted to <start_point> 562 */ 563if(opts->new_orphan_branch) 564return0; 565 566/* 567 * Remaining variables are not checkout options but used to track state 568 */ 569 570return1; 571} 572 573static intmerge_working_tree(const struct checkout_opts *opts, 574struct branch_info *old_branch_info, 575struct branch_info *new_branch_info, 576int*writeout_error) 577{ 578int ret; 579struct lock_file lock_file = LOCK_INIT; 580 581hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); 582if(read_cache_preload(NULL) <0) 583returnerror(_("index file corrupt")); 584 585resolve_undo_clear(); 586if(opts->force) { 587 ret =reset_tree(get_commit_tree(new_branch_info->commit), 588 opts,1, writeout_error); 589if(ret) 590return ret; 591}else{ 592struct tree_desc trees[2]; 593struct tree *tree; 594struct unpack_trees_options topts; 595 596memset(&topts,0,sizeof(topts)); 597 topts.head_idx = -1; 598 topts.src_index = &the_index; 599 topts.dst_index = &the_index; 600 601setup_unpack_trees_porcelain(&topts,"checkout"); 602 603refresh_cache(REFRESH_QUIET); 604 605if(unmerged_cache()) { 606error(_("you need to resolve your current index first")); 607return1; 608} 609 610/* 2-way merge to the new branch */ 611 topts.initial_checkout =is_cache_unborn(); 612 topts.update =1; 613 topts.merge =1; 614 topts.gently = opts->merge && old_branch_info->commit; 615 topts.verbose_update = opts->show_progress; 616 topts.fn = twoway_merge; 617if(opts->overwrite_ignore) { 618 topts.dir =xcalloc(1,sizeof(*topts.dir)); 619 topts.dir->flags |= DIR_SHOW_IGNORED; 620setup_standard_excludes(topts.dir); 621} 622 tree =parse_tree_indirect(old_branch_info->commit ? 623&old_branch_info->commit->object.oid : 624 the_hash_algo->empty_tree); 625init_tree_desc(&trees[0], tree->buffer, tree->size); 626 tree =parse_tree_indirect(&new_branch_info->commit->object.oid); 627init_tree_desc(&trees[1], tree->buffer, tree->size); 628 629 ret =unpack_trees(2, trees, &topts); 630clear_unpack_trees_porcelain(&topts); 631if(ret == -1) { 632/* 633 * Unpack couldn't do a trivial merge; either 634 * give up or do a real merge, depending on 635 * whether the merge flag was used. 636 */ 637struct tree *result; 638struct tree *work; 639struct merge_options o; 640if(!opts->merge) 641return1; 642 643/* 644 * Without old_branch_info->commit, the below is the same as 645 * the two-tree unpack we already tried and failed. 646 */ 647if(!old_branch_info->commit) 648return1; 649 650/* Do more real merge */ 651 652/* 653 * We update the index fully, then write the 654 * tree from the index, then merge the new 655 * branch with the current tree, with the old 656 * branch as the base. Then we reset the index 657 * (but not the working tree) to the new 658 * branch, leaving the working tree as the 659 * merged version, but skipping unmerged 660 * entries in the index. 661 */ 662 663add_files_to_cache(NULL, NULL,0); 664/* 665 * NEEDSWORK: carrying over local changes 666 * when branches have different end-of-line 667 * normalization (or clean+smudge rules) is 668 * a pain; plumb in an option to set 669 * o.renormalize? 670 */ 671init_merge_options(&o); 672 o.verbosity =0; 673 work =write_tree_from_memory(&o); 674 675 ret =reset_tree(get_commit_tree(new_branch_info->commit), 676 opts,1, 677 writeout_error); 678if(ret) 679return ret; 680 o.ancestor = old_branch_info->name; 681 o.branch1 = new_branch_info->name; 682 o.branch2 ="local"; 683 ret =merge_trees(&o, 684get_commit_tree(new_branch_info->commit), 685 work, 686get_commit_tree(old_branch_info->commit), 687&result); 688if(ret <0) 689exit(128); 690 ret =reset_tree(get_commit_tree(new_branch_info->commit), 691 opts,0, 692 writeout_error); 693strbuf_release(&o.obuf); 694if(ret) 695return ret; 696} 697} 698 699if(!active_cache_tree) 700 active_cache_tree =cache_tree(); 701 702if(!cache_tree_fully_valid(active_cache_tree)) 703cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); 704 705if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) 706die(_("unable to write new index file")); 707 708if(!opts->force && !opts->quiet) 709show_local_changes(&new_branch_info->commit->object, &opts->diff_options); 710 711return0; 712} 713 714static voidreport_tracking(struct branch_info *new_branch_info) 715{ 716struct strbuf sb = STRBUF_INIT; 717struct branch *branch =branch_get(new_branch_info->name); 718 719if(!format_tracking_info(branch, &sb, AHEAD_BEHIND_FULL)) 720return; 721fputs(sb.buf, stdout); 722strbuf_release(&sb); 723} 724 725static voidupdate_refs_for_switch(const struct checkout_opts *opts, 726struct branch_info *old_branch_info, 727struct branch_info *new_branch_info) 728{ 729struct strbuf msg = STRBUF_INIT; 730const char*old_desc, *reflog_msg; 731if(opts->new_branch) { 732if(opts->new_orphan_branch) { 733char*refname; 734 735 refname =mkpathdup("refs/heads/%s", opts->new_orphan_branch); 736if(opts->new_branch_log && 737!should_autocreate_reflog(refname)) { 738int ret; 739struct strbuf err = STRBUF_INIT; 740 741 ret =safe_create_reflog(refname,1, &err); 742if(ret) { 743fprintf(stderr,_("Can not do reflog for '%s':%s\n"), 744 opts->new_orphan_branch, err.buf); 745strbuf_release(&err); 746free(refname); 747return; 748} 749strbuf_release(&err); 750} 751free(refname); 752} 753else 754create_branch(opts->new_branch, new_branch_info->name, 755 opts->new_branch_force ?1:0, 756 opts->new_branch_force ?1:0, 757 opts->new_branch_log, 758 opts->quiet, 759 opts->track); 760 new_branch_info->name = opts->new_branch; 761setup_branch_path(new_branch_info); 762} 763 764 old_desc = old_branch_info->name; 765if(!old_desc && old_branch_info->commit) 766 old_desc =oid_to_hex(&old_branch_info->commit->object.oid); 767 768 reflog_msg =getenv("GIT_REFLOG_ACTION"); 769if(!reflog_msg) 770strbuf_addf(&msg,"checkout: moving from%sto%s", 771 old_desc ? old_desc :"(invalid)", new_branch_info->name); 772else 773strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 774 775if(!strcmp(new_branch_info->name,"HEAD") && !new_branch_info->path && !opts->force_detach) { 776/* Nothing to do. */ 777}else if(opts->force_detach || !new_branch_info->path) {/* No longer on any branch. */ 778update_ref(msg.buf,"HEAD", &new_branch_info->commit->object.oid, NULL, 779 REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR); 780if(!opts->quiet) { 781if(old_branch_info->path && 782 advice_detached_head && !opts->force_detach) 783detach_advice(new_branch_info->name); 784describe_detached_head(_("HEAD is now at"), new_branch_info->commit); 785} 786}else if(new_branch_info->path) {/* Switch branches. */ 787if(create_symref("HEAD", new_branch_info->path, msg.buf) <0) 788die(_("unable to update HEAD")); 789if(!opts->quiet) { 790if(old_branch_info->path && !strcmp(new_branch_info->path, old_branch_info->path)) { 791if(opts->new_branch_force) 792fprintf(stderr,_("Reset branch '%s'\n"), 793 new_branch_info->name); 794else 795fprintf(stderr,_("Already on '%s'\n"), 796 new_branch_info->name); 797}else if(opts->new_branch) { 798if(opts->branch_exists) 799fprintf(stderr,_("Switched to and reset branch '%s'\n"), new_branch_info->name); 800else 801fprintf(stderr,_("Switched to a new branch '%s'\n"), new_branch_info->name); 802}else{ 803fprintf(stderr,_("Switched to branch '%s'\n"), 804 new_branch_info->name); 805} 806} 807if(old_branch_info->path && old_branch_info->name) { 808if(!ref_exists(old_branch_info->path) &&reflog_exists(old_branch_info->path)) 809delete_reflog(old_branch_info->path); 810} 811} 812remove_branch_state(); 813strbuf_release(&msg); 814if(!opts->quiet && 815(new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name,"HEAD")))) 816report_tracking(new_branch_info); 817} 818 819static intadd_pending_uninteresting_ref(const char*refname, 820const struct object_id *oid, 821int flags,void*cb_data) 822{ 823add_pending_oid(cb_data, refname, oid, UNINTERESTING); 824return0; 825} 826 827static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 828{ 829strbuf_addstr(sb," "); 830strbuf_add_unique_abbrev(sb, &commit->object.oid, DEFAULT_ABBREV); 831strbuf_addch(sb,' '); 832if(!parse_commit(commit)) 833pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 834strbuf_addch(sb,'\n'); 835} 836 837#define ORPHAN_CUTOFF 4 838static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 839{ 840struct commit *c, *last = NULL; 841struct strbuf sb = STRBUF_INIT; 842int lost =0; 843while((c =get_revision(revs)) != NULL) { 844if(lost < ORPHAN_CUTOFF) 845describe_one_orphan(&sb, c); 846 last = c; 847 lost++; 848} 849if(ORPHAN_CUTOFF < lost) { 850int more = lost - ORPHAN_CUTOFF; 851if(more ==1) 852describe_one_orphan(&sb, last); 853else 854strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 855} 856 857fprintf(stderr, 858Q_( 859/* The singular version */ 860"Warning: you are leaving%dcommit behind, " 861"not connected to\n" 862"any of your branches:\n\n" 863"%s\n", 864/* The plural version */ 865"Warning: you are leaving%dcommits behind, " 866"not connected to\n" 867"any of your branches:\n\n" 868"%s\n", 869/* Give ngettext() the count */ 870 lost), 871 lost, 872 sb.buf); 873strbuf_release(&sb); 874 875if(advice_detached_head) 876fprintf(stderr, 877Q_( 878/* The singular version */ 879"If you want to keep it by creating a new branch, " 880"this may be a good time\nto do so with:\n\n" 881" git branch <new-branch-name>%s\n\n", 882/* The plural version */ 883"If you want to keep them by creating a new branch, " 884"this may be a good time\nto do so with:\n\n" 885" git branch <new-branch-name>%s\n\n", 886/* Give ngettext() the count */ 887 lost), 888find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV)); 889} 890 891/* 892 * We are about to leave commit that was at the tip of a detached 893 * HEAD. If it is not reachable from any ref, this is the last chance 894 * for the user to do so without resorting to reflog. 895 */ 896static voidorphaned_commit_warning(struct commit *old_commit,struct commit *new_commit) 897{ 898struct rev_info revs; 899struct object *object = &old_commit->object; 900 901init_revisions(&revs, NULL); 902setup_revisions(0, NULL, &revs, NULL); 903 904 object->flags &= ~UNINTERESTING; 905add_pending_object(&revs, object,oid_to_hex(&object->oid)); 906 907for_each_ref(add_pending_uninteresting_ref, &revs); 908add_pending_oid(&revs,"HEAD", &new_commit->object.oid, UNINTERESTING); 909 910if(prepare_revision_walk(&revs)) 911die(_("internal error in revision walk")); 912if(!(old_commit->object.flags & UNINTERESTING)) 913suggest_reattach(old_commit, &revs); 914else 915describe_detached_head(_("Previous HEAD position was"), old_commit); 916 917/* Clean up objects used, as they will be reused. */ 918clear_commit_marks_all(ALL_REV_FLAGS); 919} 920 921static intswitch_branches(const struct checkout_opts *opts, 922struct branch_info *new_branch_info) 923{ 924int ret =0; 925struct branch_info old_branch_info; 926void*path_to_free; 927struct object_id rev; 928int flag, writeout_error =0; 929memset(&old_branch_info,0,sizeof(old_branch_info)); 930 old_branch_info.path = path_to_free =resolve_refdup("HEAD",0, &rev, &flag); 931if(old_branch_info.path) 932 old_branch_info.commit =lookup_commit_reference_gently(the_repository, &rev,1); 933if(!(flag & REF_ISSYMREF)) 934 old_branch_info.path = NULL; 935 936if(old_branch_info.path) 937skip_prefix(old_branch_info.path,"refs/heads/", &old_branch_info.name); 938 939if(!new_branch_info->name) { 940 new_branch_info->name ="HEAD"; 941 new_branch_info->commit = old_branch_info.commit; 942if(!new_branch_info->commit) 943die(_("You are on a branch yet to be born")); 944parse_commit_or_die(new_branch_info->commit); 945} 946 947/* optimize the "checkout -b <new_branch> path */ 948if(skip_merge_working_tree(opts, &old_branch_info, new_branch_info)) { 949if(!checkout_optimize_new_branch && !opts->quiet) { 950if(read_cache_preload(NULL) <0) 951returnerror(_("index file corrupt")); 952show_local_changes(&new_branch_info->commit->object, &opts->diff_options); 953} 954}else{ 955 ret =merge_working_tree(opts, &old_branch_info, new_branch_info, &writeout_error); 956if(ret) { 957free(path_to_free); 958return ret; 959} 960} 961 962if(!opts->quiet && !old_branch_info.path && old_branch_info.commit && new_branch_info->commit != old_branch_info.commit) 963orphaned_commit_warning(old_branch_info.commit, new_branch_info->commit); 964 965update_refs_for_switch(opts, &old_branch_info, new_branch_info); 966 967 ret =post_checkout_hook(old_branch_info.commit, new_branch_info->commit,1); 968free(path_to_free); 969return ret || writeout_error; 970} 971 972static intgit_checkout_config(const char*var,const char*value,void*cb) 973{ 974if(!strcmp(var,"checkout.optimizenewbranch")) { 975 checkout_optimize_new_branch =git_config_bool(var, value); 976return0; 977} 978 979if(!strcmp(var,"diff.ignoresubmodules")) { 980struct checkout_opts *opts = cb; 981handle_ignore_submodules_arg(&opts->diff_options, value); 982return0; 983} 984 985if(starts_with(var,"submodule.")) 986returngit_default_submodule_config(var, value, NULL); 987 988returngit_xmerge_config(var, value, NULL); 989} 990 991static intparse_branchname_arg(int argc,const char**argv, 992int dwim_new_local_branch_ok, 993struct branch_info *new_branch_info, 994struct checkout_opts *opts, 995struct object_id *rev, 996int*dwim_remotes_matched) 997{ 998struct tree **source_tree = &opts->source_tree; 999const char**new_branch = &opts->new_branch;1000int argcount =0;1001struct object_id branch_rev;1002const char*arg;1003int dash_dash_pos;1004int has_dash_dash =0;1005int i;10061007/*1008 * case 1: git checkout <ref> -- [<paths>]1009 *1010 * <ref> must be a valid tree, everything after the '--' must be1011 * a path.1012 *1013 * case 2: git checkout -- [<paths>]1014 *1015 * everything after the '--' must be paths.1016 *1017 * case 3: git checkout <something> [--]1018 *1019 * (a) If <something> is a commit, that is to1020 * switch to the branch or detach HEAD at it. As a special case,1021 * if <something> is A...B (missing A or B means HEAD but you can1022 * omit at most one side), and if there is a unique merge base1023 * between A and B, A...B names that merge base.1024 *1025 * (b) If <something> is _not_ a commit, either "--" is present1026 * or <something> is not a path, no -t or -b was given, and1027 * and there is a tracking branch whose name is <something>1028 * in one and only one remote (or if the branch exists on the1029 * remote named in checkout.defaultRemote), then this is a1030 * short-hand to fork local <something> from that1031 * remote-tracking branch.1032 *1033 * (c) Otherwise, if "--" is present, treat it like case (1).1034 *1035 * (d) Otherwise :1036 * - if it's a reference, treat it like case (1)1037 * - else if it's a path, treat it like case (2)1038 * - else: fail.1039 *1040 * case 4: git checkout <something> <paths>1041 *1042 * The first argument must not be ambiguous.1043 * - If it's *only* a reference, treat it like case (1).1044 * - If it's only a path, treat it like case (2).1045 * - else: fail.1046 *1047 */1048if(!argc)1049return0;10501051 arg = argv[0];1052 dash_dash_pos = -1;1053for(i =0; i < argc; i++) {1054if(!strcmp(argv[i],"--")) {1055 dash_dash_pos = i;1056break;1057}1058}1059if(dash_dash_pos ==0)1060return1;/* case (2) */1061else if(dash_dash_pos ==1)1062 has_dash_dash =1;/* case (3) or (1) */1063else if(dash_dash_pos >=2)1064die(_("only one reference expected,%dgiven."), dash_dash_pos);10651066if(!strcmp(arg,"-"))1067 arg ="@{-1}";10681069if(get_oid_mb(arg, rev)) {1070/*1071 * Either case (3) or (4), with <something> not being1072 * a commit, or an attempt to use case (1) with an1073 * invalid ref.1074 *1075 * It's likely an error, but we need to find out if1076 * we should auto-create the branch, case (3).(b).1077 */1078int recover_with_dwim = dwim_new_local_branch_ok;10791080if(!has_dash_dash &&1081(check_filename(opts->prefix, arg) || !no_wildcard(arg)))1082 recover_with_dwim =0;1083/*1084 * Accept "git checkout foo" and "git checkout foo --"1085 * as candidates for dwim.1086 */1087if(!(argc ==1&& !has_dash_dash) &&1088!(argc ==2&& has_dash_dash))1089 recover_with_dwim =0;10901091if(recover_with_dwim) {1092const char*remote =unique_tracking_name(arg, rev,1093 dwim_remotes_matched);1094if(remote) {1095*new_branch = arg;1096 arg = remote;1097/* DWIMmed to create local branch, case (3).(b) */1098}else{1099 recover_with_dwim =0;1100}1101}11021103if(!recover_with_dwim) {1104if(has_dash_dash)1105die(_("invalid reference:%s"), arg);1106return argcount;1107}1108}11091110/* we can't end up being in (2) anymore, eat the argument */1111 argcount++;1112 argv++;1113 argc--;11141115 new_branch_info->name = arg;1116setup_branch_path(new_branch_info);11171118if(!check_refname_format(new_branch_info->path,0) &&1119!read_ref(new_branch_info->path, &branch_rev))1120oidcpy(rev, &branch_rev);1121else1122 new_branch_info->path = NULL;/* not an existing branch */11231124 new_branch_info->commit =lookup_commit_reference_gently(the_repository, rev,1);1125if(!new_branch_info->commit) {1126/* not a commit */1127*source_tree =parse_tree_indirect(rev);1128}else{1129parse_commit_or_die(new_branch_info->commit);1130*source_tree =get_commit_tree(new_branch_info->commit);1131}11321133if(!*source_tree)/* case (1): want a tree */1134die(_("reference is not a tree:%s"), arg);1135if(!has_dash_dash) {/* case (3).(d) -> (1) */1136/*1137 * Do not complain the most common case1138 * git checkout branch1139 * even if there happen to be a file called 'branch';1140 * it would be extremely annoying.1141 */1142if(argc)1143verify_non_filename(opts->prefix, arg);1144}else{1145 argcount++;1146 argv++;1147 argc--;1148}11491150return argcount;1151}11521153static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1154{1155int status;1156struct strbuf branch_ref = STRBUF_INIT;11571158if(!opts->new_branch)1159die(_("You are on a branch yet to be born"));1160strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1161 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1162strbuf_release(&branch_ref);1163if(!opts->quiet)1164fprintf(stderr,_("Switched to a new branch '%s'\n"),1165 opts->new_branch);1166return status;1167}11681169static intcheckout_branch(struct checkout_opts *opts,1170struct branch_info *new_branch_info)1171{1172if(opts->pathspec.nr)1173die(_("paths cannot be used with switching branches"));11741175if(opts->patch_mode)1176die(_("'%s' cannot be used with switching branches"),1177"--patch");11781179if(opts->writeout_stage)1180die(_("'%s' cannot be used with switching branches"),1181"--ours/--theirs");11821183if(opts->force && opts->merge)1184die(_("'%s' cannot be used with '%s'"),"-f","-m");11851186if(opts->force_detach && opts->new_branch)1187die(_("'%s' cannot be used with '%s'"),1188"--detach","-b/-B/--orphan");11891190if(opts->new_orphan_branch) {1191if(opts->track != BRANCH_TRACK_UNSPECIFIED)1192die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1193}else if(opts->force_detach) {1194if(opts->track != BRANCH_TRACK_UNSPECIFIED)1195die(_("'%s' cannot be used with '%s'"),"--detach","-t");1196}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1197 opts->track = git_branch_track;11981199if(new_branch_info->name && !new_branch_info->commit)1200die(_("Cannot switch branch to a non-commit '%s'"),1201 new_branch_info->name);12021203if(new_branch_info->path && !opts->force_detach && !opts->new_branch &&1204!opts->ignore_other_worktrees) {1205int flag;1206char*head_ref =resolve_refdup("HEAD",0, NULL, &flag);1207if(head_ref &&1208(!(flag & REF_ISSYMREF) ||strcmp(head_ref, new_branch_info->path)))1209die_if_checked_out(new_branch_info->path,1);1210free(head_ref);1211}12121213if(!new_branch_info->commit && opts->new_branch) {1214struct object_id rev;1215int flag;12161217if(!read_ref_full("HEAD",0, &rev, &flag) &&1218(flag & REF_ISSYMREF) &&is_null_oid(&rev))1219returnswitch_unborn_to_new_branch(opts);1220}1221returnswitch_branches(opts, new_branch_info);1222}12231224intcmd_checkout(int argc,const char**argv,const char*prefix)1225{1226struct checkout_opts opts;1227struct branch_info new_branch_info;1228char*conflict_style = NULL;1229int dwim_new_local_branch =1;1230int dwim_remotes_matched =0;1231struct option options[] = {1232OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1233OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1234N_("create and checkout a new branch")),1235OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1236N_("create/reset and checkout a branch")),1237OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1238OPT_BOOL(0,"detach", &opts.force_detach,N_("detach HEAD at named commit")),1239OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1240 BRANCH_TRACK_EXPLICIT),1241OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1242OPT_SET_INT_F('2',"ours", &opts.writeout_stage,1243N_("checkout our version for unmerged files"),12442, PARSE_OPT_NONEG),1245OPT_SET_INT_F('3',"theirs", &opts.writeout_stage,1246N_("checkout their version for unmerged files"),12473, PARSE_OPT_NONEG),1248OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)"),1249 PARSE_OPT_NOCOMPLETE),1250OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1251OPT_BOOL_F(0,"overwrite-ignore", &opts.overwrite_ignore,1252N_("update ignored files (default)"),1253 PARSE_OPT_NOCOMPLETE),1254OPT_STRING(0,"conflict", &conflict_style,N_("style"),1255N_("conflict style (merge or diff3)")),1256OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1257OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1258N_("do not limit pathspecs to sparse entries only")),1259OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1260N_("second guess 'git checkout <no-such-branch>'")),1261OPT_BOOL(0,"ignore-other-worktrees", &opts.ignore_other_worktrees,1262N_("do not check if another worktree is holding the given ref")),1263{ OPTION_CALLBACK,0,"recurse-submodules", NULL,1264"checkout","control recursive updating of submodules",1265 PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },1266OPT_BOOL(0,"progress", &opts.show_progress,N_("force progress reporting")),1267OPT_END(),1268};12691270memset(&opts,0,sizeof(opts));1271memset(&new_branch_info,0,sizeof(new_branch_info));1272 opts.overwrite_ignore =1;1273 opts.prefix = prefix;1274 opts.show_progress = -1;12751276git_config(git_checkout_config, &opts);12771278 opts.track = BRANCH_TRACK_UNSPECIFIED;12791280 argc =parse_options(argc, argv, prefix, options, checkout_usage,1281 PARSE_OPT_KEEP_DASHDASH);12821283if(opts.show_progress <0) {1284if(opts.quiet)1285 opts.show_progress =0;1286else1287 opts.show_progress =isatty(2);1288}12891290if(conflict_style) {1291 opts.merge =1;/* implied */1292git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1293}12941295if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1296die(_("-b, -B and --orphan are mutually exclusive"));12971298/*1299 * From here on, new_branch will contain the branch to be checked out,1300 * and new_branch_force and new_orphan_branch will tell us which one of1301 * -b/-B/--orphan is being used.1302 */1303if(opts.new_branch_force)1304 opts.new_branch = opts.new_branch_force;13051306if(opts.new_orphan_branch)1307 opts.new_branch = opts.new_orphan_branch;13081309/* --track without -b/-B/--orphan should DWIM */1310if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1311const char*argv0 = argv[0];1312if(!argc || !strcmp(argv0,"--"))1313die(_("--track needs a branch name"));1314skip_prefix(argv0,"refs/", &argv0);1315skip_prefix(argv0,"remotes/", &argv0);1316 argv0 =strchr(argv0,'/');1317if(!argv0 || !argv0[1])1318die(_("missing branch name; try -b"));1319 opts.new_branch = argv0 +1;1320}13211322/*1323 * Extract branch name from command line arguments, so1324 * all that is left is pathspecs.1325 *1326 * Handle1327 *1328 * 1) git checkout <tree> -- [<paths>]1329 * 2) git checkout -- [<paths>]1330 * 3) git checkout <something> [<paths>]1331 *1332 * including "last branch" syntax and DWIM-ery for names of1333 * remote branches, erroring out for invalid or ambiguous cases.1334 */1335if(argc) {1336struct object_id rev;1337int dwim_ok =1338!opts.patch_mode &&1339 dwim_new_local_branch &&1340 opts.track == BRANCH_TRACK_UNSPECIFIED &&1341!opts.new_branch;1342int n =parse_branchname_arg(argc, argv, dwim_ok,1343&new_branch_info, &opts, &rev,1344&dwim_remotes_matched);1345 argv += n;1346 argc -= n;1347}13481349if(argc) {1350parse_pathspec(&opts.pathspec,0,1351 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1352 prefix, argv);13531354if(!opts.pathspec.nr)1355die(_("invalid path specification"));13561357/*1358 * Try to give more helpful suggestion.1359 * new_branch && argc > 1 will be caught later.1360 */1361if(opts.new_branch && argc ==1)1362die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),1363 argv[0], opts.new_branch);13641365if(opts.force_detach)1366die(_("git checkout: --detach does not take a path argument '%s'"),1367 argv[0]);13681369if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1370die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1371"checking out of the index."));1372}13731374if(opts.new_branch) {1375struct strbuf buf = STRBUF_INIT;13761377if(opts.new_branch_force)1378 opts.branch_exists =validate_branchname(opts.new_branch, &buf);1379else1380 opts.branch_exists =1381validate_new_branchname(opts.new_branch, &buf,0);1382strbuf_release(&buf);1383}13841385UNLEAK(opts);1386if(opts.patch_mode || opts.pathspec.nr) {1387int ret =checkout_paths(&opts, new_branch_info.name);1388if(ret && dwim_remotes_matched >1&&1389 advice_checkout_ambiguous_remote_branch_name)1390advise(_("'%s' matched more than one remote tracking branch.\n"1391"We found%dremotes with a reference that matched. So we fell back\n"1392"on trying to resolve the argument as a path, but failed there too!\n"1393"\n"1394"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"1395"you can do so by fully qualifying the name with the --track option:\n"1396"\n"1397" git checkout --track origin/<name>\n"1398"\n"1399"If you'd like to always have checkouts of an ambiguous <name> prefer\n"1400"one remote, e.g. the 'origin' remote, consider setting\n"1401"checkout.defaultRemote=origin in your config."),1402 argv[0],1403 dwim_remotes_matched);1404return ret;1405}else{1406returncheckout_branch(&opts, &new_branch_info);1407}1408}