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