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; 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_checkouts); 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(opts->source_tree) 397fprintf_ln(stderr,Q_("Checked out%dpath out of%s", 398"Checked out%dpaths out of%s", 399 nr_checkouts), 400 nr_checkouts, 401find_unique_abbrev(&opts->source_tree->object.oid, 402 DEFAULT_ABBREV)); 403else 404fprintf_ln(stderr,Q_("Checked out%dpath out of the index", 405"Checked out%dpaths out of the index", 406 nr_checkouts), 407 nr_checkouts); 408} 409 410if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) 411die(_("unable to write new index file")); 412 413read_ref_full("HEAD",0, &rev, NULL); 414 head =lookup_commit_reference_gently(the_repository, &rev,1); 415 416 errs |=post_checkout_hook(head, head,0); 417return errs; 418} 419 420static voidshow_local_changes(struct object *head, 421const struct diff_options *opts) 422{ 423struct rev_info rev; 424/* I think we want full paths, even if we're in a subdirectory. */ 425repo_init_revisions(the_repository, &rev, NULL); 426 rev.diffopt.flags = opts->flags; 427 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; 428diff_setup_done(&rev.diffopt); 429add_pending_object(&rev, head, NULL); 430run_diff_index(&rev,0); 431} 432 433static voiddescribe_detached_head(const char*msg,struct commit *commit) 434{ 435struct strbuf sb = STRBUF_INIT; 436 437if(!parse_commit(commit)) 438pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 439if(print_sha1_ellipsis()) { 440fprintf(stderr,"%s %s...%s\n", msg, 441find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV), sb.buf); 442}else{ 443fprintf(stderr,"%s %s %s\n", msg, 444find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV), sb.buf); 445} 446strbuf_release(&sb); 447} 448 449static intreset_tree(struct tree *tree,const struct checkout_opts *o, 450int worktree,int*writeout_error) 451{ 452struct unpack_trees_options opts; 453struct tree_desc tree_desc; 454 455memset(&opts,0,sizeof(opts)); 456 opts.head_idx = -1; 457 opts.update = worktree; 458 opts.skip_unmerged = !worktree; 459 opts.reset =1; 460 opts.merge =1; 461 opts.fn = oneway_merge; 462 opts.verbose_update = o->show_progress; 463 opts.src_index = &the_index; 464 opts.dst_index = &the_index; 465parse_tree(tree); 466init_tree_desc(&tree_desc, tree->buffer, tree->size); 467switch(unpack_trees(1, &tree_desc, &opts)) { 468case-2: 469*writeout_error =1; 470/* 471 * We return 0 nevertheless, as the index is all right 472 * and more importantly we have made best efforts to 473 * update paths in the work tree, and we cannot revert 474 * them. 475 */ 476/* fallthrough */ 477case0: 478return0; 479default: 480return128; 481} 482} 483 484struct branch_info { 485const char*name;/* The short name used */ 486const char*path;/* The full name of a real branch */ 487struct commit *commit;/* The named commit */ 488/* 489 * if not null the branch is detached because it's already 490 * checked out in this checkout 491 */ 492char*checkout; 493}; 494 495static voidsetup_branch_path(struct branch_info *branch) 496{ 497struct strbuf buf = STRBUF_INIT; 498 499strbuf_branchname(&buf, branch->name, INTERPRET_BRANCH_LOCAL); 500if(strcmp(buf.buf, branch->name)) 501 branch->name =xstrdup(buf.buf); 502strbuf_splice(&buf,0,0,"refs/heads/",11); 503 branch->path =strbuf_detach(&buf, NULL); 504} 505 506/* 507 * Skip merging the trees, updating the index and working directory if and 508 * only if we are creating a new branch via "git checkout -b <new_branch>." 509 */ 510static intskip_merge_working_tree(const struct checkout_opts *opts, 511const struct branch_info *old_branch_info, 512const struct branch_info *new_branch_info) 513{ 514/* 515 * Do the merge if sparse checkout is on and the user has not opted in 516 * to the optimized behavior 517 */ 518if(core_apply_sparse_checkout && !checkout_optimize_new_branch) 519return0; 520 521/* 522 * We must do the merge if we are actually moving to a new commit. 523 */ 524if(!old_branch_info->commit || !new_branch_info->commit || 525!oideq(&old_branch_info->commit->object.oid, 526&new_branch_info->commit->object.oid)) 527return0; 528 529/* 530 * opts->patch_mode cannot be used with switching branches so is 531 * not tested here 532 */ 533 534/* 535 * opts->quiet only impacts output so doesn't require a merge 536 */ 537 538/* 539 * Honor the explicit request for a three-way merge or to throw away 540 * local changes 541 */ 542if(opts->merge || opts->force) 543return0; 544 545/* 546 * --detach is documented as "updating the index and the files in the 547 * working tree" but this optimization skips those steps so fall through 548 * to the regular code path. 549 */ 550if(opts->force_detach) 551return0; 552 553/* 554 * opts->writeout_stage cannot be used with switching branches so is 555 * not tested here 556 */ 557 558/* 559 * Honor the explicit ignore requests 560 */ 561if(!opts->overwrite_ignore || opts->ignore_skipworktree || 562 opts->ignore_other_worktrees) 563return0; 564 565/* 566 * opts->show_progress only impacts output so doesn't require a merge 567 */ 568 569/* 570 * If we aren't creating a new branch any changes or updates will 571 * happen in the existing branch. Since that could only be updating 572 * the index and working directory, we don't want to skip those steps 573 * or we've defeated any purpose in running the command. 574 */ 575if(!opts->new_branch) 576return0; 577 578/* 579 * new_branch_force is defined to "create/reset and checkout a branch" 580 * so needs to go through the merge to do the reset 581 */ 582if(opts->new_branch_force) 583return0; 584 585/* 586 * A new orphaned branch requrires the index and the working tree to be 587 * adjusted to <start_point> 588 */ 589if(opts->new_orphan_branch) 590return0; 591 592/* 593 * Remaining variables are not checkout options but used to track state 594 */ 595 596/* 597 * Do the merge if this is the initial checkout. We cannot use 598 * is_cache_unborn() here because the index hasn't been loaded yet 599 * so cache_nr and timestamp.sec are always zero. 600 */ 601if(!file_exists(get_index_file())) 602return0; 603 604return1; 605} 606 607static intmerge_working_tree(const struct checkout_opts *opts, 608struct branch_info *old_branch_info, 609struct branch_info *new_branch_info, 610int*writeout_error) 611{ 612int ret; 613struct lock_file lock_file = LOCK_INIT; 614 615hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); 616if(read_cache_preload(NULL) <0) 617returnerror(_("index file corrupt")); 618 619resolve_undo_clear(); 620if(opts->force) { 621 ret =reset_tree(get_commit_tree(new_branch_info->commit), 622 opts,1, writeout_error); 623if(ret) 624return ret; 625}else{ 626struct tree_desc trees[2]; 627struct tree *tree; 628struct unpack_trees_options topts; 629 630memset(&topts,0,sizeof(topts)); 631 topts.head_idx = -1; 632 topts.src_index = &the_index; 633 topts.dst_index = &the_index; 634 635setup_unpack_trees_porcelain(&topts,"checkout"); 636 637refresh_cache(REFRESH_QUIET); 638 639if(unmerged_cache()) { 640error(_("you need to resolve your current index first")); 641return1; 642} 643 644/* 2-way merge to the new branch */ 645 topts.initial_checkout =is_cache_unborn(); 646 topts.update =1; 647 topts.merge =1; 648 topts.gently = opts->merge && old_branch_info->commit; 649 topts.verbose_update = opts->show_progress; 650 topts.fn = twoway_merge; 651if(opts->overwrite_ignore) { 652 topts.dir =xcalloc(1,sizeof(*topts.dir)); 653 topts.dir->flags |= DIR_SHOW_IGNORED; 654setup_standard_excludes(topts.dir); 655} 656 tree =parse_tree_indirect(old_branch_info->commit ? 657&old_branch_info->commit->object.oid : 658 the_hash_algo->empty_tree); 659init_tree_desc(&trees[0], tree->buffer, tree->size); 660 tree =parse_tree_indirect(&new_branch_info->commit->object.oid); 661init_tree_desc(&trees[1], tree->buffer, tree->size); 662 663 ret =unpack_trees(2, trees, &topts); 664clear_unpack_trees_porcelain(&topts); 665if(ret == -1) { 666/* 667 * Unpack couldn't do a trivial merge; either 668 * give up or do a real merge, depending on 669 * whether the merge flag was used. 670 */ 671struct tree *result; 672struct tree *work; 673struct merge_options o; 674if(!opts->merge) 675return1; 676 677/* 678 * Without old_branch_info->commit, the below is the same as 679 * the two-tree unpack we already tried and failed. 680 */ 681if(!old_branch_info->commit) 682return1; 683 684/* Do more real merge */ 685 686/* 687 * We update the index fully, then write the 688 * tree from the index, then merge the new 689 * branch with the current tree, with the old 690 * branch as the base. Then we reset the index 691 * (but not the working tree) to the new 692 * branch, leaving the working tree as the 693 * merged version, but skipping unmerged 694 * entries in the index. 695 */ 696 697add_files_to_cache(NULL, NULL,0); 698/* 699 * NEEDSWORK: carrying over local changes 700 * when branches have different end-of-line 701 * normalization (or clean+smudge rules) is 702 * a pain; plumb in an option to set 703 * o.renormalize? 704 */ 705init_merge_options(&o, the_repository); 706 o.verbosity =0; 707 work =write_tree_from_memory(&o); 708 709 ret =reset_tree(get_commit_tree(new_branch_info->commit), 710 opts,1, 711 writeout_error); 712if(ret) 713return ret; 714 o.ancestor = old_branch_info->name; 715 o.branch1 = new_branch_info->name; 716 o.branch2 ="local"; 717 ret =merge_trees(&o, 718get_commit_tree(new_branch_info->commit), 719 work, 720get_commit_tree(old_branch_info->commit), 721&result); 722if(ret <0) 723exit(128); 724 ret =reset_tree(get_commit_tree(new_branch_info->commit), 725 opts,0, 726 writeout_error); 727strbuf_release(&o.obuf); 728if(ret) 729return ret; 730} 731} 732 733if(!active_cache_tree) 734 active_cache_tree =cache_tree(); 735 736if(!cache_tree_fully_valid(active_cache_tree)) 737cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); 738 739if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) 740die(_("unable to write new index file")); 741 742if(!opts->force && !opts->quiet) 743show_local_changes(&new_branch_info->commit->object, &opts->diff_options); 744 745return0; 746} 747 748static voidreport_tracking(struct branch_info *new_branch_info) 749{ 750struct strbuf sb = STRBUF_INIT; 751struct branch *branch =branch_get(new_branch_info->name); 752 753if(!format_tracking_info(branch, &sb, AHEAD_BEHIND_FULL)) 754return; 755fputs(sb.buf, stdout); 756strbuf_release(&sb); 757} 758 759static voidupdate_refs_for_switch(const struct checkout_opts *opts, 760struct branch_info *old_branch_info, 761struct branch_info *new_branch_info) 762{ 763struct strbuf msg = STRBUF_INIT; 764const char*old_desc, *reflog_msg; 765if(opts->new_branch) { 766if(opts->new_orphan_branch) { 767char*refname; 768 769 refname =mkpathdup("refs/heads/%s", opts->new_orphan_branch); 770if(opts->new_branch_log && 771!should_autocreate_reflog(refname)) { 772int ret; 773struct strbuf err = STRBUF_INIT; 774 775 ret =safe_create_reflog(refname,1, &err); 776if(ret) { 777fprintf(stderr,_("Can not do reflog for '%s':%s\n"), 778 opts->new_orphan_branch, err.buf); 779strbuf_release(&err); 780free(refname); 781return; 782} 783strbuf_release(&err); 784} 785free(refname); 786} 787else 788create_branch(the_repository, 789 opts->new_branch, new_branch_info->name, 790 opts->new_branch_force ?1:0, 791 opts->new_branch_force ?1:0, 792 opts->new_branch_log, 793 opts->quiet, 794 opts->track); 795 new_branch_info->name = opts->new_branch; 796setup_branch_path(new_branch_info); 797} 798 799 old_desc = old_branch_info->name; 800if(!old_desc && old_branch_info->commit) 801 old_desc =oid_to_hex(&old_branch_info->commit->object.oid); 802 803 reflog_msg =getenv("GIT_REFLOG_ACTION"); 804if(!reflog_msg) 805strbuf_addf(&msg,"checkout: moving from%sto%s", 806 old_desc ? old_desc :"(invalid)", new_branch_info->name); 807else 808strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 809 810if(!strcmp(new_branch_info->name,"HEAD") && !new_branch_info->path && !opts->force_detach) { 811/* Nothing to do. */ 812}else if(opts->force_detach || !new_branch_info->path) {/* No longer on any branch. */ 813update_ref(msg.buf,"HEAD", &new_branch_info->commit->object.oid, NULL, 814 REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR); 815if(!opts->quiet) { 816if(old_branch_info->path && 817 advice_detached_head && !opts->force_detach) 818detach_advice(new_branch_info->name); 819describe_detached_head(_("HEAD is now at"), new_branch_info->commit); 820} 821}else if(new_branch_info->path) {/* Switch branches. */ 822if(create_symref("HEAD", new_branch_info->path, msg.buf) <0) 823die(_("unable to update HEAD")); 824if(!opts->quiet) { 825if(old_branch_info->path && !strcmp(new_branch_info->path, old_branch_info->path)) { 826if(opts->new_branch_force) 827fprintf(stderr,_("Reset branch '%s'\n"), 828 new_branch_info->name); 829else 830fprintf(stderr,_("Already on '%s'\n"), 831 new_branch_info->name); 832}else if(opts->new_branch) { 833if(opts->branch_exists) 834fprintf(stderr,_("Switched to and reset branch '%s'\n"), new_branch_info->name); 835else 836fprintf(stderr,_("Switched to a new branch '%s'\n"), new_branch_info->name); 837}else{ 838fprintf(stderr,_("Switched to branch '%s'\n"), 839 new_branch_info->name); 840} 841} 842if(old_branch_info->path && old_branch_info->name) { 843if(!ref_exists(old_branch_info->path) &&reflog_exists(old_branch_info->path)) 844delete_reflog(old_branch_info->path); 845} 846} 847remove_branch_state(the_repository); 848strbuf_release(&msg); 849if(!opts->quiet && 850(new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name,"HEAD")))) 851report_tracking(new_branch_info); 852} 853 854static intadd_pending_uninteresting_ref(const char*refname, 855const struct object_id *oid, 856int flags,void*cb_data) 857{ 858add_pending_oid(cb_data, refname, oid, UNINTERESTING); 859return0; 860} 861 862static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 863{ 864strbuf_addstr(sb," "); 865strbuf_add_unique_abbrev(sb, &commit->object.oid, DEFAULT_ABBREV); 866strbuf_addch(sb,' '); 867if(!parse_commit(commit)) 868pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 869strbuf_addch(sb,'\n'); 870} 871 872#define ORPHAN_CUTOFF 4 873static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 874{ 875struct commit *c, *last = NULL; 876struct strbuf sb = STRBUF_INIT; 877int lost =0; 878while((c =get_revision(revs)) != NULL) { 879if(lost < ORPHAN_CUTOFF) 880describe_one_orphan(&sb, c); 881 last = c; 882 lost++; 883} 884if(ORPHAN_CUTOFF < lost) { 885int more = lost - ORPHAN_CUTOFF; 886if(more ==1) 887describe_one_orphan(&sb, last); 888else 889strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 890} 891 892fprintf(stderr, 893Q_( 894/* The singular version */ 895"Warning: you are leaving%dcommit behind, " 896"not connected to\n" 897"any of your branches:\n\n" 898"%s\n", 899/* The plural version */ 900"Warning: you are leaving%dcommits behind, " 901"not connected to\n" 902"any of your branches:\n\n" 903"%s\n", 904/* Give ngettext() the count */ 905 lost), 906 lost, 907 sb.buf); 908strbuf_release(&sb); 909 910if(advice_detached_head) 911fprintf(stderr, 912Q_( 913/* The singular version */ 914"If you want to keep it by creating a new branch, " 915"this may be a good time\nto do so with:\n\n" 916" git branch <new-branch-name>%s\n\n", 917/* The plural version */ 918"If you want to keep them by creating a new branch, " 919"this may be a good time\nto do so with:\n\n" 920" git branch <new-branch-name>%s\n\n", 921/* Give ngettext() the count */ 922 lost), 923find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV)); 924} 925 926/* 927 * We are about to leave commit that was at the tip of a detached 928 * HEAD. If it is not reachable from any ref, this is the last chance 929 * for the user to do so without resorting to reflog. 930 */ 931static voidorphaned_commit_warning(struct commit *old_commit,struct commit *new_commit) 932{ 933struct rev_info revs; 934struct object *object = &old_commit->object; 935 936repo_init_revisions(the_repository, &revs, NULL); 937setup_revisions(0, NULL, &revs, NULL); 938 939 object->flags &= ~UNINTERESTING; 940add_pending_object(&revs, object,oid_to_hex(&object->oid)); 941 942for_each_ref(add_pending_uninteresting_ref, &revs); 943add_pending_oid(&revs,"HEAD", &new_commit->object.oid, UNINTERESTING); 944 945if(prepare_revision_walk(&revs)) 946die(_("internal error in revision walk")); 947if(!(old_commit->object.flags & UNINTERESTING)) 948suggest_reattach(old_commit, &revs); 949else 950describe_detached_head(_("Previous HEAD position was"), old_commit); 951 952/* Clean up objects used, as they will be reused. */ 953clear_commit_marks_all(ALL_REV_FLAGS); 954} 955 956static intswitch_branches(const struct checkout_opts *opts, 957struct branch_info *new_branch_info) 958{ 959int ret =0; 960struct branch_info old_branch_info; 961void*path_to_free; 962struct object_id rev; 963int flag, writeout_error =0; 964memset(&old_branch_info,0,sizeof(old_branch_info)); 965 old_branch_info.path = path_to_free =resolve_refdup("HEAD",0, &rev, &flag); 966if(old_branch_info.path) 967 old_branch_info.commit =lookup_commit_reference_gently(the_repository, &rev,1); 968if(!(flag & REF_ISSYMREF)) 969 old_branch_info.path = NULL; 970 971if(old_branch_info.path) 972skip_prefix(old_branch_info.path,"refs/heads/", &old_branch_info.name); 973 974if(!new_branch_info->name) { 975 new_branch_info->name ="HEAD"; 976 new_branch_info->commit = old_branch_info.commit; 977if(!new_branch_info->commit) 978die(_("You are on a branch yet to be born")); 979parse_commit_or_die(new_branch_info->commit); 980} 981 982/* optimize the "checkout -b <new_branch> path */ 983if(skip_merge_working_tree(opts, &old_branch_info, new_branch_info)) { 984if(!checkout_optimize_new_branch && !opts->quiet) { 985if(read_cache_preload(NULL) <0) 986returnerror(_("index file corrupt")); 987show_local_changes(&new_branch_info->commit->object, &opts->diff_options); 988} 989}else{ 990 ret =merge_working_tree(opts, &old_branch_info, new_branch_info, &writeout_error); 991if(ret) { 992free(path_to_free); 993return ret; 994} 995} 996 997if(!opts->quiet && !old_branch_info.path && old_branch_info.commit && new_branch_info->commit != old_branch_info.commit) 998orphaned_commit_warning(old_branch_info.commit, new_branch_info->commit); 9991000update_refs_for_switch(opts, &old_branch_info, new_branch_info);10011002 ret =post_checkout_hook(old_branch_info.commit, new_branch_info->commit,1);1003free(path_to_free);1004return ret || writeout_error;1005}10061007static intgit_checkout_config(const char*var,const char*value,void*cb)1008{1009if(!strcmp(var,"checkout.optimizenewbranch")) {1010 checkout_optimize_new_branch =git_config_bool(var, value);1011return0;1012}10131014if(!strcmp(var,"diff.ignoresubmodules")) {1015struct checkout_opts *opts = cb;1016handle_ignore_submodules_arg(&opts->diff_options, value);1017return0;1018}10191020if(starts_with(var,"submodule."))1021returngit_default_submodule_config(var, value, NULL);10221023returngit_xmerge_config(var, value, NULL);1024}10251026static intparse_branchname_arg(int argc,const char**argv,1027int dwim_new_local_branch_ok,1028struct branch_info *new_branch_info,1029struct checkout_opts *opts,1030struct object_id *rev,1031int*dwim_remotes_matched)1032{1033struct tree **source_tree = &opts->source_tree;1034const char**new_branch = &opts->new_branch;1035int argcount =0;1036struct object_id branch_rev;1037const char*arg;1038int dash_dash_pos;1039int has_dash_dash =0;1040int i;10411042/*1043 * case 1: git checkout <ref> -- [<paths>]1044 *1045 * <ref> must be a valid tree, everything after the '--' must be1046 * a path.1047 *1048 * case 2: git checkout -- [<paths>]1049 *1050 * everything after the '--' must be paths.1051 *1052 * case 3: git checkout <something> [--]1053 *1054 * (a) If <something> is a commit, that is to1055 * switch to the branch or detach HEAD at it. As a special case,1056 * if <something> is A...B (missing A or B means HEAD but you can1057 * omit at most one side), and if there is a unique merge base1058 * between A and B, A...B names that merge base.1059 *1060 * (b) If <something> is _not_ a commit, either "--" is present1061 * or <something> is not a path, no -t or -b was given, and1062 * and there is a tracking branch whose name is <something>1063 * in one and only one remote (or if the branch exists on the1064 * remote named in checkout.defaultRemote), then this is a1065 * short-hand to fork local <something> from that1066 * remote-tracking branch.1067 *1068 * (c) Otherwise, if "--" is present, treat it like case (1).1069 *1070 * (d) Otherwise :1071 * - if it's a reference, treat it like case (1)1072 * - else if it's a path, treat it like case (2)1073 * - else: fail.1074 *1075 * case 4: git checkout <something> <paths>1076 *1077 * The first argument must not be ambiguous.1078 * - If it's *only* a reference, treat it like case (1).1079 * - If it's only a path, treat it like case (2).1080 * - else: fail.1081 *1082 */1083if(!argc)1084return0;10851086 arg = argv[0];1087 dash_dash_pos = -1;1088for(i =0; i < argc; i++) {1089if(!strcmp(argv[i],"--")) {1090 dash_dash_pos = i;1091break;1092}1093}1094if(dash_dash_pos ==0)1095return1;/* case (2) */1096else if(dash_dash_pos ==1)1097 has_dash_dash =1;/* case (3) or (1) */1098else if(dash_dash_pos >=2)1099die(_("only one reference expected,%dgiven."), dash_dash_pos);1100 opts->count_checkout_paths = !opts->quiet && !has_dash_dash;11011102if(!strcmp(arg,"-"))1103 arg ="@{-1}";11041105if(get_oid_mb(arg, rev)) {1106/*1107 * Either case (3) or (4), with <something> not being1108 * a commit, or an attempt to use case (1) with an1109 * invalid ref.1110 *1111 * It's likely an error, but we need to find out if1112 * we should auto-create the branch, case (3).(b).1113 */1114int recover_with_dwim = dwim_new_local_branch_ok;11151116int could_be_checkout_paths = !has_dash_dash &&1117check_filename(opts->prefix, arg);11181119if(!has_dash_dash && !no_wildcard(arg))1120 recover_with_dwim =0;11211122/*1123 * Accept "git checkout foo" and "git checkout foo --"1124 * as candidates for dwim.1125 */1126if(!(argc ==1&& !has_dash_dash) &&1127!(argc ==2&& has_dash_dash))1128 recover_with_dwim =0;11291130if(recover_with_dwim) {1131const char*remote =unique_tracking_name(arg, rev,1132 dwim_remotes_matched);1133if(remote) {1134if(could_be_checkout_paths)1135die(_("'%s' could be both a local file and a tracking branch.\n"1136"Please use -- (and optionally --no-guess) to disambiguate"),1137 arg);1138*new_branch = arg;1139 arg = remote;1140/* DWIMmed to create local branch, case (3).(b) */1141}else{1142 recover_with_dwim =0;1143}1144}11451146if(!recover_with_dwim) {1147if(has_dash_dash)1148die(_("invalid reference:%s"), arg);1149return argcount;1150}1151}11521153/* we can't end up being in (2) anymore, eat the argument */1154 argcount++;1155 argv++;1156 argc--;11571158 new_branch_info->name = arg;1159setup_branch_path(new_branch_info);11601161if(!check_refname_format(new_branch_info->path,0) &&1162!read_ref(new_branch_info->path, &branch_rev))1163oidcpy(rev, &branch_rev);1164else1165 new_branch_info->path = NULL;/* not an existing branch */11661167 new_branch_info->commit =lookup_commit_reference_gently(the_repository, rev,1);1168if(!new_branch_info->commit) {1169/* not a commit */1170*source_tree =parse_tree_indirect(rev);1171}else{1172parse_commit_or_die(new_branch_info->commit);1173*source_tree =get_commit_tree(new_branch_info->commit);1174}11751176if(!*source_tree)/* case (1): want a tree */1177die(_("reference is not a tree:%s"), arg);1178if(!has_dash_dash) {/* case (3).(d) -> (1) */1179/*1180 * Do not complain the most common case1181 * git checkout branch1182 * even if there happen to be a file called 'branch';1183 * it would be extremely annoying.1184 */1185if(argc)1186verify_non_filename(opts->prefix, arg);1187}else{1188 argcount++;1189 argv++;1190 argc--;1191}11921193return argcount;1194}11951196static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1197{1198int status;1199struct strbuf branch_ref = STRBUF_INIT;12001201if(!opts->new_branch)1202die(_("You are on a branch yet to be born"));1203strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1204 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1205strbuf_release(&branch_ref);1206if(!opts->quiet)1207fprintf(stderr,_("Switched to a new branch '%s'\n"),1208 opts->new_branch);1209return status;1210}12111212static intcheckout_branch(struct checkout_opts *opts,1213struct branch_info *new_branch_info)1214{1215if(opts->pathspec.nr)1216die(_("paths cannot be used with switching branches"));12171218if(opts->patch_mode)1219die(_("'%s' cannot be used with switching branches"),1220"--patch");12211222if(opts->writeout_stage)1223die(_("'%s' cannot be used with switching branches"),1224"--ours/--theirs");12251226if(opts->force && opts->merge)1227die(_("'%s' cannot be used with '%s'"),"-f","-m");12281229if(opts->force_detach && opts->new_branch)1230die(_("'%s' cannot be used with '%s'"),1231"--detach","-b/-B/--orphan");12321233if(opts->new_orphan_branch) {1234if(opts->track != BRANCH_TRACK_UNSPECIFIED)1235die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1236}else if(opts->force_detach) {1237if(opts->track != BRANCH_TRACK_UNSPECIFIED)1238die(_("'%s' cannot be used with '%s'"),"--detach","-t");1239}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1240 opts->track = git_branch_track;12411242if(new_branch_info->name && !new_branch_info->commit)1243die(_("Cannot switch branch to a non-commit '%s'"),1244 new_branch_info->name);12451246if(new_branch_info->path && !opts->force_detach && !opts->new_branch &&1247!opts->ignore_other_worktrees) {1248int flag;1249char*head_ref =resolve_refdup("HEAD",0, NULL, &flag);1250if(head_ref &&1251(!(flag & REF_ISSYMREF) ||strcmp(head_ref, new_branch_info->path)))1252die_if_checked_out(new_branch_info->path,1);1253free(head_ref);1254}12551256if(!new_branch_info->commit && opts->new_branch) {1257struct object_id rev;1258int flag;12591260if(!read_ref_full("HEAD",0, &rev, &flag) &&1261(flag & REF_ISSYMREF) &&is_null_oid(&rev))1262returnswitch_unborn_to_new_branch(opts);1263}1264returnswitch_branches(opts, new_branch_info);1265}12661267intcmd_checkout(int argc,const char**argv,const char*prefix)1268{1269struct checkout_opts opts;1270struct branch_info new_branch_info;1271char*conflict_style = NULL;1272int dwim_new_local_branch, no_dwim_new_local_branch =0;1273int dwim_remotes_matched =0;1274struct option options[] = {1275OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1276OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1277N_("create and checkout a new branch")),1278OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1279N_("create/reset and checkout a branch")),1280OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1281OPT_BOOL(0,"detach", &opts.force_detach,N_("detach HEAD at named commit")),1282OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1283 BRANCH_TRACK_EXPLICIT),1284OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1285OPT_SET_INT_F('2',"ours", &opts.writeout_stage,1286N_("checkout our version for unmerged files"),12872, PARSE_OPT_NONEG),1288OPT_SET_INT_F('3',"theirs", &opts.writeout_stage,1289N_("checkout their version for unmerged files"),12903, PARSE_OPT_NONEG),1291OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)"),1292 PARSE_OPT_NOCOMPLETE),1293OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1294OPT_BOOL_F(0,"overwrite-ignore", &opts.overwrite_ignore,1295N_("update ignored files (default)"),1296 PARSE_OPT_NOCOMPLETE),1297OPT_STRING(0,"conflict", &conflict_style,N_("style"),1298N_("conflict style (merge or diff3)")),1299OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1300OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1301N_("do not limit pathspecs to sparse entries only")),1302OPT_BOOL(0,"no-guess", &no_dwim_new_local_branch,1303N_("do not second guess 'git checkout <no-such-branch>'")),1304OPT_BOOL(0,"ignore-other-worktrees", &opts.ignore_other_worktrees,1305N_("do not check if another worktree is holding the given ref")),1306{ OPTION_CALLBACK,0,"recurse-submodules", NULL,1307"checkout","control recursive updating of submodules",1308 PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },1309OPT_BOOL(0,"progress", &opts.show_progress,N_("force progress reporting")),1310OPT_END(),1311};13121313memset(&opts,0,sizeof(opts));1314memset(&new_branch_info,0,sizeof(new_branch_info));1315 opts.overwrite_ignore =1;1316 opts.prefix = prefix;1317 opts.show_progress = -1;13181319git_config(git_checkout_config, &opts);13201321 opts.track = BRANCH_TRACK_UNSPECIFIED;13221323 argc =parse_options(argc, argv, prefix, options, checkout_usage,1324 PARSE_OPT_KEEP_DASHDASH);13251326 dwim_new_local_branch = !no_dwim_new_local_branch;1327if(opts.show_progress <0) {1328if(opts.quiet)1329 opts.show_progress =0;1330else1331 opts.show_progress =isatty(2);1332}13331334if(conflict_style) {1335 opts.merge =1;/* implied */1336git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1337}13381339if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1340die(_("-b, -B and --orphan are mutually exclusive"));13411342/*1343 * From here on, new_branch will contain the branch to be checked out,1344 * and new_branch_force and new_orphan_branch will tell us which one of1345 * -b/-B/--orphan is being used.1346 */1347if(opts.new_branch_force)1348 opts.new_branch = opts.new_branch_force;13491350if(opts.new_orphan_branch)1351 opts.new_branch = opts.new_orphan_branch;13521353/* --track without -b/-B/--orphan should DWIM */1354if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1355const char*argv0 = argv[0];1356if(!argc || !strcmp(argv0,"--"))1357die(_("--track needs a branch name"));1358skip_prefix(argv0,"refs/", &argv0);1359skip_prefix(argv0,"remotes/", &argv0);1360 argv0 =strchr(argv0,'/');1361if(!argv0 || !argv0[1])1362die(_("missing branch name; try -b"));1363 opts.new_branch = argv0 +1;1364}13651366/*1367 * Extract branch name from command line arguments, so1368 * all that is left is pathspecs.1369 *1370 * Handle1371 *1372 * 1) git checkout <tree> -- [<paths>]1373 * 2) git checkout -- [<paths>]1374 * 3) git checkout <something> [<paths>]1375 *1376 * including "last branch" syntax and DWIM-ery for names of1377 * remote branches, erroring out for invalid or ambiguous cases.1378 */1379if(argc) {1380struct object_id rev;1381int dwim_ok =1382!opts.patch_mode &&1383 dwim_new_local_branch &&1384 opts.track == BRANCH_TRACK_UNSPECIFIED &&1385!opts.new_branch;1386int n =parse_branchname_arg(argc, argv, dwim_ok,1387&new_branch_info, &opts, &rev,1388&dwim_remotes_matched);1389 argv += n;1390 argc -= n;1391}13921393if(argc) {1394parse_pathspec(&opts.pathspec,0,1395 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1396 prefix, argv);13971398if(!opts.pathspec.nr)1399die(_("invalid path specification"));14001401/*1402 * Try to give more helpful suggestion.1403 * new_branch && argc > 1 will be caught later.1404 */1405if(opts.new_branch && argc ==1)1406die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),1407 argv[0], opts.new_branch);14081409if(opts.force_detach)1410die(_("git checkout: --detach does not take a path argument '%s'"),1411 argv[0]);14121413if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1414die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1415"checking out of the index."));1416}14171418if(opts.new_branch) {1419struct strbuf buf = STRBUF_INIT;14201421if(opts.new_branch_force)1422 opts.branch_exists =validate_branchname(opts.new_branch, &buf);1423else1424 opts.branch_exists =1425validate_new_branchname(opts.new_branch, &buf,0);1426strbuf_release(&buf);1427}14281429UNLEAK(opts);1430if(opts.patch_mode || opts.pathspec.nr) {1431int ret =checkout_paths(&opts, new_branch_info.name);1432if(ret && dwim_remotes_matched >1&&1433 advice_checkout_ambiguous_remote_branch_name)1434advise(_("'%s' matched more than one remote tracking branch.\n"1435"We found%dremotes with a reference that matched. So we fell back\n"1436"on trying to resolve the argument as a path, but failed there too!\n"1437"\n"1438"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"1439"you can do so by fully qualifying the name with the --track option:\n"1440"\n"1441" git checkout --track origin/<name>\n"1442"\n"1443"If you'd like to always have checkouts of an ambiguous <name> prefer\n"1444"one remote, e.g. the 'origin' remote, consider setting\n"1445"checkout.defaultRemote=origin in your config."),1446 argv[0],1447 dwim_remotes_matched);1448return ret;1449}else{1450returncheckout_branch(&opts, &new_branch_info);1451}1452}