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