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; 379for(pos =0; pos < active_nr; pos++) { 380struct cache_entry *ce = active_cache[pos]; 381if(ce->ce_flags & CE_MATCHED) { 382if(!ce_stage(ce)) { 383 errs |=checkout_entry(ce, &state, NULL); 384continue; 385} 386if(opts->writeout_stage) 387 errs |=checkout_stage(opts->writeout_stage, ce, pos, &state); 388else if(opts->merge) 389 errs |=checkout_merged(pos, &state); 390 pos =skip_same_name(ce, pos) -1; 391} 392} 393 394if(write_locked_index(&the_index, lock_file, COMMIT_LOCK)) 395die(_("unable to write new index file")); 396 397read_ref_full("HEAD",0, rev.hash, NULL); 398 head =lookup_commit_reference_gently(rev.hash,1); 399 400 errs |=post_checkout_hook(head, head,0); 401return errs; 402} 403 404static voidshow_local_changes(struct object *head, 405const struct diff_options *opts) 406{ 407struct rev_info rev; 408/* I think we want full paths, even if we're in a subdirectory. */ 409init_revisions(&rev, NULL); 410 rev.diffopt.flags = opts->flags; 411 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; 412diff_setup_done(&rev.diffopt); 413add_pending_object(&rev, head, NULL); 414run_diff_index(&rev,0); 415} 416 417static voiddescribe_detached_head(const char*msg,struct commit *commit) 418{ 419struct strbuf sb = STRBUF_INIT; 420if(!parse_commit(commit)) 421pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 422fprintf(stderr,"%s %s...%s\n", msg, 423find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf); 424strbuf_release(&sb); 425} 426 427static intreset_tree(struct tree *tree,const struct checkout_opts *o, 428int worktree,int*writeout_error) 429{ 430struct unpack_trees_options opts; 431struct tree_desc tree_desc; 432 433memset(&opts,0,sizeof(opts)); 434 opts.head_idx = -1; 435 opts.update = worktree; 436 opts.skip_unmerged = !worktree; 437 opts.reset =1; 438 opts.merge =1; 439 opts.fn = oneway_merge; 440 opts.verbose_update = o->show_progress; 441 opts.src_index = &the_index; 442 opts.dst_index = &the_index; 443parse_tree(tree); 444init_tree_desc(&tree_desc, tree->buffer, tree->size); 445switch(unpack_trees(1, &tree_desc, &opts)) { 446case-2: 447*writeout_error =1; 448/* 449 * We return 0 nevertheless, as the index is all right 450 * and more importantly we have made best efforts to 451 * update paths in the work tree, and we cannot revert 452 * them. 453 */ 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 483static intmerge_working_tree(const struct checkout_opts *opts, 484struct branch_info *old, 485struct branch_info *new, 486int*writeout_error) 487{ 488int ret; 489struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file)); 490 491hold_locked_index(lock_file, LOCK_DIE_ON_ERROR); 492if(read_cache_preload(NULL) <0) 493returnerror(_("index file corrupt")); 494 495resolve_undo_clear(); 496if(opts->force) { 497 ret =reset_tree(new->commit->tree, opts,1, writeout_error); 498if(ret) 499return ret; 500}else{ 501struct tree_desc trees[2]; 502struct tree *tree; 503struct unpack_trees_options topts; 504 505memset(&topts,0,sizeof(topts)); 506 topts.head_idx = -1; 507 topts.src_index = &the_index; 508 topts.dst_index = &the_index; 509 510setup_unpack_trees_porcelain(&topts,"checkout"); 511 512refresh_cache(REFRESH_QUIET); 513 514if(unmerged_cache()) { 515error(_("you need to resolve your current index first")); 516return1; 517} 518 519/* 2-way merge to the new branch */ 520 topts.initial_checkout =is_cache_unborn(); 521 topts.update =1; 522 topts.merge =1; 523 topts.gently = opts->merge && old->commit; 524 topts.verbose_update = opts->show_progress; 525 topts.fn = twoway_merge; 526if(opts->overwrite_ignore) { 527 topts.dir =xcalloc(1,sizeof(*topts.dir)); 528 topts.dir->flags |= DIR_SHOW_IGNORED; 529setup_standard_excludes(topts.dir); 530} 531 tree =parse_tree_indirect(old->commit ? 532 old->commit->object.oid.hash : 533 EMPTY_TREE_SHA1_BIN); 534init_tree_desc(&trees[0], tree->buffer, tree->size); 535 tree =parse_tree_indirect(new->commit->object.oid.hash); 536init_tree_desc(&trees[1], tree->buffer, tree->size); 537 538 ret =unpack_trees(2, trees, &topts); 539if(ret == -1) { 540/* 541 * Unpack couldn't do a trivial merge; either 542 * give up or do a real merge, depending on 543 * whether the merge flag was used. 544 */ 545struct tree *result; 546struct tree *work; 547struct merge_options o; 548if(!opts->merge) 549return1; 550 551/* 552 * Without old->commit, the below is the same as 553 * the two-tree unpack we already tried and failed. 554 */ 555if(!old->commit) 556return1; 557 558/* Do more real merge */ 559 560/* 561 * We update the index fully, then write the 562 * tree from the index, then merge the new 563 * branch with the current tree, with the old 564 * branch as the base. Then we reset the index 565 * (but not the working tree) to the new 566 * branch, leaving the working tree as the 567 * merged version, but skipping unmerged 568 * entries in the index. 569 */ 570 571add_files_to_cache(NULL, NULL,0); 572/* 573 * NEEDSWORK: carrying over local changes 574 * when branches have different end-of-line 575 * normalization (or clean+smudge rules) is 576 * a pain; plumb in an option to set 577 * o.renormalize? 578 */ 579init_merge_options(&o); 580 o.verbosity =0; 581 work =write_tree_from_memory(&o); 582 583 ret =reset_tree(new->commit->tree, opts,1, 584 writeout_error); 585if(ret) 586return ret; 587 o.ancestor = old->name; 588 o.branch1 =new->name; 589 o.branch2 ="local"; 590 ret =merge_trees(&o,new->commit->tree, work, 591 old->commit->tree, &result); 592if(ret <0) 593exit(128); 594 ret =reset_tree(new->commit->tree, opts,0, 595 writeout_error); 596strbuf_release(&o.obuf); 597if(ret) 598return ret; 599} 600} 601 602if(!active_cache_tree) 603 active_cache_tree =cache_tree(); 604 605if(!cache_tree_fully_valid(active_cache_tree)) 606cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); 607 608if(write_locked_index(&the_index, lock_file, COMMIT_LOCK)) 609die(_("unable to write new index file")); 610 611if(!opts->force && !opts->quiet) 612show_local_changes(&new->commit->object, &opts->diff_options); 613 614return0; 615} 616 617static voidreport_tracking(struct branch_info *new) 618{ 619struct strbuf sb = STRBUF_INIT; 620struct branch *branch =branch_get(new->name); 621 622if(!format_tracking_info(branch, &sb)) 623return; 624fputs(sb.buf, stdout); 625strbuf_release(&sb); 626} 627 628static voidupdate_refs_for_switch(const struct checkout_opts *opts, 629struct branch_info *old, 630struct branch_info *new) 631{ 632struct strbuf msg = STRBUF_INIT; 633const char*old_desc, *reflog_msg; 634if(opts->new_branch) { 635if(opts->new_orphan_branch) { 636char*refname; 637 638 refname =mkpathdup("refs/heads/%s", opts->new_orphan_branch); 639if(opts->new_branch_log && 640!should_autocreate_reflog(refname)) { 641int ret; 642struct strbuf err = STRBUF_INIT; 643 644 ret =safe_create_reflog(refname,1, &err); 645if(ret) { 646fprintf(stderr,_("Can not do reflog for '%s':%s\n"), 647 opts->new_orphan_branch, err.buf); 648strbuf_release(&err); 649free(refname); 650return; 651} 652strbuf_release(&err); 653} 654free(refname); 655} 656else 657create_branch(opts->new_branch,new->name, 658 opts->new_branch_force ?1:0, 659 opts->new_branch_log, 660 opts->new_branch_force ?1:0, 661 opts->quiet, 662 opts->track); 663new->name = opts->new_branch; 664setup_branch_path(new); 665} 666 667 old_desc = old->name; 668if(!old_desc && old->commit) 669 old_desc =oid_to_hex(&old->commit->object.oid); 670 671 reflog_msg =getenv("GIT_REFLOG_ACTION"); 672if(!reflog_msg) 673strbuf_addf(&msg,"checkout: moving from%sto%s", 674 old_desc ? old_desc :"(invalid)",new->name); 675else 676strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 677 678if(!strcmp(new->name,"HEAD") && !new->path && !opts->force_detach) { 679/* Nothing to do. */ 680}else if(opts->force_detach || !new->path) {/* No longer on any branch. */ 681update_ref(msg.buf,"HEAD",new->commit->object.oid.hash, NULL, 682 REF_NODEREF, UPDATE_REFS_DIE_ON_ERR); 683if(!opts->quiet) { 684if(old->path && 685 advice_detached_head && !opts->force_detach) 686detach_advice(new->name); 687describe_detached_head(_("HEAD is now at"),new->commit); 688} 689}else if(new->path) {/* Switch branches. */ 690if(create_symref("HEAD",new->path, msg.buf) <0) 691die(_("unable to update HEAD")); 692if(!opts->quiet) { 693if(old->path && !strcmp(new->path, old->path)) { 694if(opts->new_branch_force) 695fprintf(stderr,_("Reset branch '%s'\n"), 696new->name); 697else 698fprintf(stderr,_("Already on '%s'\n"), 699new->name); 700}else if(opts->new_branch) { 701if(opts->branch_exists) 702fprintf(stderr,_("Switched to and reset branch '%s'\n"),new->name); 703else 704fprintf(stderr,_("Switched to a new branch '%s'\n"),new->name); 705}else{ 706fprintf(stderr,_("Switched to branch '%s'\n"), 707new->name); 708} 709} 710if(old->path && old->name) { 711if(!ref_exists(old->path) &&reflog_exists(old->path)) 712delete_reflog(old->path); 713} 714} 715remove_branch_state(); 716strbuf_release(&msg); 717if(!opts->quiet && 718(new->path || (!opts->force_detach && !strcmp(new->name,"HEAD")))) 719report_tracking(new); 720} 721 722static intadd_pending_uninteresting_ref(const char*refname, 723const struct object_id *oid, 724int flags,void*cb_data) 725{ 726add_pending_sha1(cb_data, refname, oid->hash, UNINTERESTING); 727return0; 728} 729 730static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 731{ 732strbuf_addstr(sb," "); 733strbuf_add_unique_abbrev(sb, commit->object.oid.hash, DEFAULT_ABBREV); 734strbuf_addch(sb,' '); 735if(!parse_commit(commit)) 736pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 737strbuf_addch(sb,'\n'); 738} 739 740#define ORPHAN_CUTOFF 4 741static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 742{ 743struct commit *c, *last = NULL; 744struct strbuf sb = STRBUF_INIT; 745int lost =0; 746while((c =get_revision(revs)) != NULL) { 747if(lost < ORPHAN_CUTOFF) 748describe_one_orphan(&sb, c); 749 last = c; 750 lost++; 751} 752if(ORPHAN_CUTOFF < lost) { 753int more = lost - ORPHAN_CUTOFF; 754if(more ==1) 755describe_one_orphan(&sb, last); 756else 757strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 758} 759 760fprintf(stderr, 761Q_( 762/* The singular version */ 763"Warning: you are leaving%dcommit behind, " 764"not connected to\n" 765"any of your branches:\n\n" 766"%s\n", 767/* The plural version */ 768"Warning: you are leaving%dcommits behind, " 769"not connected to\n" 770"any of your branches:\n\n" 771"%s\n", 772/* Give ngettext() the count */ 773 lost), 774 lost, 775 sb.buf); 776strbuf_release(&sb); 777 778if(advice_detached_head) 779fprintf(stderr, 780Q_( 781/* The singular version */ 782"If you want to keep it by creating a new branch, " 783"this may be a good time\nto do so with:\n\n" 784" git branch <new-branch-name>%s\n\n", 785/* The plural version */ 786"If you want to keep them by creating a new branch, " 787"this may be a good time\nto do so with:\n\n" 788" git branch <new-branch-name>%s\n\n", 789/* Give ngettext() the count */ 790 lost), 791find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV)); 792} 793 794/* 795 * We are about to leave commit that was at the tip of a detached 796 * HEAD. If it is not reachable from any ref, this is the last chance 797 * for the user to do so without resorting to reflog. 798 */ 799static voidorphaned_commit_warning(struct commit *old,struct commit *new) 800{ 801struct rev_info revs; 802struct object *object = &old->object; 803struct object_array refs; 804 805init_revisions(&revs, NULL); 806setup_revisions(0, NULL, &revs, NULL); 807 808 object->flags &= ~UNINTERESTING; 809add_pending_object(&revs, object,oid_to_hex(&object->oid)); 810 811for_each_ref(add_pending_uninteresting_ref, &revs); 812add_pending_sha1(&revs,"HEAD",new->object.oid.hash, UNINTERESTING); 813 814 refs = revs.pending; 815 revs.leak_pending =1; 816 817if(prepare_revision_walk(&revs)) 818die(_("internal error in revision walk")); 819if(!(old->object.flags & UNINTERESTING)) 820suggest_reattach(old, &revs); 821else 822describe_detached_head(_("Previous HEAD position was"), old); 823 824clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS); 825free(refs.objects); 826} 827 828static intswitch_branches(const struct checkout_opts *opts, 829struct branch_info *new) 830{ 831int ret =0; 832struct branch_info old; 833void*path_to_free; 834struct object_id rev; 835int flag, writeout_error =0; 836memset(&old,0,sizeof(old)); 837 old.path = path_to_free =resolve_refdup("HEAD",0, rev.hash, &flag); 838 old.commit =lookup_commit_reference_gently(rev.hash,1); 839if(!(flag & REF_ISSYMREF)) 840 old.path = NULL; 841 842if(old.path) 843skip_prefix(old.path,"refs/heads/", &old.name); 844 845if(!new->name) { 846new->name ="HEAD"; 847new->commit = old.commit; 848if(!new->commit) 849die(_("You are on a branch yet to be born")); 850parse_commit_or_die(new->commit); 851} 852 853 ret =merge_working_tree(opts, &old,new, &writeout_error); 854if(ret) { 855free(path_to_free); 856return ret; 857} 858 859if(!opts->quiet && !old.path && old.commit &&new->commit != old.commit) 860orphaned_commit_warning(old.commit,new->commit); 861 862update_refs_for_switch(opts, &old,new); 863 864 ret =post_checkout_hook(old.commit,new->commit,1); 865free(path_to_free); 866return ret || writeout_error; 867} 868 869static intgit_checkout_config(const char*var,const char*value,void*cb) 870{ 871if(!strcmp(var,"diff.ignoresubmodules")) { 872struct checkout_opts *opts = cb; 873handle_ignore_submodules_arg(&opts->diff_options, value); 874return0; 875} 876 877if(starts_with(var,"submodule.")) 878returnparse_submodule_config_option(var, value); 879 880returngit_xmerge_config(var, value, NULL); 881} 882 883struct tracking_name_data { 884/* const */char*src_ref; 885char*dst_ref; 886struct object_id *dst_oid; 887int unique; 888}; 889 890static intcheck_tracking_name(struct remote *remote,void*cb_data) 891{ 892struct tracking_name_data *cb = cb_data; 893struct refspec query; 894memset(&query,0,sizeof(struct refspec)); 895 query.src = cb->src_ref; 896if(remote_find_tracking(remote, &query) || 897get_oid(query.dst, cb->dst_oid)) { 898free(query.dst); 899return0; 900} 901if(cb->dst_ref) { 902free(query.dst); 903 cb->unique =0; 904return0; 905} 906 cb->dst_ref = query.dst; 907return0; 908} 909 910static const char*unique_tracking_name(const char*name,struct object_id *oid) 911{ 912struct tracking_name_data cb_data = { NULL, NULL, NULL,1}; 913 cb_data.src_ref =xstrfmt("refs/heads/%s", name); 914 cb_data.dst_oid = oid; 915for_each_remote(check_tracking_name, &cb_data); 916free(cb_data.src_ref); 917if(cb_data.unique) 918return cb_data.dst_ref; 919free(cb_data.dst_ref); 920return NULL; 921} 922 923static intparse_branchname_arg(int argc,const char**argv, 924int dwim_new_local_branch_ok, 925struct branch_info *new, 926struct checkout_opts *opts, 927struct object_id *rev) 928{ 929struct tree **source_tree = &opts->source_tree; 930const char**new_branch = &opts->new_branch; 931int argcount =0; 932struct object_id branch_rev; 933const char*arg; 934int dash_dash_pos; 935int has_dash_dash =0; 936int i; 937 938/* 939 * case 1: git checkout <ref> -- [<paths>] 940 * 941 * <ref> must be a valid tree, everything after the '--' must be 942 * a path. 943 * 944 * case 2: git checkout -- [<paths>] 945 * 946 * everything after the '--' must be paths. 947 * 948 * case 3: git checkout <something> [--] 949 * 950 * (a) If <something> is a commit, that is to 951 * switch to the branch or detach HEAD at it. As a special case, 952 * if <something> is A...B (missing A or B means HEAD but you can 953 * omit at most one side), and if there is a unique merge base 954 * between A and B, A...B names that merge base. 955 * 956 * (b) If <something> is _not_ a commit, either "--" is present 957 * or <something> is not a path, no -t or -b was given, and 958 * and there is a tracking branch whose name is <something> 959 * in one and only one remote, then this is a short-hand to 960 * fork local <something> from that remote-tracking branch. 961 * 962 * (c) Otherwise, if "--" is present, treat it like case (1). 963 * 964 * (d) Otherwise : 965 * - if it's a reference, treat it like case (1) 966 * - else if it's a path, treat it like case (2) 967 * - else: fail. 968 * 969 * case 4: git checkout <something> <paths> 970 * 971 * The first argument must not be ambiguous. 972 * - If it's *only* a reference, treat it like case (1). 973 * - If it's only a path, treat it like case (2). 974 * - else: fail. 975 * 976 */ 977if(!argc) 978return0; 979 980 arg = argv[0]; 981 dash_dash_pos = -1; 982for(i =0; i < argc; i++) { 983if(!strcmp(argv[i],"--")) { 984 dash_dash_pos = i; 985break; 986} 987} 988if(dash_dash_pos ==0) 989return1;/* case (2) */ 990else if(dash_dash_pos ==1) 991 has_dash_dash =1;/* case (3) or (1) */ 992else if(dash_dash_pos >=2) 993die(_("only one reference expected,%dgiven."), dash_dash_pos); 994 995if(!strcmp(arg,"-")) 996 arg ="@{-1}"; 997 998if(get_oid_mb(arg, rev)) { 999/*1000 * Either case (3) or (4), with <something> not being1001 * a commit, or an attempt to use case (1) with an1002 * invalid ref.1003 *1004 * It's likely an error, but we need to find out if1005 * we should auto-create the branch, case (3).(b).1006 */1007int recover_with_dwim = dwim_new_local_branch_ok;10081009if(!has_dash_dash &&1010(check_filename(opts->prefix, arg) || !no_wildcard(arg)))1011 recover_with_dwim =0;1012/*1013 * Accept "git checkout foo" and "git checkout foo --"1014 * as candidates for dwim.1015 */1016if(!(argc ==1&& !has_dash_dash) &&1017!(argc ==2&& has_dash_dash))1018 recover_with_dwim =0;10191020if(recover_with_dwim) {1021const char*remote =unique_tracking_name(arg, rev);1022if(remote) {1023*new_branch = arg;1024 arg = remote;1025/* DWIMmed to create local branch, case (3).(b) */1026}else{1027 recover_with_dwim =0;1028}1029}10301031if(!recover_with_dwim) {1032if(has_dash_dash)1033die(_("invalid reference:%s"), arg);1034return argcount;1035}1036}10371038/* we can't end up being in (2) anymore, eat the argument */1039 argcount++;1040 argv++;1041 argc--;10421043new->name = arg;1044setup_branch_path(new);10451046if(!check_refname_format(new->path,0) &&1047!read_ref(new->path, branch_rev.hash))1048oidcpy(rev, &branch_rev);1049else1050new->path = NULL;/* not an existing branch */10511052new->commit =lookup_commit_reference_gently(rev->hash,1);1053if(!new->commit) {1054/* not a commit */1055*source_tree =parse_tree_indirect(rev->hash);1056}else{1057parse_commit_or_die(new->commit);1058*source_tree =new->commit->tree;1059}10601061if(!*source_tree)/* case (1): want a tree */1062die(_("reference is not a tree:%s"), arg);1063if(!has_dash_dash) {/* case (3).(d) -> (1) */1064/*1065 * Do not complain the most common case1066 * git checkout branch1067 * even if there happen to be a file called 'branch';1068 * it would be extremely annoying.1069 */1070if(argc)1071verify_non_filename(opts->prefix, arg);1072}else{1073 argcount++;1074 argv++;1075 argc--;1076}10771078return argcount;1079}10801081static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1082{1083int status;1084struct strbuf branch_ref = STRBUF_INIT;10851086if(!opts->new_branch)1087die(_("You are on a branch yet to be born"));1088strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1089 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1090strbuf_release(&branch_ref);1091if(!opts->quiet)1092fprintf(stderr,_("Switched to a new branch '%s'\n"),1093 opts->new_branch);1094return status;1095}10961097static intcheckout_branch(struct checkout_opts *opts,1098struct branch_info *new)1099{1100if(opts->pathspec.nr)1101die(_("paths cannot be used with switching branches"));11021103if(opts->patch_mode)1104die(_("'%s' cannot be used with switching branches"),1105"--patch");11061107if(opts->writeout_stage)1108die(_("'%s' cannot be used with switching branches"),1109"--ours/--theirs");11101111if(opts->force && opts->merge)1112die(_("'%s' cannot be used with '%s'"),"-f","-m");11131114if(opts->force_detach && opts->new_branch)1115die(_("'%s' cannot be used with '%s'"),1116"--detach","-b/-B/--orphan");11171118if(opts->new_orphan_branch) {1119if(opts->track != BRANCH_TRACK_UNSPECIFIED)1120die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1121}else if(opts->force_detach) {1122if(opts->track != BRANCH_TRACK_UNSPECIFIED)1123die(_("'%s' cannot be used with '%s'"),"--detach","-t");1124}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1125 opts->track = git_branch_track;11261127if(new->name && !new->commit)1128die(_("Cannot switch branch to a non-commit '%s'"),1129new->name);11301131if(new->path && !opts->force_detach && !opts->new_branch &&1132!opts->ignore_other_worktrees) {1133struct object_id oid;1134int flag;1135char*head_ref =resolve_refdup("HEAD",0, oid.hash, &flag);1136if(head_ref &&1137(!(flag & REF_ISSYMREF) ||strcmp(head_ref,new->path)))1138die_if_checked_out(new->path,1);1139free(head_ref);1140}11411142if(!new->commit && opts->new_branch) {1143struct object_id rev;1144int flag;11451146if(!read_ref_full("HEAD",0, rev.hash, &flag) &&1147(flag & REF_ISSYMREF) &&is_null_oid(&rev))1148returnswitch_unborn_to_new_branch(opts);1149}1150returnswitch_branches(opts,new);1151}11521153intcmd_checkout(int argc,const char**argv,const char*prefix)1154{1155struct checkout_opts opts;1156struct branch_info new;1157char*conflict_style = NULL;1158int dwim_new_local_branch =1;1159struct option options[] = {1160OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1161OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1162N_("create and checkout a new branch")),1163OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1164N_("create/reset and checkout a branch")),1165OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1166OPT_BOOL(0,"detach", &opts.force_detach,N_("detach HEAD at named commit")),1167OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1168 BRANCH_TRACK_EXPLICIT),1169OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1170OPT_SET_INT('2',"ours", &opts.writeout_stage,N_("checkout our version for unmerged files"),11712),1172OPT_SET_INT('3',"theirs", &opts.writeout_stage,N_("checkout their version for unmerged files"),11733),1174OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)")),1175OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1176OPT_BOOL(0,"overwrite-ignore", &opts.overwrite_ignore,N_("update ignored files (default)")),1177OPT_STRING(0,"conflict", &conflict_style,N_("style"),1178N_("conflict style (merge or diff3)")),1179OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1180OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1181N_("do not limit pathspecs to sparse entries only")),1182OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1183N_("second guess 'git checkout <no-such-branch>'")),1184OPT_BOOL(0,"ignore-other-worktrees", &opts.ignore_other_worktrees,1185N_("do not check if another worktree is holding the given ref")),1186{ OPTION_CALLBACK,0,"recurse-submodules", &recurse_submodules,1187"checkout","control recursive updating of submodules",1188 PARSE_OPT_OPTARG, option_parse_recurse_submodules },1189OPT_BOOL(0,"progress", &opts.show_progress,N_("force progress reporting")),1190OPT_END(),1191};11921193memset(&opts,0,sizeof(opts));1194memset(&new,0,sizeof(new));1195 opts.overwrite_ignore =1;1196 opts.prefix = prefix;1197 opts.show_progress = -1;11981199gitmodules_config();1200git_config(git_checkout_config, &opts);12011202 opts.track = BRANCH_TRACK_UNSPECIFIED;12031204 argc =parse_options(argc, argv, prefix, options, checkout_usage,1205 PARSE_OPT_KEEP_DASHDASH);12061207if(opts.show_progress <0) {1208if(opts.quiet)1209 opts.show_progress =0;1210else1211 opts.show_progress =isatty(2);1212}12131214if(conflict_style) {1215 opts.merge =1;/* implied */1216git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1217}12181219if(recurse_submodules != RECURSE_SUBMODULES_OFF) {1220git_config(submodule_config, NULL);1221if(recurse_submodules != RECURSE_SUBMODULES_DEFAULT)1222set_config_update_recurse_submodules(recurse_submodules);1223}12241225if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1226die(_("-b, -B and --orphan are mutually exclusive"));12271228/*1229 * From here on, new_branch will contain the branch to be checked out,1230 * and new_branch_force and new_orphan_branch will tell us which one of1231 * -b/-B/--orphan is being used.1232 */1233if(opts.new_branch_force)1234 opts.new_branch = opts.new_branch_force;12351236if(opts.new_orphan_branch)1237 opts.new_branch = opts.new_orphan_branch;12381239/* --track without -b/-B/--orphan should DWIM */1240if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1241const char*argv0 = argv[0];1242if(!argc || !strcmp(argv0,"--"))1243die(_("--track needs a branch name"));1244skip_prefix(argv0,"refs/", &argv0);1245skip_prefix(argv0,"remotes/", &argv0);1246 argv0 =strchr(argv0,'/');1247if(!argv0 || !argv0[1])1248die(_("Missing branch name; try -b"));1249 opts.new_branch = argv0 +1;1250}12511252/*1253 * Extract branch name from command line arguments, so1254 * all that is left is pathspecs.1255 *1256 * Handle1257 *1258 * 1) git checkout <tree> -- [<paths>]1259 * 2) git checkout -- [<paths>]1260 * 3) git checkout <something> [<paths>]1261 *1262 * including "last branch" syntax and DWIM-ery for names of1263 * remote branches, erroring out for invalid or ambiguous cases.1264 */1265if(argc) {1266struct object_id rev;1267int dwim_ok =1268!opts.patch_mode &&1269 dwim_new_local_branch &&1270 opts.track == BRANCH_TRACK_UNSPECIFIED &&1271!opts.new_branch;1272int n =parse_branchname_arg(argc, argv, dwim_ok,1273&new, &opts, &rev);1274 argv += n;1275 argc -= n;1276}12771278if(argc) {1279parse_pathspec(&opts.pathspec,0,1280 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1281 prefix, argv);12821283if(!opts.pathspec.nr)1284die(_("invalid path specification"));12851286/*1287 * Try to give more helpful suggestion.1288 * new_branch && argc > 1 will be caught later.1289 */1290if(opts.new_branch && argc ==1)1291die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),1292 argv[0], opts.new_branch);12931294if(opts.force_detach)1295die(_("git checkout: --detach does not take a path argument '%s'"),1296 argv[0]);12971298if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1299die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1300"checking out of the index."));1301}13021303if(opts.new_branch) {1304struct strbuf buf = STRBUF_INIT;13051306 opts.branch_exists =1307validate_new_branchname(opts.new_branch, &buf,1308!!opts.new_branch_force,1309!!opts.new_branch_force);13101311strbuf_release(&buf);1312}13131314if(opts.patch_mode || opts.pathspec.nr)1315returncheckout_paths(&opts,new.name);1316else1317returncheckout_branch(&opts, &new);1318}