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