1#define USE_THE_INDEX_COMPATIBILITY_MACROS 2#include"builtin.h" 3#include"advice.h" 4#include"blob.h" 5#include"branch.h" 6#include"cache-tree.h" 7#include"checkout.h" 8#include"commit.h" 9#include"config.h" 10#include"diff.h" 11#include"dir.h" 12#include"ll-merge.h" 13#include"lockfile.h" 14#include"merge-recursive.h" 15#include"object-store.h" 16#include"parse-options.h" 17#include"refs.h" 18#include"remote.h" 19#include"resolve-undo.h" 20#include"revision.h" 21#include"run-command.h" 22#include"submodule.h" 23#include"submodule-config.h" 24#include"tree.h" 25#include"tree-walk.h" 26#include"unpack-trees.h" 27#include"xdiff-interface.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 37static const char*const switch_branch_usage[] = { 38N_("git switch [<options>] [<branch>]"), 39 NULL, 40}; 41 42struct checkout_opts { 43int patch_mode; 44int quiet; 45int merge; 46int force; 47int force_detach; 48int writeout_stage; 49int overwrite_ignore; 50int ignore_skipworktree; 51int ignore_other_worktrees; 52int show_progress; 53int count_checkout_paths; 54int overlay_mode; 55int no_dwim_new_local_branch; 56int discard_changes; 57int accept_pathspec; 58 59/* 60 * If new checkout options are added, skip_merge_working_tree 61 * should be updated accordingly. 62 */ 63 64const char*new_branch; 65const char*new_branch_force; 66const char*new_orphan_branch; 67int new_branch_log; 68enum branch_track track; 69struct diff_options diff_options; 70char*conflict_style; 71 72int branch_exists; 73const char*prefix; 74struct pathspec pathspec; 75struct tree *source_tree; 76}; 77 78static intpost_checkout_hook(struct commit *old_commit,struct commit *new_commit, 79int changed) 80{ 81returnrun_hook_le(NULL,"post-checkout", 82oid_to_hex(old_commit ? &old_commit->object.oid : &null_oid), 83oid_to_hex(new_commit ? &new_commit->object.oid : &null_oid), 84 changed ?"1":"0", NULL); 85/* "new_commit" can be NULL when checking out from the index before 86 a commit exists. */ 87 88} 89 90static intupdate_some(const struct object_id *oid,struct strbuf *base, 91const char*pathname,unsigned mode,int stage,void*context) 92{ 93int len; 94struct cache_entry *ce; 95int pos; 96 97if(S_ISDIR(mode)) 98return READ_TREE_RECURSIVE; 99 100 len = base->len +strlen(pathname); 101 ce =make_empty_cache_entry(&the_index, len); 102oidcpy(&ce->oid, oid); 103memcpy(ce->name, base->buf, base->len); 104memcpy(ce->name + base->len, pathname, len - base->len); 105 ce->ce_flags =create_ce_flags(0) | CE_UPDATE; 106 ce->ce_namelen = len; 107 ce->ce_mode =create_ce_mode(mode); 108 109/* 110 * If the entry is the same as the current index, we can leave the old 111 * entry in place. Whether it is UPTODATE or not, checkout_entry will 112 * do the right thing. 113 */ 114 pos =cache_name_pos(ce->name, ce->ce_namelen); 115if(pos >=0) { 116struct cache_entry *old = active_cache[pos]; 117if(ce->ce_mode == old->ce_mode && 118oideq(&ce->oid, &old->oid)) { 119 old->ce_flags |= CE_UPDATE; 120discard_cache_entry(ce); 121return0; 122} 123} 124 125add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); 126return0; 127} 128 129static intread_tree_some(struct tree *tree,const struct pathspec *pathspec) 130{ 131read_tree_recursive(the_repository, tree,"",0,0, 132 pathspec, update_some, NULL); 133 134/* update the index with the given tree's info 135 * for all args, expanding wildcards, and exit 136 * with any non-zero return code. 137 */ 138return0; 139} 140 141static intskip_same_name(const struct cache_entry *ce,int pos) 142{ 143while(++pos < active_nr && 144!strcmp(active_cache[pos]->name, ce->name)) 145;/* skip */ 146return pos; 147} 148 149static intcheck_stage(int stage,const struct cache_entry *ce,int pos, 150int overlay_mode) 151{ 152while(pos < active_nr && 153!strcmp(active_cache[pos]->name, ce->name)) { 154if(ce_stage(active_cache[pos]) == stage) 155return0; 156 pos++; 157} 158if(!overlay_mode) 159return0; 160if(stage ==2) 161returnerror(_("path '%s' does not have our version"), ce->name); 162else 163returnerror(_("path '%s' does not have their version"), ce->name); 164} 165 166static intcheck_stages(unsigned stages,const struct cache_entry *ce,int pos) 167{ 168unsigned seen =0; 169const char*name = ce->name; 170 171while(pos < active_nr) { 172 ce = active_cache[pos]; 173if(strcmp(name, ce->name)) 174break; 175 seen |= (1<<ce_stage(ce)); 176 pos++; 177} 178if((stages & seen) != stages) 179returnerror(_("path '%s' does not have all necessary versions"), 180 name); 181return0; 182} 183 184static intcheckout_stage(int stage,const struct cache_entry *ce,int pos, 185const struct checkout *state,int*nr_checkouts, 186int overlay_mode) 187{ 188while(pos < active_nr && 189!strcmp(active_cache[pos]->name, ce->name)) { 190if(ce_stage(active_cache[pos]) == stage) 191returncheckout_entry(active_cache[pos], state, 192 NULL, nr_checkouts); 193 pos++; 194} 195if(!overlay_mode) { 196unlink_entry(ce); 197return0; 198} 199if(stage ==2) 200returnerror(_("path '%s' does not have our version"), ce->name); 201else 202returnerror(_("path '%s' does not have their version"), ce->name); 203} 204 205static intcheckout_merged(int pos,const struct checkout *state,int*nr_checkouts) 206{ 207struct cache_entry *ce = active_cache[pos]; 208const char*path = ce->name; 209 mmfile_t ancestor, ours, theirs; 210int status; 211struct object_id oid; 212 mmbuffer_t result_buf; 213struct object_id threeway[3]; 214unsigned mode =0; 215 216memset(threeway,0,sizeof(threeway)); 217while(pos < active_nr) { 218int stage; 219 stage =ce_stage(ce); 220if(!stage ||strcmp(path, ce->name)) 221break; 222oidcpy(&threeway[stage -1], &ce->oid); 223if(stage ==2) 224 mode =create_ce_mode(ce->ce_mode); 225 pos++; 226 ce = active_cache[pos]; 227} 228if(is_null_oid(&threeway[1]) ||is_null_oid(&threeway[2])) 229returnerror(_("path '%s' does not have necessary versions"), path); 230 231read_mmblob(&ancestor, &threeway[0]); 232read_mmblob(&ours, &threeway[1]); 233read_mmblob(&theirs, &threeway[2]); 234 235/* 236 * NEEDSWORK: re-create conflicts from merges with 237 * merge.renormalize set, too 238 */ 239 status =ll_merge(&result_buf, path, &ancestor,"base", 240&ours,"ours", &theirs,"theirs", 241 state->istate, NULL); 242free(ancestor.ptr); 243free(ours.ptr); 244free(theirs.ptr); 245if(status <0|| !result_buf.ptr) { 246free(result_buf.ptr); 247returnerror(_("path '%s': cannot merge"), path); 248} 249 250/* 251 * NEEDSWORK: 252 * There is absolutely no reason to write this as a blob object 253 * and create a phony cache entry. This hack is primarily to get 254 * to the write_entry() machinery that massages the contents to 255 * work-tree format and writes out which only allows it for a 256 * cache entry. The code in write_entry() needs to be refactored 257 * to allow us to feed a <buffer, size, mode> instead of a cache 258 * entry. Such a refactoring would help merge_recursive as well 259 * (it also writes the merge result to the object database even 260 * when it may contain conflicts). 261 */ 262if(write_object_file(result_buf.ptr, result_buf.size, blob_type, &oid)) 263die(_("Unable to add merge result for '%s'"), path); 264free(result_buf.ptr); 265 ce =make_transient_cache_entry(mode, &oid, path,2); 266if(!ce) 267die(_("make_cache_entry failed for path '%s'"), path); 268 status =checkout_entry(ce, state, NULL, nr_checkouts); 269discard_cache_entry(ce); 270return status; 271} 272 273static voidmark_ce_for_checkout_overlay(struct cache_entry *ce, 274char*ps_matched, 275const struct checkout_opts *opts) 276{ 277 ce->ce_flags &= ~CE_MATCHED; 278if(!opts->ignore_skipworktree &&ce_skip_worktree(ce)) 279return; 280if(opts->source_tree && !(ce->ce_flags & CE_UPDATE)) 281/* 282 * "git checkout tree-ish -- path", but this entry 283 * is in the original index but is not in tree-ish 284 * or does not match the pathspec; it will not be 285 * checked out to the working tree. We will not do 286 * anything to this entry at all. 287 */ 288return; 289/* 290 * Either this entry came from the tree-ish we are 291 * checking the paths out of, or we are checking out 292 * of the index. 293 * 294 * If it comes from the tree-ish, we already know it 295 * matches the pathspec and could just stamp 296 * CE_MATCHED to it from update_some(). But we still 297 * need ps_matched and read_tree_recursive (and 298 * eventually tree_entry_interesting) cannot fill 299 * ps_matched yet. Once it can, we can avoid calling 300 * match_pathspec() for _all_ entries when 301 * opts->source_tree != NULL. 302 */ 303if(ce_path_match(&the_index, ce, &opts->pathspec, ps_matched)) 304 ce->ce_flags |= CE_MATCHED; 305} 306 307static voidmark_ce_for_checkout_no_overlay(struct cache_entry *ce, 308char*ps_matched, 309const struct checkout_opts *opts) 310{ 311 ce->ce_flags &= ~CE_MATCHED; 312if(!opts->ignore_skipworktree &&ce_skip_worktree(ce)) 313return; 314if(ce_path_match(&the_index, ce, &opts->pathspec, ps_matched)) { 315 ce->ce_flags |= CE_MATCHED; 316if(opts->source_tree && !(ce->ce_flags & CE_UPDATE)) 317/* 318 * In overlay mode, but the path is not in 319 * tree-ish, which means we should remove it 320 * from the index and the working tree. 321 */ 322 ce->ce_flags |= CE_REMOVE | CE_WT_REMOVE; 323} 324} 325 326static intcheckout_paths(const struct checkout_opts *opts, 327const char*revision) 328{ 329int pos; 330struct checkout state = CHECKOUT_INIT; 331static char*ps_matched; 332struct object_id rev; 333struct commit *head; 334int errs =0; 335struct lock_file lock_file = LOCK_INIT; 336int nr_checkouts =0, nr_unmerged =0; 337 338trace2_cmd_mode(opts->patch_mode ?"patch":"path"); 339 340if(opts->track != BRANCH_TRACK_UNSPECIFIED) 341die(_("'%s' cannot be used with updating paths"),"--track"); 342 343if(opts->new_branch_log) 344die(_("'%s' cannot be used with updating paths"),"-l"); 345 346if(opts->force && opts->patch_mode) 347die(_("'%s' cannot be used with updating paths"),"-f"); 348 349if(opts->force_detach) 350die(_("'%s' cannot be used with updating paths"),"--detach"); 351 352if(opts->merge && opts->patch_mode) 353die(_("'%s' cannot be used with%s"),"--merge","--patch"); 354 355if(opts->force && opts->merge) 356die(_("'%s' cannot be used with%s"),"-f","-m"); 357 358if(opts->new_branch) 359die(_("Cannot update paths and switch to branch '%s' at the same time."), 360 opts->new_branch); 361 362if(opts->patch_mode) 363returnrun_add_interactive(revision,"--patch=checkout", 364&opts->pathspec); 365 366repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR); 367if(read_cache_preload(&opts->pathspec) <0) 368returnerror(_("index file corrupt")); 369 370if(opts->source_tree) 371read_tree_some(opts->source_tree, &opts->pathspec); 372 373 ps_matched =xcalloc(opts->pathspec.nr,1); 374 375/* 376 * Make sure all pathspecs participated in locating the paths 377 * to be checked out. 378 */ 379for(pos =0; pos < active_nr; pos++) 380if(opts->overlay_mode) 381mark_ce_for_checkout_overlay(active_cache[pos], 382 ps_matched, 383 opts); 384else 385mark_ce_for_checkout_no_overlay(active_cache[pos], 386 ps_matched, 387 opts); 388 389if(report_path_error(ps_matched, &opts->pathspec, opts->prefix)) { 390free(ps_matched); 391return1; 392} 393free(ps_matched); 394 395/* "checkout -m path" to recreate conflicted state */ 396if(opts->merge) 397unmerge_marked_index(&the_index); 398 399/* Any unmerged paths? */ 400for(pos =0; pos < active_nr; pos++) { 401const struct cache_entry *ce = active_cache[pos]; 402if(ce->ce_flags & CE_MATCHED) { 403if(!ce_stage(ce)) 404continue; 405if(opts->force) { 406warning(_("path '%s' is unmerged"), ce->name); 407}else if(opts->writeout_stage) { 408 errs |=check_stage(opts->writeout_stage, ce, pos, opts->overlay_mode); 409}else if(opts->merge) { 410 errs |=check_stages((1<<2) | (1<<3), ce, pos); 411}else{ 412 errs =1; 413error(_("path '%s' is unmerged"), ce->name); 414} 415 pos =skip_same_name(ce, pos) -1; 416} 417} 418if(errs) 419return1; 420 421/* Now we are committed to check them out */ 422 state.force =1; 423 state.refresh_cache =1; 424 state.istate = &the_index; 425 426enable_delayed_checkout(&state); 427for(pos =0; pos < active_nr; pos++) { 428struct cache_entry *ce = active_cache[pos]; 429if(ce->ce_flags & CE_MATCHED) { 430if(!ce_stage(ce)) { 431 errs |=checkout_entry(ce, &state, 432 NULL, &nr_checkouts); 433continue; 434} 435if(opts->writeout_stage) 436 errs |=checkout_stage(opts->writeout_stage, 437 ce, pos, 438&state, 439&nr_checkouts, opts->overlay_mode); 440else if(opts->merge) 441 errs |=checkout_merged(pos, &state, 442&nr_unmerged); 443 pos =skip_same_name(ce, pos) -1; 444} 445} 446remove_marked_cache_entries(&the_index,1); 447remove_scheduled_dirs(); 448 errs |=finish_delayed_checkout(&state, &nr_checkouts); 449 450if(opts->count_checkout_paths) { 451if(nr_unmerged) 452fprintf_ln(stderr,Q_("Recreated%dmerge conflict", 453"Recreated%dmerge conflicts", 454 nr_unmerged), 455 nr_unmerged); 456if(opts->source_tree) 457fprintf_ln(stderr,Q_("Updated%dpath from%s", 458"Updated%dpaths from%s", 459 nr_checkouts), 460 nr_checkouts, 461find_unique_abbrev(&opts->source_tree->object.oid, 462 DEFAULT_ABBREV)); 463else if(!nr_unmerged || nr_checkouts) 464fprintf_ln(stderr,Q_("Updated%dpath from the index", 465"Updated%dpaths from the index", 466 nr_checkouts), 467 nr_checkouts); 468} 469 470if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) 471die(_("unable to write new index file")); 472 473read_ref_full("HEAD",0, &rev, NULL); 474 head =lookup_commit_reference_gently(the_repository, &rev,1); 475 476 errs |=post_checkout_hook(head, head,0); 477return errs; 478} 479 480static voidshow_local_changes(struct object *head, 481const struct diff_options *opts) 482{ 483struct rev_info rev; 484/* I think we want full paths, even if we're in a subdirectory. */ 485repo_init_revisions(the_repository, &rev, NULL); 486 rev.diffopt.flags = opts->flags; 487 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; 488diff_setup_done(&rev.diffopt); 489add_pending_object(&rev, head, NULL); 490run_diff_index(&rev,0); 491} 492 493static voiddescribe_detached_head(const char*msg,struct commit *commit) 494{ 495struct strbuf sb = STRBUF_INIT; 496 497if(!parse_commit(commit)) 498pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 499if(print_sha1_ellipsis()) { 500fprintf(stderr,"%s %s...%s\n", msg, 501find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV), sb.buf); 502}else{ 503fprintf(stderr,"%s %s %s\n", msg, 504find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV), sb.buf); 505} 506strbuf_release(&sb); 507} 508 509static intreset_tree(struct tree *tree,const struct checkout_opts *o, 510int worktree,int*writeout_error) 511{ 512struct unpack_trees_options opts; 513struct tree_desc tree_desc; 514 515memset(&opts,0,sizeof(opts)); 516 opts.head_idx = -1; 517 opts.update = worktree; 518 opts.skip_unmerged = !worktree; 519 opts.reset =1; 520 opts.merge =1; 521 opts.fn = oneway_merge; 522 opts.verbose_update = o->show_progress; 523 opts.src_index = &the_index; 524 opts.dst_index = &the_index; 525parse_tree(tree); 526init_tree_desc(&tree_desc, tree->buffer, tree->size); 527switch(unpack_trees(1, &tree_desc, &opts)) { 528case-2: 529*writeout_error =1; 530/* 531 * We return 0 nevertheless, as the index is all right 532 * and more importantly we have made best efforts to 533 * update paths in the work tree, and we cannot revert 534 * them. 535 */ 536/* fallthrough */ 537case0: 538return0; 539default: 540return128; 541} 542} 543 544struct branch_info { 545const char*name;/* The short name used */ 546const char*path;/* The full name of a real branch */ 547struct commit *commit;/* The named commit */ 548/* 549 * if not null the branch is detached because it's already 550 * checked out in this checkout 551 */ 552char*checkout; 553}; 554 555static voidsetup_branch_path(struct branch_info *branch) 556{ 557struct strbuf buf = STRBUF_INIT; 558 559strbuf_branchname(&buf, branch->name, INTERPRET_BRANCH_LOCAL); 560if(strcmp(buf.buf, branch->name)) 561 branch->name =xstrdup(buf.buf); 562strbuf_splice(&buf,0,0,"refs/heads/",11); 563 branch->path =strbuf_detach(&buf, NULL); 564} 565 566/* 567 * Skip merging the trees, updating the index and working directory if and 568 * only if we are creating a new branch via "git checkout -b <new_branch>." 569 */ 570static intskip_merge_working_tree(const struct checkout_opts *opts, 571const struct branch_info *old_branch_info, 572const struct branch_info *new_branch_info) 573{ 574/* 575 * Do the merge if sparse checkout is on and the user has not opted in 576 * to the optimized behavior 577 */ 578if(core_apply_sparse_checkout && !checkout_optimize_new_branch) 579return0; 580 581/* 582 * We must do the merge if we are actually moving to a new commit. 583 */ 584if(!old_branch_info->commit || !new_branch_info->commit || 585!oideq(&old_branch_info->commit->object.oid, 586&new_branch_info->commit->object.oid)) 587return0; 588 589/* 590 * opts->patch_mode cannot be used with switching branches so is 591 * not tested here 592 */ 593 594/* 595 * opts->quiet only impacts output so doesn't require a merge 596 */ 597 598/* 599 * Honor the explicit request for a three-way merge or to throw away 600 * local changes 601 */ 602if(opts->merge || opts->force) 603return0; 604 605/* 606 * --detach is documented as "updating the index and the files in the 607 * working tree" but this optimization skips those steps so fall through 608 * to the regular code path. 609 */ 610if(opts->force_detach) 611return0; 612 613/* 614 * opts->writeout_stage cannot be used with switching branches so is 615 * not tested here 616 */ 617 618/* 619 * Honor the explicit ignore requests 620 */ 621if(!opts->overwrite_ignore || opts->ignore_skipworktree || 622 opts->ignore_other_worktrees) 623return0; 624 625/* 626 * opts->show_progress only impacts output so doesn't require a merge 627 */ 628 629/* 630 * opts->overlay_mode cannot be used with switching branches so is 631 * not tested here 632 */ 633 634/* 635 * If we aren't creating a new branch any changes or updates will 636 * happen in the existing branch. Since that could only be updating 637 * the index and working directory, we don't want to skip those steps 638 * or we've defeated any purpose in running the command. 639 */ 640if(!opts->new_branch) 641return0; 642 643/* 644 * new_branch_force is defined to "create/reset and checkout a branch" 645 * so needs to go through the merge to do the reset 646 */ 647if(opts->new_branch_force) 648return0; 649 650/* 651 * A new orphaned branch requrires the index and the working tree to be 652 * adjusted to <start_point> 653 */ 654if(opts->new_orphan_branch) 655return0; 656 657/* 658 * Remaining variables are not checkout options but used to track state 659 */ 660 661/* 662 * Do the merge if this is the initial checkout. We cannot use 663 * is_cache_unborn() here because the index hasn't been loaded yet 664 * so cache_nr and timestamp.sec are always zero. 665 */ 666if(!file_exists(get_index_file())) 667return0; 668 669return1; 670} 671 672static intmerge_working_tree(const struct checkout_opts *opts, 673struct branch_info *old_branch_info, 674struct branch_info *new_branch_info, 675int*writeout_error) 676{ 677int ret; 678struct lock_file lock_file = LOCK_INIT; 679 680hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); 681if(read_cache_preload(NULL) <0) 682returnerror(_("index file corrupt")); 683 684resolve_undo_clear(); 685if(opts->discard_changes) { 686 ret =reset_tree(get_commit_tree(new_branch_info->commit), 687 opts,1, writeout_error); 688if(ret) 689return ret; 690}else{ 691struct tree_desc trees[2]; 692struct tree *tree; 693struct unpack_trees_options topts; 694 695memset(&topts,0,sizeof(topts)); 696 topts.head_idx = -1; 697 topts.src_index = &the_index; 698 topts.dst_index = &the_index; 699 700setup_unpack_trees_porcelain(&topts,"checkout"); 701 702refresh_cache(REFRESH_QUIET); 703 704if(unmerged_cache()) { 705error(_("you need to resolve your current index first")); 706return1; 707} 708 709/* 2-way merge to the new branch */ 710 topts.initial_checkout =is_cache_unborn(); 711 topts.update =1; 712 topts.merge =1; 713 topts.gently = opts->merge && old_branch_info->commit; 714 topts.verbose_update = opts->show_progress; 715 topts.fn = twoway_merge; 716if(opts->overwrite_ignore) { 717 topts.dir =xcalloc(1,sizeof(*topts.dir)); 718 topts.dir->flags |= DIR_SHOW_IGNORED; 719setup_standard_excludes(topts.dir); 720} 721 tree =parse_tree_indirect(old_branch_info->commit ? 722&old_branch_info->commit->object.oid : 723 the_hash_algo->empty_tree); 724init_tree_desc(&trees[0], tree->buffer, tree->size); 725 tree =parse_tree_indirect(&new_branch_info->commit->object.oid); 726init_tree_desc(&trees[1], tree->buffer, tree->size); 727 728 ret =unpack_trees(2, trees, &topts); 729clear_unpack_trees_porcelain(&topts); 730if(ret == -1) { 731/* 732 * Unpack couldn't do a trivial merge; either 733 * give up or do a real merge, depending on 734 * whether the merge flag was used. 735 */ 736struct tree *result; 737struct tree *work; 738struct merge_options o; 739if(!opts->merge) 740return1; 741 742/* 743 * Without old_branch_info->commit, the below is the same as 744 * the two-tree unpack we already tried and failed. 745 */ 746if(!old_branch_info->commit) 747return1; 748 749/* Do more real merge */ 750 751/* 752 * We update the index fully, then write the 753 * tree from the index, then merge the new 754 * branch with the current tree, with the old 755 * branch as the base. Then we reset the index 756 * (but not the working tree) to the new 757 * branch, leaving the working tree as the 758 * merged version, but skipping unmerged 759 * entries in the index. 760 */ 761 762add_files_to_cache(NULL, NULL,0); 763/* 764 * NEEDSWORK: carrying over local changes 765 * when branches have different end-of-line 766 * normalization (or clean+smudge rules) is 767 * a pain; plumb in an option to set 768 * o.renormalize? 769 */ 770init_merge_options(&o, the_repository); 771 o.verbosity =0; 772 work =write_tree_from_memory(&o); 773 774 ret =reset_tree(get_commit_tree(new_branch_info->commit), 775 opts,1, 776 writeout_error); 777if(ret) 778return ret; 779 o.ancestor = old_branch_info->name; 780 o.branch1 = new_branch_info->name; 781 o.branch2 ="local"; 782 ret =merge_trees(&o, 783get_commit_tree(new_branch_info->commit), 784 work, 785get_commit_tree(old_branch_info->commit), 786&result); 787if(ret <0) 788exit(128); 789 ret =reset_tree(get_commit_tree(new_branch_info->commit), 790 opts,0, 791 writeout_error); 792strbuf_release(&o.obuf); 793if(ret) 794return ret; 795} 796} 797 798if(!active_cache_tree) 799 active_cache_tree =cache_tree(); 800 801if(!cache_tree_fully_valid(active_cache_tree)) 802cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); 803 804if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) 805die(_("unable to write new index file")); 806 807if(!opts->discard_changes && !opts->quiet) 808show_local_changes(&new_branch_info->commit->object, &opts->diff_options); 809 810return0; 811} 812 813static voidreport_tracking(struct branch_info *new_branch_info) 814{ 815struct strbuf sb = STRBUF_INIT; 816struct branch *branch =branch_get(new_branch_info->name); 817 818if(!format_tracking_info(branch, &sb, AHEAD_BEHIND_FULL)) 819return; 820fputs(sb.buf, stdout); 821strbuf_release(&sb); 822} 823 824static voidupdate_refs_for_switch(const struct checkout_opts *opts, 825struct branch_info *old_branch_info, 826struct branch_info *new_branch_info) 827{ 828struct strbuf msg = STRBUF_INIT; 829const char*old_desc, *reflog_msg; 830if(opts->new_branch) { 831if(opts->new_orphan_branch) { 832char*refname; 833 834 refname =mkpathdup("refs/heads/%s", opts->new_orphan_branch); 835if(opts->new_branch_log && 836!should_autocreate_reflog(refname)) { 837int ret; 838struct strbuf err = STRBUF_INIT; 839 840 ret =safe_create_reflog(refname,1, &err); 841if(ret) { 842fprintf(stderr,_("Can not do reflog for '%s':%s\n"), 843 opts->new_orphan_branch, err.buf); 844strbuf_release(&err); 845free(refname); 846return; 847} 848strbuf_release(&err); 849} 850free(refname); 851} 852else 853create_branch(the_repository, 854 opts->new_branch, new_branch_info->name, 855 opts->new_branch_force ?1:0, 856 opts->new_branch_force ?1:0, 857 opts->new_branch_log, 858 opts->quiet, 859 opts->track); 860 new_branch_info->name = opts->new_branch; 861setup_branch_path(new_branch_info); 862} 863 864 old_desc = old_branch_info->name; 865if(!old_desc && old_branch_info->commit) 866 old_desc =oid_to_hex(&old_branch_info->commit->object.oid); 867 868 reflog_msg =getenv("GIT_REFLOG_ACTION"); 869if(!reflog_msg) 870strbuf_addf(&msg,"checkout: moving from%sto%s", 871 old_desc ? old_desc :"(invalid)", new_branch_info->name); 872else 873strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 874 875if(!strcmp(new_branch_info->name,"HEAD") && !new_branch_info->path && !opts->force_detach) { 876/* Nothing to do. */ 877}else if(opts->force_detach || !new_branch_info->path) {/* No longer on any branch. */ 878update_ref(msg.buf,"HEAD", &new_branch_info->commit->object.oid, NULL, 879 REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR); 880if(!opts->quiet) { 881if(old_branch_info->path && 882 advice_detached_head && !opts->force_detach) 883detach_advice(new_branch_info->name); 884describe_detached_head(_("HEAD is now at"), new_branch_info->commit); 885} 886}else if(new_branch_info->path) {/* Switch branches. */ 887if(create_symref("HEAD", new_branch_info->path, msg.buf) <0) 888die(_("unable to update HEAD")); 889if(!opts->quiet) { 890if(old_branch_info->path && !strcmp(new_branch_info->path, old_branch_info->path)) { 891if(opts->new_branch_force) 892fprintf(stderr,_("Reset branch '%s'\n"), 893 new_branch_info->name); 894else 895fprintf(stderr,_("Already on '%s'\n"), 896 new_branch_info->name); 897}else if(opts->new_branch) { 898if(opts->branch_exists) 899fprintf(stderr,_("Switched to and reset branch '%s'\n"), new_branch_info->name); 900else 901fprintf(stderr,_("Switched to a new branch '%s'\n"), new_branch_info->name); 902}else{ 903fprintf(stderr,_("Switched to branch '%s'\n"), 904 new_branch_info->name); 905} 906} 907if(old_branch_info->path && old_branch_info->name) { 908if(!ref_exists(old_branch_info->path) &&reflog_exists(old_branch_info->path)) 909delete_reflog(old_branch_info->path); 910} 911} 912remove_branch_state(the_repository, !opts->quiet); 913strbuf_release(&msg); 914if(!opts->quiet && 915(new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name,"HEAD")))) 916report_tracking(new_branch_info); 917} 918 919static intadd_pending_uninteresting_ref(const char*refname, 920const struct object_id *oid, 921int flags,void*cb_data) 922{ 923add_pending_oid(cb_data, refname, oid, UNINTERESTING); 924return0; 925} 926 927static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 928{ 929strbuf_addstr(sb," "); 930strbuf_add_unique_abbrev(sb, &commit->object.oid, DEFAULT_ABBREV); 931strbuf_addch(sb,' '); 932if(!parse_commit(commit)) 933pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 934strbuf_addch(sb,'\n'); 935} 936 937#define ORPHAN_CUTOFF 4 938static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 939{ 940struct commit *c, *last = NULL; 941struct strbuf sb = STRBUF_INIT; 942int lost =0; 943while((c =get_revision(revs)) != NULL) { 944if(lost < ORPHAN_CUTOFF) 945describe_one_orphan(&sb, c); 946 last = c; 947 lost++; 948} 949if(ORPHAN_CUTOFF < lost) { 950int more = lost - ORPHAN_CUTOFF; 951if(more ==1) 952describe_one_orphan(&sb, last); 953else 954strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 955} 956 957fprintf(stderr, 958Q_( 959/* The singular version */ 960"Warning: you are leaving%dcommit behind, " 961"not connected to\n" 962"any of your branches:\n\n" 963"%s\n", 964/* The plural version */ 965"Warning: you are leaving%dcommits behind, " 966"not connected to\n" 967"any of your branches:\n\n" 968"%s\n", 969/* Give ngettext() the count */ 970 lost), 971 lost, 972 sb.buf); 973strbuf_release(&sb); 974 975if(advice_detached_head) 976fprintf(stderr, 977Q_( 978/* The singular version */ 979"If you want to keep it by creating a new branch, " 980"this may be a good time\nto do so with:\n\n" 981" git branch <new-branch-name>%s\n\n", 982/* The plural version */ 983"If you want to keep them by creating a new branch, " 984"this may be a good time\nto do so with:\n\n" 985" git branch <new-branch-name>%s\n\n", 986/* Give ngettext() the count */ 987 lost), 988find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV)); 989} 990 991/* 992 * We are about to leave commit that was at the tip of a detached 993 * HEAD. If it is not reachable from any ref, this is the last chance 994 * for the user to do so without resorting to reflog. 995 */ 996static voidorphaned_commit_warning(struct commit *old_commit,struct commit *new_commit) 997{ 998struct rev_info revs; 999struct object *object = &old_commit->object;10001001repo_init_revisions(the_repository, &revs, NULL);1002setup_revisions(0, NULL, &revs, NULL);10031004 object->flags &= ~UNINTERESTING;1005add_pending_object(&revs, object,oid_to_hex(&object->oid));10061007for_each_ref(add_pending_uninteresting_ref, &revs);1008add_pending_oid(&revs,"HEAD", &new_commit->object.oid, UNINTERESTING);10091010if(prepare_revision_walk(&revs))1011die(_("internal error in revision walk"));1012if(!(old_commit->object.flags & UNINTERESTING))1013suggest_reattach(old_commit, &revs);1014else1015describe_detached_head(_("Previous HEAD position was"), old_commit);10161017/* Clean up objects used, as they will be reused. */1018clear_commit_marks_all(ALL_REV_FLAGS);1019}10201021static intswitch_branches(const struct checkout_opts *opts,1022struct branch_info *new_branch_info)1023{1024int ret =0;1025struct branch_info old_branch_info;1026void*path_to_free;1027struct object_id rev;1028int flag, writeout_error =0;10291030trace2_cmd_mode("branch");10311032memset(&old_branch_info,0,sizeof(old_branch_info));1033 old_branch_info.path = path_to_free =resolve_refdup("HEAD",0, &rev, &flag);1034if(old_branch_info.path)1035 old_branch_info.commit =lookup_commit_reference_gently(the_repository, &rev,1);1036if(!(flag & REF_ISSYMREF))1037 old_branch_info.path = NULL;10381039if(old_branch_info.path)1040skip_prefix(old_branch_info.path,"refs/heads/", &old_branch_info.name);10411042if(!new_branch_info->name) {1043 new_branch_info->name ="HEAD";1044 new_branch_info->commit = old_branch_info.commit;1045if(!new_branch_info->commit)1046die(_("You are on a branch yet to be born"));1047parse_commit_or_die(new_branch_info->commit);1048}10491050/* optimize the "checkout -b <new_branch> path */1051if(skip_merge_working_tree(opts, &old_branch_info, new_branch_info)) {1052if(!checkout_optimize_new_branch && !opts->quiet) {1053if(read_cache_preload(NULL) <0)1054returnerror(_("index file corrupt"));1055show_local_changes(&new_branch_info->commit->object, &opts->diff_options);1056}1057}else{1058 ret =merge_working_tree(opts, &old_branch_info, new_branch_info, &writeout_error);1059if(ret) {1060free(path_to_free);1061return ret;1062}1063}10641065if(!opts->quiet && !old_branch_info.path && old_branch_info.commit && new_branch_info->commit != old_branch_info.commit)1066orphaned_commit_warning(old_branch_info.commit, new_branch_info->commit);10671068update_refs_for_switch(opts, &old_branch_info, new_branch_info);10691070 ret =post_checkout_hook(old_branch_info.commit, new_branch_info->commit,1);1071free(path_to_free);1072return ret || writeout_error;1073}10741075static intgit_checkout_config(const char*var,const char*value,void*cb)1076{1077if(!strcmp(var,"checkout.optimizenewbranch")) {1078 checkout_optimize_new_branch =git_config_bool(var, value);1079return0;1080}10811082if(!strcmp(var,"diff.ignoresubmodules")) {1083struct checkout_opts *opts = cb;1084handle_ignore_submodules_arg(&opts->diff_options, value);1085return0;1086}10871088if(starts_with(var,"submodule."))1089returngit_default_submodule_config(var, value, NULL);10901091returngit_xmerge_config(var, value, NULL);1092}10931094static voidsetup_new_branch_info_and_source_tree(1095struct branch_info *new_branch_info,1096struct checkout_opts *opts,1097struct object_id *rev,1098const char*arg)1099{1100struct tree **source_tree = &opts->source_tree;1101struct object_id branch_rev;11021103 new_branch_info->name = arg;1104setup_branch_path(new_branch_info);11051106if(!check_refname_format(new_branch_info->path,0) &&1107!read_ref(new_branch_info->path, &branch_rev))1108oidcpy(rev, &branch_rev);1109else1110 new_branch_info->path = NULL;/* not an existing branch */11111112 new_branch_info->commit =lookup_commit_reference_gently(the_repository, rev,1);1113if(!new_branch_info->commit) {1114/* not a commit */1115*source_tree =parse_tree_indirect(rev);1116}else{1117parse_commit_or_die(new_branch_info->commit);1118*source_tree =get_commit_tree(new_branch_info->commit);1119}1120}11211122static intparse_branchname_arg(int argc,const char**argv,1123int dwim_new_local_branch_ok,1124struct branch_info *new_branch_info,1125struct checkout_opts *opts,1126struct object_id *rev,1127int*dwim_remotes_matched)1128{1129const char**new_branch = &opts->new_branch;1130int argcount =0;1131const char*arg;1132int dash_dash_pos;1133int has_dash_dash =0;1134int i;11351136/*1137 * case 1: git checkout <ref> -- [<paths>]1138 *1139 * <ref> must be a valid tree, everything after the '--' must be1140 * a path.1141 *1142 * case 2: git checkout -- [<paths>]1143 *1144 * everything after the '--' must be paths.1145 *1146 * case 3: git checkout <something> [--]1147 *1148 * (a) If <something> is a commit, that is to1149 * switch to the branch or detach HEAD at it. As a special case,1150 * if <something> is A...B (missing A or B means HEAD but you can1151 * omit at most one side), and if there is a unique merge base1152 * between A and B, A...B names that merge base.1153 *1154 * (b) If <something> is _not_ a commit, either "--" is present1155 * or <something> is not a path, no -t or -b was given, and1156 * and there is a tracking branch whose name is <something>1157 * in one and only one remote (or if the branch exists on the1158 * remote named in checkout.defaultRemote), then this is a1159 * short-hand to fork local <something> from that1160 * remote-tracking branch.1161 *1162 * (c) Otherwise, if "--" is present, treat it like case (1).1163 *1164 * (d) Otherwise :1165 * - if it's a reference, treat it like case (1)1166 * - else if it's a path, treat it like case (2)1167 * - else: fail.1168 *1169 * case 4: git checkout <something> <paths>1170 *1171 * The first argument must not be ambiguous.1172 * - If it's *only* a reference, treat it like case (1).1173 * - If it's only a path, treat it like case (2).1174 * - else: fail.1175 *1176 */1177if(!argc)1178return0;11791180if(!opts->accept_pathspec) {1181if(argc >1)1182die(_("only one reference expected"));1183 has_dash_dash =1;/* helps disambiguate */1184}11851186 arg = argv[0];1187 dash_dash_pos = -1;1188for(i =0; i < argc; i++) {1189if(opts->accept_pathspec && !strcmp(argv[i],"--")) {1190 dash_dash_pos = i;1191break;1192}1193}1194if(dash_dash_pos ==0)1195return1;/* case (2) */1196else if(dash_dash_pos ==1)1197 has_dash_dash =1;/* case (3) or (1) */1198else if(dash_dash_pos >=2)1199die(_("only one reference expected,%dgiven."), dash_dash_pos);1200 opts->count_checkout_paths = !opts->quiet && !has_dash_dash;12011202if(!strcmp(arg,"-"))1203 arg ="@{-1}";12041205if(get_oid_mb(arg, rev)) {1206/*1207 * Either case (3) or (4), with <something> not being1208 * a commit, or an attempt to use case (1) with an1209 * invalid ref.1210 *1211 * It's likely an error, but we need to find out if1212 * we should auto-create the branch, case (3).(b).1213 */1214int recover_with_dwim = dwim_new_local_branch_ok;12151216int could_be_checkout_paths = !has_dash_dash &&1217check_filename(opts->prefix, arg);12181219if(!has_dash_dash && !no_wildcard(arg))1220 recover_with_dwim =0;12211222/*1223 * Accept "git checkout foo", "git checkout foo --"1224 * and "git switch foo" as candidates for dwim.1225 */1226if(!(argc ==1&& !has_dash_dash) &&1227!(argc ==2&& has_dash_dash) &&1228 opts->accept_pathspec)1229 recover_with_dwim =0;12301231if(recover_with_dwim) {1232const char*remote =unique_tracking_name(arg, rev,1233 dwim_remotes_matched);1234if(remote) {1235if(could_be_checkout_paths)1236die(_("'%s' could be both a local file and a tracking branch.\n"1237"Please use -- (and optionally --no-guess) to disambiguate"),1238 arg);1239*new_branch = arg;1240 arg = remote;1241/* DWIMmed to create local branch, case (3).(b) */1242}else{1243 recover_with_dwim =0;1244}1245}12461247if(!recover_with_dwim) {1248if(has_dash_dash)1249die(_("invalid reference:%s"), arg);1250return argcount;1251}1252}12531254/* we can't end up being in (2) anymore, eat the argument */1255 argcount++;1256 argv++;1257 argc--;12581259setup_new_branch_info_and_source_tree(new_branch_info, opts, rev, arg);12601261if(!opts->source_tree)/* case (1): want a tree */1262die(_("reference is not a tree:%s"), arg);12631264if(!has_dash_dash) {/* case (3).(d) -> (1) */1265/*1266 * Do not complain the most common case1267 * git checkout branch1268 * even if there happen to be a file called 'branch';1269 * it would be extremely annoying.1270 */1271if(argc)1272verify_non_filename(opts->prefix, arg);1273}else if(opts->accept_pathspec) {1274 argcount++;1275 argv++;1276 argc--;1277}12781279return argcount;1280}12811282static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1283{1284int status;1285struct strbuf branch_ref = STRBUF_INIT;12861287trace2_cmd_mode("unborn");12881289if(!opts->new_branch)1290die(_("You are on a branch yet to be born"));1291strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1292 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1293strbuf_release(&branch_ref);1294if(!opts->quiet)1295fprintf(stderr,_("Switched to a new branch '%s'\n"),1296 opts->new_branch);1297return status;1298}12991300static intcheckout_branch(struct checkout_opts *opts,1301struct branch_info *new_branch_info)1302{1303if(opts->pathspec.nr)1304die(_("paths cannot be used with switching branches"));13051306if(opts->patch_mode)1307die(_("'%s' cannot be used with switching branches"),1308"--patch");13091310if(!opts->overlay_mode)1311die(_("'%s' cannot be used with switching branches"),1312"--no-overlay");13131314if(opts->writeout_stage)1315die(_("'%s' cannot be used with switching branches"),1316"--ours/--theirs");13171318if(opts->force && opts->merge)1319die(_("'%s' cannot be used with '%s'"),"-f","-m");13201321if(opts->discard_changes && opts->merge)1322die(_("'%s' cannot be used with '%s'"),"--discard-changes","--merge");13231324if(opts->force_detach && opts->new_branch)1325die(_("'%s' cannot be used with '%s'"),1326"--detach","-b/-B/--orphan");13271328if(opts->new_orphan_branch) {1329if(opts->track != BRANCH_TRACK_UNSPECIFIED)1330die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1331}else if(opts->force_detach) {1332if(opts->track != BRANCH_TRACK_UNSPECIFIED)1333die(_("'%s' cannot be used with '%s'"),"--detach","-t");1334}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1335 opts->track = git_branch_track;13361337if(new_branch_info->name && !new_branch_info->commit)1338die(_("Cannot switch branch to a non-commit '%s'"),1339 new_branch_info->name);13401341if(new_branch_info->path && !opts->force_detach && !opts->new_branch &&1342!opts->ignore_other_worktrees) {1343int flag;1344char*head_ref =resolve_refdup("HEAD",0, NULL, &flag);1345if(head_ref &&1346(!(flag & REF_ISSYMREF) ||strcmp(head_ref, new_branch_info->path)))1347die_if_checked_out(new_branch_info->path,1);1348free(head_ref);1349}13501351if(!new_branch_info->commit && opts->new_branch) {1352struct object_id rev;1353int flag;13541355if(!read_ref_full("HEAD",0, &rev, &flag) &&1356(flag & REF_ISSYMREF) &&is_null_oid(&rev))1357returnswitch_unborn_to_new_branch(opts);1358}1359returnswitch_branches(opts, new_branch_info);1360}13611362static struct option *add_common_options(struct checkout_opts *opts,1363struct option *prevopts)1364{1365struct option options[] = {1366OPT__QUIET(&opts->quiet,N_("suppress progress reporting")),1367{ OPTION_CALLBACK,0,"recurse-submodules", NULL,1368"checkout","control recursive updating of submodules",1369 PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },1370OPT_BOOL(0,"progress", &opts->show_progress,N_("force progress reporting")),1371OPT__FORCE(&opts->force,N_("force checkout (throw away local modifications)"),1372 PARSE_OPT_NOCOMPLETE),1373OPT_BOOL('m',"merge", &opts->merge,N_("perform a 3-way merge with the new branch")),1374OPT_STRING(0,"conflict", &opts->conflict_style,N_("style"),1375N_("conflict style (merge or diff3)")),1376OPT_END()1377};1378struct option *newopts =parse_options_concat(prevopts, options);1379free(prevopts);1380return newopts;1381}13821383static struct option *add_common_switch_branch_options(1384struct checkout_opts *opts,struct option *prevopts)1385{1386struct option options[] = {1387OPT_BOOL(0,"detach", &opts->force_detach,N_("detach HEAD at named commit")),1388OPT_SET_INT('t',"track", &opts->track,N_("set upstream info for new branch"),1389 BRANCH_TRACK_EXPLICIT),1390OPT_STRING(0,"orphan", &opts->new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1391OPT_BOOL_F(0,"overwrite-ignore", &opts->overwrite_ignore,1392N_("update ignored files (default)"),1393 PARSE_OPT_NOCOMPLETE),1394OPT_BOOL(0,"no-guess", &opts->no_dwim_new_local_branch,1395N_("second guess 'git checkout <no-such-branch>'")),1396OPT_BOOL(0,"ignore-other-worktrees", &opts->ignore_other_worktrees,1397N_("do not check if another worktree is holding the given ref")),1398OPT_END()1399};1400struct option *newopts =parse_options_concat(prevopts, options);1401free(prevopts);1402return newopts;1403}14041405static struct option *add_checkout_path_options(struct checkout_opts *opts,1406struct option *prevopts)1407{1408struct option options[] = {1409OPT_SET_INT_F('2',"ours", &opts->writeout_stage,1410N_("checkout our version for unmerged files"),14112, PARSE_OPT_NONEG),1412OPT_SET_INT_F('3',"theirs", &opts->writeout_stage,1413N_("checkout their version for unmerged files"),14143, PARSE_OPT_NONEG),1415OPT_BOOL('p',"patch", &opts->patch_mode,N_("select hunks interactively")),1416OPT_BOOL(0,"ignore-skip-worktree-bits", &opts->ignore_skipworktree,1417N_("do not limit pathspecs to sparse entries only")),1418OPT_BOOL(0,"overlay", &opts->overlay_mode,N_("use overlay mode (default)")),1419OPT_END()1420};1421struct option *newopts =parse_options_concat(prevopts, options);1422free(prevopts);1423return newopts;1424}14251426static intcheckout_main(int argc,const char**argv,const char*prefix,1427struct checkout_opts *opts,struct option *options,1428const char*const usagestr[])1429{1430struct branch_info new_branch_info;1431int dwim_remotes_matched =0;1432int dwim_new_local_branch;14331434memset(&new_branch_info,0,sizeof(new_branch_info));1435 opts->overwrite_ignore =1;1436 opts->prefix = prefix;1437 opts->show_progress = -1;1438 opts->overlay_mode = -1;14391440git_config(git_checkout_config, opts);14411442 opts->track = BRANCH_TRACK_UNSPECIFIED;14431444 argc =parse_options(argc, argv, prefix, options, usagestr,1445 PARSE_OPT_KEEP_DASHDASH);14461447 dwim_new_local_branch = !opts->no_dwim_new_local_branch;1448if(opts->show_progress <0) {1449if(opts->quiet)1450 opts->show_progress =0;1451else1452 opts->show_progress =isatty(2);1453}14541455if(opts->conflict_style) {1456 opts->merge =1;/* implied */1457git_xmerge_config("merge.conflictstyle", opts->conflict_style, NULL);1458}1459if(opts->force)1460 opts->discard_changes =1;14611462if((!!opts->new_branch + !!opts->new_branch_force + !!opts->new_orphan_branch) >1)1463die(_("-b, -B and --orphan are mutually exclusive"));14641465if(opts->overlay_mode ==1&& opts->patch_mode)1466die(_("-p and --overlay are mutually exclusive"));14671468/*1469 * From here on, new_branch will contain the branch to be checked out,1470 * and new_branch_force and new_orphan_branch will tell us which one of1471 * -b/-B/--orphan is being used.1472 */1473if(opts->new_branch_force)1474 opts->new_branch = opts->new_branch_force;14751476if(opts->new_orphan_branch)1477 opts->new_branch = opts->new_orphan_branch;14781479/* --track without -b/-B/--orphan should DWIM */1480if(opts->track != BRANCH_TRACK_UNSPECIFIED && !opts->new_branch) {1481const char*argv0 = argv[0];1482if(!argc || !strcmp(argv0,"--"))1483die(_("--track needs a branch name"));1484skip_prefix(argv0,"refs/", &argv0);1485skip_prefix(argv0,"remotes/", &argv0);1486 argv0 =strchr(argv0,'/');1487if(!argv0 || !argv0[1])1488die(_("missing branch name; try -b"));1489 opts->new_branch = argv0 +1;1490}14911492/*1493 * Extract branch name from command line arguments, so1494 * all that is left is pathspecs.1495 *1496 * Handle1497 *1498 * 1) git checkout <tree> -- [<paths>]1499 * 2) git checkout -- [<paths>]1500 * 3) git checkout <something> [<paths>]1501 *1502 * including "last branch" syntax and DWIM-ery for names of1503 * remote branches, erroring out for invalid or ambiguous cases.1504 */1505if(argc) {1506struct object_id rev;1507int dwim_ok =1508!opts->patch_mode &&1509 dwim_new_local_branch &&1510 opts->track == BRANCH_TRACK_UNSPECIFIED &&1511!opts->new_branch;1512int n =parse_branchname_arg(argc, argv, dwim_ok,1513&new_branch_info, opts, &rev,1514&dwim_remotes_matched);1515 argv += n;1516 argc -= n;1517}15181519if(argc) {1520parse_pathspec(&opts->pathspec,0,1521 opts->patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1522 prefix, argv);15231524if(!opts->pathspec.nr)1525die(_("invalid path specification"));15261527/*1528 * Try to give more helpful suggestion.1529 * new_branch && argc > 1 will be caught later.1530 */1531if(opts->new_branch && argc ==1)1532die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),1533 argv[0], opts->new_branch);15341535if(opts->force_detach)1536die(_("git checkout: --detach does not take a path argument '%s'"),1537 argv[0]);15381539if(1< !!opts->writeout_stage + !!opts->force + !!opts->merge)1540die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1541"checking out of the index."));1542}15431544if(opts->new_branch) {1545struct strbuf buf = STRBUF_INIT;15461547if(opts->new_branch_force)1548 opts->branch_exists =validate_branchname(opts->new_branch, &buf);1549else1550 opts->branch_exists =1551validate_new_branchname(opts->new_branch, &buf,0);1552strbuf_release(&buf);1553}15541555UNLEAK(opts);1556if(opts->patch_mode || opts->pathspec.nr) {1557int ret =checkout_paths(opts, new_branch_info.name);1558if(ret && dwim_remotes_matched >1&&1559 advice_checkout_ambiguous_remote_branch_name)1560advise(_("'%s' matched more than one remote tracking branch.\n"1561"We found%dremotes with a reference that matched. So we fell back\n"1562"on trying to resolve the argument as a path, but failed there too!\n"1563"\n"1564"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"1565"you can do so by fully qualifying the name with the --track option:\n"1566"\n"1567" git checkout --track origin/<name>\n"1568"\n"1569"If you'd like to always have checkouts of an ambiguous <name> prefer\n"1570"one remote, e.g. the 'origin' remote, consider setting\n"1571"checkout.defaultRemote=origin in your config."),1572 argv[0],1573 dwim_remotes_matched);1574return ret;1575}else{1576returncheckout_branch(opts, &new_branch_info);1577}1578}15791580intcmd_checkout(int argc,const char**argv,const char*prefix)1581{1582struct checkout_opts opts;1583struct option *options;1584struct option checkout_options[] = {1585OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1586N_("create and checkout a new branch")),1587OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1588N_("create/reset and checkout a branch")),1589OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1590OPT_END()1591};1592int ret;15931594memset(&opts,0,sizeof(opts));1595 opts.no_dwim_new_local_branch =0;1596 opts.accept_pathspec =1;15971598 options =parse_options_dup(checkout_options);1599 options =add_common_options(&opts, options);1600 options =add_common_switch_branch_options(&opts, options);1601 options =add_checkout_path_options(&opts, options);16021603 ret =checkout_main(argc, argv, prefix, &opts,1604 options, checkout_usage);1605FREE_AND_NULL(options);1606return ret;1607}16081609intcmd_switch(int argc,const char**argv,const char*prefix)1610{1611struct checkout_opts opts;1612struct option *options = NULL;1613struct option switch_options[] = {1614OPT_STRING('c',"create", &opts.new_branch,N_("branch"),1615N_("create and switch to a new branch")),1616OPT_STRING('C',"force-create", &opts.new_branch_force,N_("branch"),1617N_("create/reset and switch to a branch")),1618OPT_BOOL(0,"discard-changes", &opts.discard_changes,1619N_("throw away local modifications")),1620OPT_END()1621};1622int ret;16231624memset(&opts,0,sizeof(opts));1625 opts.no_dwim_new_local_branch =0;1626 opts.accept_pathspec =0;16271628 options =parse_options_dup(switch_options);1629 options =add_common_options(&opts, options);1630 options =add_common_switch_branch_options(&opts, options);16311632 ret =checkout_main(argc, argv, prefix, &opts,1633 options, switch_branch_usage);1634FREE_AND_NULL(options);1635return ret;1636}