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 || 500!oideq(&old_branch_info->commit->object.oid, 501&new_branch_info->commit->object.oid)) 502return0; 503 504/* 505 * opts->patch_mode cannot be used with switching branches so is 506 * not tested here 507 */ 508 509/* 510 * opts->quiet only impacts output so doesn't require a merge 511 */ 512 513/* 514 * Honor the explicit request for a three-way merge or to throw away 515 * local changes 516 */ 517if(opts->merge || opts->force) 518return0; 519 520/* 521 * --detach is documented as "updating the index and the files in the 522 * working tree" but this optimization skips those steps so fall through 523 * to the regular code path. 524 */ 525if(opts->force_detach) 526return0; 527 528/* 529 * opts->writeout_stage cannot be used with switching branches so is 530 * not tested here 531 */ 532 533/* 534 * Honor the explicit ignore requests 535 */ 536if(!opts->overwrite_ignore || opts->ignore_skipworktree || 537 opts->ignore_other_worktrees) 538return0; 539 540/* 541 * opts->show_progress only impacts output so doesn't require a merge 542 */ 543 544/* 545 * If we aren't creating a new branch any changes or updates will 546 * happen in the existing branch. Since that could only be updating 547 * the index and working directory, we don't want to skip those steps 548 * or we've defeated any purpose in running the command. 549 */ 550if(!opts->new_branch) 551return0; 552 553/* 554 * new_branch_force is defined to "create/reset and checkout a branch" 555 * so needs to go through the merge to do the reset 556 */ 557if(opts->new_branch_force) 558return0; 559 560/* 561 * A new orphaned branch requrires the index and the working tree to be 562 * adjusted to <start_point> 563 */ 564if(opts->new_orphan_branch) 565return0; 566 567/* 568 * Remaining variables are not checkout options but used to track state 569 */ 570 571return1; 572} 573 574static intmerge_working_tree(const struct checkout_opts *opts, 575struct branch_info *old_branch_info, 576struct branch_info *new_branch_info, 577int*writeout_error) 578{ 579int ret; 580struct lock_file lock_file = LOCK_INIT; 581 582hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); 583if(read_cache_preload(NULL) <0) 584returnerror(_("index file corrupt")); 585 586resolve_undo_clear(); 587if(opts->force) { 588 ret =reset_tree(get_commit_tree(new_branch_info->commit), 589 opts,1, writeout_error); 590if(ret) 591return ret; 592}else{ 593struct tree_desc trees[2]; 594struct tree *tree; 595struct unpack_trees_options topts; 596 597memset(&topts,0,sizeof(topts)); 598 topts.head_idx = -1; 599 topts.src_index = &the_index; 600 topts.dst_index = &the_index; 601 602setup_unpack_trees_porcelain(&topts,"checkout"); 603 604refresh_cache(REFRESH_QUIET); 605 606if(unmerged_cache()) { 607error(_("you need to resolve your current index first")); 608return1; 609} 610 611/* 2-way merge to the new branch */ 612 topts.initial_checkout =is_cache_unborn(); 613 topts.update =1; 614 topts.merge =1; 615 topts.gently = opts->merge && old_branch_info->commit; 616 topts.verbose_update = opts->show_progress; 617 topts.fn = twoway_merge; 618if(opts->overwrite_ignore) { 619 topts.dir =xcalloc(1,sizeof(*topts.dir)); 620 topts.dir->flags |= DIR_SHOW_IGNORED; 621setup_standard_excludes(topts.dir); 622} 623 tree =parse_tree_indirect(old_branch_info->commit ? 624&old_branch_info->commit->object.oid : 625 the_hash_algo->empty_tree); 626init_tree_desc(&trees[0], tree->buffer, tree->size); 627 tree =parse_tree_indirect(&new_branch_info->commit->object.oid); 628init_tree_desc(&trees[1], tree->buffer, tree->size); 629 630 ret =unpack_trees(2, trees, &topts); 631clear_unpack_trees_porcelain(&topts); 632if(ret == -1) { 633/* 634 * Unpack couldn't do a trivial merge; either 635 * give up or do a real merge, depending on 636 * whether the merge flag was used. 637 */ 638struct tree *result; 639struct tree *work; 640struct merge_options o; 641if(!opts->merge) 642return1; 643 644/* 645 * Without old_branch_info->commit, the below is the same as 646 * the two-tree unpack we already tried and failed. 647 */ 648if(!old_branch_info->commit) 649return1; 650 651/* Do more real merge */ 652 653/* 654 * We update the index fully, then write the 655 * tree from the index, then merge the new 656 * branch with the current tree, with the old 657 * branch as the base. Then we reset the index 658 * (but not the working tree) to the new 659 * branch, leaving the working tree as the 660 * merged version, but skipping unmerged 661 * entries in the index. 662 */ 663 664add_files_to_cache(NULL, NULL,0); 665/* 666 * NEEDSWORK: carrying over local changes 667 * when branches have different end-of-line 668 * normalization (or clean+smudge rules) is 669 * a pain; plumb in an option to set 670 * o.renormalize? 671 */ 672init_merge_options(&o); 673 o.verbosity =0; 674 work =write_tree_from_memory(&o); 675 676 ret =reset_tree(get_commit_tree(new_branch_info->commit), 677 opts,1, 678 writeout_error); 679if(ret) 680return ret; 681 o.ancestor = old_branch_info->name; 682 o.branch1 = new_branch_info->name; 683 o.branch2 ="local"; 684 ret =merge_trees(&o, 685get_commit_tree(new_branch_info->commit), 686 work, 687get_commit_tree(old_branch_info->commit), 688&result); 689if(ret <0) 690exit(128); 691 ret =reset_tree(get_commit_tree(new_branch_info->commit), 692 opts,0, 693 writeout_error); 694strbuf_release(&o.obuf); 695if(ret) 696return ret; 697} 698} 699 700if(!active_cache_tree) 701 active_cache_tree =cache_tree(); 702 703if(!cache_tree_fully_valid(active_cache_tree)) 704cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); 705 706if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) 707die(_("unable to write new index file")); 708 709if(!opts->force && !opts->quiet) 710show_local_changes(&new_branch_info->commit->object, &opts->diff_options); 711 712return0; 713} 714 715static voidreport_tracking(struct branch_info *new_branch_info) 716{ 717struct strbuf sb = STRBUF_INIT; 718struct branch *branch =branch_get(new_branch_info->name); 719 720if(!format_tracking_info(branch, &sb, AHEAD_BEHIND_FULL)) 721return; 722fputs(sb.buf, stdout); 723strbuf_release(&sb); 724} 725 726static voidupdate_refs_for_switch(const struct checkout_opts *opts, 727struct branch_info *old_branch_info, 728struct branch_info *new_branch_info) 729{ 730struct strbuf msg = STRBUF_INIT; 731const char*old_desc, *reflog_msg; 732if(opts->new_branch) { 733if(opts->new_orphan_branch) { 734char*refname; 735 736 refname =mkpathdup("refs/heads/%s", opts->new_orphan_branch); 737if(opts->new_branch_log && 738!should_autocreate_reflog(refname)) { 739int ret; 740struct strbuf err = STRBUF_INIT; 741 742 ret =safe_create_reflog(refname,1, &err); 743if(ret) { 744fprintf(stderr,_("Can not do reflog for '%s':%s\n"), 745 opts->new_orphan_branch, err.buf); 746strbuf_release(&err); 747free(refname); 748return; 749} 750strbuf_release(&err); 751} 752free(refname); 753} 754else 755create_branch(opts->new_branch, new_branch_info->name, 756 opts->new_branch_force ?1:0, 757 opts->new_branch_force ?1:0, 758 opts->new_branch_log, 759 opts->quiet, 760 opts->track); 761 new_branch_info->name = opts->new_branch; 762setup_branch_path(new_branch_info); 763} 764 765 old_desc = old_branch_info->name; 766if(!old_desc && old_branch_info->commit) 767 old_desc =oid_to_hex(&old_branch_info->commit->object.oid); 768 769 reflog_msg =getenv("GIT_REFLOG_ACTION"); 770if(!reflog_msg) 771strbuf_addf(&msg,"checkout: moving from%sto%s", 772 old_desc ? old_desc :"(invalid)", new_branch_info->name); 773else 774strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 775 776if(!strcmp(new_branch_info->name,"HEAD") && !new_branch_info->path && !opts->force_detach) { 777/* Nothing to do. */ 778}else if(opts->force_detach || !new_branch_info->path) {/* No longer on any branch. */ 779update_ref(msg.buf,"HEAD", &new_branch_info->commit->object.oid, NULL, 780 REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR); 781if(!opts->quiet) { 782if(old_branch_info->path && 783 advice_detached_head && !opts->force_detach) 784detach_advice(new_branch_info->name); 785describe_detached_head(_("HEAD is now at"), new_branch_info->commit); 786} 787}else if(new_branch_info->path) {/* Switch branches. */ 788if(create_symref("HEAD", new_branch_info->path, msg.buf) <0) 789die(_("unable to update HEAD")); 790if(!opts->quiet) { 791if(old_branch_info->path && !strcmp(new_branch_info->path, old_branch_info->path)) { 792if(opts->new_branch_force) 793fprintf(stderr,_("Reset branch '%s'\n"), 794 new_branch_info->name); 795else 796fprintf(stderr,_("Already on '%s'\n"), 797 new_branch_info->name); 798}else if(opts->new_branch) { 799if(opts->branch_exists) 800fprintf(stderr,_("Switched to and reset branch '%s'\n"), new_branch_info->name); 801else 802fprintf(stderr,_("Switched to a new branch '%s'\n"), new_branch_info->name); 803}else{ 804fprintf(stderr,_("Switched to branch '%s'\n"), 805 new_branch_info->name); 806} 807} 808if(old_branch_info->path && old_branch_info->name) { 809if(!ref_exists(old_branch_info->path) &&reflog_exists(old_branch_info->path)) 810delete_reflog(old_branch_info->path); 811} 812} 813remove_branch_state(); 814strbuf_release(&msg); 815if(!opts->quiet && 816(new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name,"HEAD")))) 817report_tracking(new_branch_info); 818} 819 820static intadd_pending_uninteresting_ref(const char*refname, 821const struct object_id *oid, 822int flags,void*cb_data) 823{ 824add_pending_oid(cb_data, refname, oid, UNINTERESTING); 825return0; 826} 827 828static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 829{ 830strbuf_addstr(sb," "); 831strbuf_add_unique_abbrev(sb, &commit->object.oid, DEFAULT_ABBREV); 832strbuf_addch(sb,' '); 833if(!parse_commit(commit)) 834pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 835strbuf_addch(sb,'\n'); 836} 837 838#define ORPHAN_CUTOFF 4 839static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 840{ 841struct commit *c, *last = NULL; 842struct strbuf sb = STRBUF_INIT; 843int lost =0; 844while((c =get_revision(revs)) != NULL) { 845if(lost < ORPHAN_CUTOFF) 846describe_one_orphan(&sb, c); 847 last = c; 848 lost++; 849} 850if(ORPHAN_CUTOFF < lost) { 851int more = lost - ORPHAN_CUTOFF; 852if(more ==1) 853describe_one_orphan(&sb, last); 854else 855strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 856} 857 858fprintf(stderr, 859Q_( 860/* The singular version */ 861"Warning: you are leaving%dcommit behind, " 862"not connected to\n" 863"any of your branches:\n\n" 864"%s\n", 865/* The plural version */ 866"Warning: you are leaving%dcommits behind, " 867"not connected to\n" 868"any of your branches:\n\n" 869"%s\n", 870/* Give ngettext() the count */ 871 lost), 872 lost, 873 sb.buf); 874strbuf_release(&sb); 875 876if(advice_detached_head) 877fprintf(stderr, 878Q_( 879/* The singular version */ 880"If you want to keep it by creating a new branch, " 881"this may be a good time\nto do so with:\n\n" 882" git branch <new-branch-name>%s\n\n", 883/* The plural version */ 884"If you want to keep them by creating a new branch, " 885"this may be a good time\nto do so with:\n\n" 886" git branch <new-branch-name>%s\n\n", 887/* Give ngettext() the count */ 888 lost), 889find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV)); 890} 891 892/* 893 * We are about to leave commit that was at the tip of a detached 894 * HEAD. If it is not reachable from any ref, this is the last chance 895 * for the user to do so without resorting to reflog. 896 */ 897static voidorphaned_commit_warning(struct commit *old_commit,struct commit *new_commit) 898{ 899struct rev_info revs; 900struct object *object = &old_commit->object; 901 902init_revisions(&revs, NULL); 903setup_revisions(0, NULL, &revs, NULL); 904 905 object->flags &= ~UNINTERESTING; 906add_pending_object(&revs, object,oid_to_hex(&object->oid)); 907 908for_each_ref(add_pending_uninteresting_ref, &revs); 909add_pending_oid(&revs,"HEAD", &new_commit->object.oid, UNINTERESTING); 910 911if(prepare_revision_walk(&revs)) 912die(_("internal error in revision walk")); 913if(!(old_commit->object.flags & UNINTERESTING)) 914suggest_reattach(old_commit, &revs); 915else 916describe_detached_head(_("Previous HEAD position was"), old_commit); 917 918/* Clean up objects used, as they will be reused. */ 919clear_commit_marks_all(ALL_REV_FLAGS); 920} 921 922static intswitch_branches(const struct checkout_opts *opts, 923struct branch_info *new_branch_info) 924{ 925int ret =0; 926struct branch_info old_branch_info; 927void*path_to_free; 928struct object_id rev; 929int flag, writeout_error =0; 930memset(&old_branch_info,0,sizeof(old_branch_info)); 931 old_branch_info.path = path_to_free =resolve_refdup("HEAD",0, &rev, &flag); 932if(old_branch_info.path) 933 old_branch_info.commit =lookup_commit_reference_gently(the_repository, &rev,1); 934if(!(flag & REF_ISSYMREF)) 935 old_branch_info.path = NULL; 936 937if(old_branch_info.path) 938skip_prefix(old_branch_info.path,"refs/heads/", &old_branch_info.name); 939 940if(!new_branch_info->name) { 941 new_branch_info->name ="HEAD"; 942 new_branch_info->commit = old_branch_info.commit; 943if(!new_branch_info->commit) 944die(_("You are on a branch yet to be born")); 945parse_commit_or_die(new_branch_info->commit); 946} 947 948/* optimize the "checkout -b <new_branch> path */ 949if(skip_merge_working_tree(opts, &old_branch_info, new_branch_info)) { 950if(!checkout_optimize_new_branch && !opts->quiet) { 951if(read_cache_preload(NULL) <0) 952returnerror(_("index file corrupt")); 953show_local_changes(&new_branch_info->commit->object, &opts->diff_options); 954} 955}else{ 956 ret =merge_working_tree(opts, &old_branch_info, new_branch_info, &writeout_error); 957if(ret) { 958free(path_to_free); 959return ret; 960} 961} 962 963if(!opts->quiet && !old_branch_info.path && old_branch_info.commit && new_branch_info->commit != old_branch_info.commit) 964orphaned_commit_warning(old_branch_info.commit, new_branch_info->commit); 965 966update_refs_for_switch(opts, &old_branch_info, new_branch_info); 967 968 ret =post_checkout_hook(old_branch_info.commit, new_branch_info->commit,1); 969free(path_to_free); 970return ret || writeout_error; 971} 972 973static intgit_checkout_config(const char*var,const char*value,void*cb) 974{ 975if(!strcmp(var,"checkout.optimizenewbranch")) { 976 checkout_optimize_new_branch =git_config_bool(var, value); 977return0; 978} 979 980if(!strcmp(var,"diff.ignoresubmodules")) { 981struct checkout_opts *opts = cb; 982handle_ignore_submodules_arg(&opts->diff_options, value); 983return0; 984} 985 986if(starts_with(var,"submodule.")) 987returngit_default_submodule_config(var, value, NULL); 988 989returngit_xmerge_config(var, value, NULL); 990} 991 992static intparse_branchname_arg(int argc,const char**argv, 993int dwim_new_local_branch_ok, 994struct branch_info *new_branch_info, 995struct checkout_opts *opts, 996struct object_id *rev, 997int*dwim_remotes_matched) 998{ 999struct tree **source_tree = &opts->source_tree;1000const char**new_branch = &opts->new_branch;1001int argcount =0;1002struct object_id branch_rev;1003const char*arg;1004int dash_dash_pos;1005int has_dash_dash =0;1006int i;10071008/*1009 * case 1: git checkout <ref> -- [<paths>]1010 *1011 * <ref> must be a valid tree, everything after the '--' must be1012 * a path.1013 *1014 * case 2: git checkout -- [<paths>]1015 *1016 * everything after the '--' must be paths.1017 *1018 * case 3: git checkout <something> [--]1019 *1020 * (a) If <something> is a commit, that is to1021 * switch to the branch or detach HEAD at it. As a special case,1022 * if <something> is A...B (missing A or B means HEAD but you can1023 * omit at most one side), and if there is a unique merge base1024 * between A and B, A...B names that merge base.1025 *1026 * (b) If <something> is _not_ a commit, either "--" is present1027 * or <something> is not a path, no -t or -b was given, and1028 * and there is a tracking branch whose name is <something>1029 * in one and only one remote (or if the branch exists on the1030 * remote named in checkout.defaultRemote), then this is a1031 * short-hand to fork local <something> from that1032 * remote-tracking branch.1033 *1034 * (c) Otherwise, if "--" is present, treat it like case (1).1035 *1036 * (d) Otherwise :1037 * - if it's a reference, treat it like case (1)1038 * - else if it's a path, treat it like case (2)1039 * - else: fail.1040 *1041 * case 4: git checkout <something> <paths>1042 *1043 * The first argument must not be ambiguous.1044 * - If it's *only* a reference, treat it like case (1).1045 * - If it's only a path, treat it like case (2).1046 * - else: fail.1047 *1048 */1049if(!argc)1050return0;10511052 arg = argv[0];1053 dash_dash_pos = -1;1054for(i =0; i < argc; i++) {1055if(!strcmp(argv[i],"--")) {1056 dash_dash_pos = i;1057break;1058}1059}1060if(dash_dash_pos ==0)1061return1;/* case (2) */1062else if(dash_dash_pos ==1)1063 has_dash_dash =1;/* case (3) or (1) */1064else if(dash_dash_pos >=2)1065die(_("only one reference expected,%dgiven."), dash_dash_pos);10661067if(!strcmp(arg,"-"))1068 arg ="@{-1}";10691070if(get_oid_mb(arg, rev)) {1071/*1072 * Either case (3) or (4), with <something> not being1073 * a commit, or an attempt to use case (1) with an1074 * invalid ref.1075 *1076 * It's likely an error, but we need to find out if1077 * we should auto-create the branch, case (3).(b).1078 */1079int recover_with_dwim = dwim_new_local_branch_ok;10801081if(!has_dash_dash &&1082(check_filename(opts->prefix, arg) || !no_wildcard(arg)))1083 recover_with_dwim =0;1084/*1085 * Accept "git checkout foo" and "git checkout foo --"1086 * as candidates for dwim.1087 */1088if(!(argc ==1&& !has_dash_dash) &&1089!(argc ==2&& has_dash_dash))1090 recover_with_dwim =0;10911092if(recover_with_dwim) {1093const char*remote =unique_tracking_name(arg, rev,1094 dwim_remotes_matched);1095if(remote) {1096*new_branch = arg;1097 arg = remote;1098/* DWIMmed to create local branch, case (3).(b) */1099}else{1100 recover_with_dwim =0;1101}1102}11031104if(!recover_with_dwim) {1105if(has_dash_dash)1106die(_("invalid reference:%s"), arg);1107return argcount;1108}1109}11101111/* we can't end up being in (2) anymore, eat the argument */1112 argcount++;1113 argv++;1114 argc--;11151116 new_branch_info->name = arg;1117setup_branch_path(new_branch_info);11181119if(!check_refname_format(new_branch_info->path,0) &&1120!read_ref(new_branch_info->path, &branch_rev))1121oidcpy(rev, &branch_rev);1122else1123 new_branch_info->path = NULL;/* not an existing branch */11241125 new_branch_info->commit =lookup_commit_reference_gently(the_repository, rev,1);1126if(!new_branch_info->commit) {1127/* not a commit */1128*source_tree =parse_tree_indirect(rev);1129}else{1130parse_commit_or_die(new_branch_info->commit);1131*source_tree =get_commit_tree(new_branch_info->commit);1132}11331134if(!*source_tree)/* case (1): want a tree */1135die(_("reference is not a tree:%s"), arg);1136if(!has_dash_dash) {/* case (3).(d) -> (1) */1137/*1138 * Do not complain the most common case1139 * git checkout branch1140 * even if there happen to be a file called 'branch';1141 * it would be extremely annoying.1142 */1143if(argc)1144verify_non_filename(opts->prefix, arg);1145}else{1146 argcount++;1147 argv++;1148 argc--;1149}11501151return argcount;1152}11531154static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1155{1156int status;1157struct strbuf branch_ref = STRBUF_INIT;11581159if(!opts->new_branch)1160die(_("You are on a branch yet to be born"));1161strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1162 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1163strbuf_release(&branch_ref);1164if(!opts->quiet)1165fprintf(stderr,_("Switched to a new branch '%s'\n"),1166 opts->new_branch);1167return status;1168}11691170static intcheckout_branch(struct checkout_opts *opts,1171struct branch_info *new_branch_info)1172{1173if(opts->pathspec.nr)1174die(_("paths cannot be used with switching branches"));11751176if(opts->patch_mode)1177die(_("'%s' cannot be used with switching branches"),1178"--patch");11791180if(opts->writeout_stage)1181die(_("'%s' cannot be used with switching branches"),1182"--ours/--theirs");11831184if(opts->force && opts->merge)1185die(_("'%s' cannot be used with '%s'"),"-f","-m");11861187if(opts->force_detach && opts->new_branch)1188die(_("'%s' cannot be used with '%s'"),1189"--detach","-b/-B/--orphan");11901191if(opts->new_orphan_branch) {1192if(opts->track != BRANCH_TRACK_UNSPECIFIED)1193die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1194}else if(opts->force_detach) {1195if(opts->track != BRANCH_TRACK_UNSPECIFIED)1196die(_("'%s' cannot be used with '%s'"),"--detach","-t");1197}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1198 opts->track = git_branch_track;11991200if(new_branch_info->name && !new_branch_info->commit)1201die(_("Cannot switch branch to a non-commit '%s'"),1202 new_branch_info->name);12031204if(new_branch_info->path && !opts->force_detach && !opts->new_branch &&1205!opts->ignore_other_worktrees) {1206int flag;1207char*head_ref =resolve_refdup("HEAD",0, NULL, &flag);1208if(head_ref &&1209(!(flag & REF_ISSYMREF) ||strcmp(head_ref, new_branch_info->path)))1210die_if_checked_out(new_branch_info->path,1);1211free(head_ref);1212}12131214if(!new_branch_info->commit && opts->new_branch) {1215struct object_id rev;1216int flag;12171218if(!read_ref_full("HEAD",0, &rev, &flag) &&1219(flag & REF_ISSYMREF) &&is_null_oid(&rev))1220returnswitch_unborn_to_new_branch(opts);1221}1222returnswitch_branches(opts, new_branch_info);1223}12241225intcmd_checkout(int argc,const char**argv,const char*prefix)1226{1227struct checkout_opts opts;1228struct branch_info new_branch_info;1229char*conflict_style = NULL;1230int dwim_new_local_branch =1;1231int dwim_remotes_matched =0;1232struct option options[] = {1233OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1234OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1235N_("create and checkout a new branch")),1236OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1237N_("create/reset and checkout a branch")),1238OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1239OPT_BOOL(0,"detach", &opts.force_detach,N_("detach HEAD at named commit")),1240OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1241 BRANCH_TRACK_EXPLICIT),1242OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1243OPT_SET_INT_F('2',"ours", &opts.writeout_stage,1244N_("checkout our version for unmerged files"),12452, PARSE_OPT_NONEG),1246OPT_SET_INT_F('3',"theirs", &opts.writeout_stage,1247N_("checkout their version for unmerged files"),12483, PARSE_OPT_NONEG),1249OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)"),1250 PARSE_OPT_NOCOMPLETE),1251OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1252OPT_BOOL_F(0,"overwrite-ignore", &opts.overwrite_ignore,1253N_("update ignored files (default)"),1254 PARSE_OPT_NOCOMPLETE),1255OPT_STRING(0,"conflict", &conflict_style,N_("style"),1256N_("conflict style (merge or diff3)")),1257OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1258OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1259N_("do not limit pathspecs to sparse entries only")),1260OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1261N_("second guess 'git checkout <no-such-branch>'")),1262OPT_BOOL(0,"ignore-other-worktrees", &opts.ignore_other_worktrees,1263N_("do not check if another worktree is holding the given ref")),1264{ OPTION_CALLBACK,0,"recurse-submodules", NULL,1265"checkout","control recursive updating of submodules",1266 PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },1267OPT_BOOL(0,"progress", &opts.show_progress,N_("force progress reporting")),1268OPT_END(),1269};12701271memset(&opts,0,sizeof(opts));1272memset(&new_branch_info,0,sizeof(new_branch_info));1273 opts.overwrite_ignore =1;1274 opts.prefix = prefix;1275 opts.show_progress = -1;12761277git_config(git_checkout_config, &opts);12781279 opts.track = BRANCH_TRACK_UNSPECIFIED;12801281 argc =parse_options(argc, argv, prefix, options, checkout_usage,1282 PARSE_OPT_KEEP_DASHDASH);12831284if(opts.show_progress <0) {1285if(opts.quiet)1286 opts.show_progress =0;1287else1288 opts.show_progress =isatty(2);1289}12901291if(conflict_style) {1292 opts.merge =1;/* implied */1293git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1294}12951296if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1297die(_("-b, -B and --orphan are mutually exclusive"));12981299/*1300 * From here on, new_branch will contain the branch to be checked out,1301 * and new_branch_force and new_orphan_branch will tell us which one of1302 * -b/-B/--orphan is being used.1303 */1304if(opts.new_branch_force)1305 opts.new_branch = opts.new_branch_force;13061307if(opts.new_orphan_branch)1308 opts.new_branch = opts.new_orphan_branch;13091310/* --track without -b/-B/--orphan should DWIM */1311if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1312const char*argv0 = argv[0];1313if(!argc || !strcmp(argv0,"--"))1314die(_("--track needs a branch name"));1315skip_prefix(argv0,"refs/", &argv0);1316skip_prefix(argv0,"remotes/", &argv0);1317 argv0 =strchr(argv0,'/');1318if(!argv0 || !argv0[1])1319die(_("missing branch name; try -b"));1320 opts.new_branch = argv0 +1;1321}13221323/*1324 * Extract branch name from command line arguments, so1325 * all that is left is pathspecs.1326 *1327 * Handle1328 *1329 * 1) git checkout <tree> -- [<paths>]1330 * 2) git checkout -- [<paths>]1331 * 3) git checkout <something> [<paths>]1332 *1333 * including "last branch" syntax and DWIM-ery for names of1334 * remote branches, erroring out for invalid or ambiguous cases.1335 */1336if(argc) {1337struct object_id rev;1338int dwim_ok =1339!opts.patch_mode &&1340 dwim_new_local_branch &&1341 opts.track == BRANCH_TRACK_UNSPECIFIED &&1342!opts.new_branch;1343int n =parse_branchname_arg(argc, argv, dwim_ok,1344&new_branch_info, &opts, &rev,1345&dwim_remotes_matched);1346 argv += n;1347 argc -= n;1348}13491350if(argc) {1351parse_pathspec(&opts.pathspec,0,1352 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1353 prefix, argv);13541355if(!opts.pathspec.nr)1356die(_("invalid path specification"));13571358/*1359 * Try to give more helpful suggestion.1360 * new_branch && argc > 1 will be caught later.1361 */1362if(opts.new_branch && argc ==1)1363die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),1364 argv[0], opts.new_branch);13651366if(opts.force_detach)1367die(_("git checkout: --detach does not take a path argument '%s'"),1368 argv[0]);13691370if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1371die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1372"checking out of the index."));1373}13741375if(opts.new_branch) {1376struct strbuf buf = STRBUF_INIT;13771378if(opts.new_branch_force)1379 opts.branch_exists =validate_branchname(opts.new_branch, &buf);1380else1381 opts.branch_exists =1382validate_new_branchname(opts.new_branch, &buf,0);1383strbuf_release(&buf);1384}13851386UNLEAK(opts);1387if(opts.patch_mode || opts.pathspec.nr) {1388int ret =checkout_paths(&opts, new_branch_info.name);1389if(ret && dwim_remotes_matched >1&&1390 advice_checkout_ambiguous_remote_branch_name)1391advise(_("'%s' matched more than one remote tracking branch.\n"1392"We found%dremotes with a reference that matched. So we fell back\n"1393"on trying to resolve the argument as a path, but failed there too!\n"1394"\n"1395"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"1396"you can do so by fully qualifying the name with the --track option:\n"1397"\n"1398" git checkout --track origin/<name>\n"1399"\n"1400"If you'd like to always have checkouts of an ambiguous <name> prefer\n"1401"one remote, e.g. the 'origin' remote, consider setting\n"1402"checkout.defaultRemote=origin in your config."),1403 argv[0],1404 dwim_remotes_matched);1405return ret;1406}else{1407returncheckout_branch(&opts, &new_branch_info);1408}1409}