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