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