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