1#include"builtin.h" 2#include"config.h" 3#include"lockfile.h" 4#include"parse-options.h" 5#include"refs.h" 6#include"commit.h" 7#include"tree.h" 8#include"tree-walk.h" 9#include"cache-tree.h" 10#include"unpack-trees.h" 11#include"dir.h" 12#include"run-command.h" 13#include"merge-recursive.h" 14#include"branch.h" 15#include"diff.h" 16#include"revision.h" 17#include"remote.h" 18#include"blob.h" 19#include"xdiff-interface.h" 20#include"ll-merge.h" 21#include"resolve-undo.h" 22#include"submodule-config.h" 23#include"submodule.h" 24 25static const char*const checkout_usage[] = { 26N_("git checkout [<options>] <branch>"), 27N_("git checkout [<options>] [<branch>] -- <file>..."), 28 NULL, 29}; 30 31struct checkout_opts { 32int patch_mode; 33int quiet; 34int merge; 35int force; 36int force_detach; 37int writeout_stage; 38int overwrite_ignore; 39int ignore_skipworktree; 40int ignore_other_worktrees; 41int show_progress; 42 43const char*new_branch; 44const char*new_branch_force; 45const char*new_orphan_branch; 46int new_branch_log; 47enum branch_track track; 48struct diff_options diff_options; 49 50int branch_exists; 51const char*prefix; 52struct pathspec pathspec; 53struct tree *source_tree; 54}; 55 56static intpost_checkout_hook(struct commit *old,struct commit *new, 57int changed) 58{ 59returnrun_hook_le(NULL,"post-checkout", 60oid_to_hex(old ? &old->object.oid : &null_oid), 61oid_to_hex(new? &new->object.oid : &null_oid), 62 changed ?"1":"0", NULL); 63/* "new" can be NULL when checking out from the index before 64 a commit exists. */ 65 66} 67 68static intupdate_some(const unsigned char*sha1,struct strbuf *base, 69const char*pathname,unsigned mode,int stage,void*context) 70{ 71int len; 72struct cache_entry *ce; 73int pos; 74 75if(S_ISDIR(mode)) 76return READ_TREE_RECURSIVE; 77 78 len = base->len +strlen(pathname); 79 ce =xcalloc(1,cache_entry_size(len)); 80hashcpy(ce->oid.hash, sha1); 81memcpy(ce->name, base->buf, base->len); 82memcpy(ce->name + base->len, pathname, len - base->len); 83 ce->ce_flags =create_ce_flags(0) | CE_UPDATE; 84 ce->ce_namelen = len; 85 ce->ce_mode =create_ce_mode(mode); 86 87/* 88 * If the entry is the same as the current index, we can leave the old 89 * entry in place. Whether it is UPTODATE or not, checkout_entry will 90 * do the right thing. 91 */ 92 pos =cache_name_pos(ce->name, ce->ce_namelen); 93if(pos >=0) { 94struct cache_entry *old = active_cache[pos]; 95if(ce->ce_mode == old->ce_mode && 96!oidcmp(&ce->oid, &old->oid)) { 97 old->ce_flags |= CE_UPDATE; 98free(ce); 99return0; 100} 101} 102 103add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); 104return0; 105} 106 107static intread_tree_some(struct tree *tree,const struct pathspec *pathspec) 108{ 109read_tree_recursive(tree,"",0,0, pathspec, update_some, NULL); 110 111/* update the index with the given tree's info 112 * for all args, expanding wildcards, and exit 113 * with any non-zero return code. 114 */ 115return0; 116} 117 118static intskip_same_name(const struct cache_entry *ce,int pos) 119{ 120while(++pos < active_nr && 121!strcmp(active_cache[pos]->name, ce->name)) 122;/* skip */ 123return pos; 124} 125 126static intcheck_stage(int stage,const struct cache_entry *ce,int pos) 127{ 128while(pos < active_nr && 129!strcmp(active_cache[pos]->name, ce->name)) { 130if(ce_stage(active_cache[pos]) == stage) 131return0; 132 pos++; 133} 134if(stage ==2) 135returnerror(_("path '%s' does not have our version"), ce->name); 136else 137returnerror(_("path '%s' does not have their version"), ce->name); 138} 139 140static intcheck_stages(unsigned stages,const struct cache_entry *ce,int pos) 141{ 142unsigned seen =0; 143const char*name = ce->name; 144 145while(pos < active_nr) { 146 ce = active_cache[pos]; 147if(strcmp(name, ce->name)) 148break; 149 seen |= (1<<ce_stage(ce)); 150 pos++; 151} 152if((stages & seen) != stages) 153returnerror(_("path '%s' does not have all necessary versions"), 154 name); 155return0; 156} 157 158static intcheckout_stage(int stage,const struct cache_entry *ce,int pos, 159const struct checkout *state) 160{ 161while(pos < active_nr && 162!strcmp(active_cache[pos]->name, ce->name)) { 163if(ce_stage(active_cache[pos]) == stage) 164returncheckout_entry(active_cache[pos], state, NULL); 165 pos++; 166} 167if(stage ==2) 168returnerror(_("path '%s' does not have our version"), ce->name); 169else 170returnerror(_("path '%s' does not have their version"), ce->name); 171} 172 173static intcheckout_merged(int pos,const struct checkout *state) 174{ 175struct cache_entry *ce = active_cache[pos]; 176const char*path = ce->name; 177 mmfile_t ancestor, ours, theirs; 178int status; 179struct object_id oid; 180 mmbuffer_t result_buf; 181struct object_id threeway[3]; 182unsigned mode =0; 183 184memset(threeway,0,sizeof(threeway)); 185while(pos < active_nr) { 186int stage; 187 stage =ce_stage(ce); 188if(!stage ||strcmp(path, ce->name)) 189break; 190oidcpy(&threeway[stage -1], &ce->oid); 191if(stage ==2) 192 mode =create_ce_mode(ce->ce_mode); 193 pos++; 194 ce = active_cache[pos]; 195} 196if(is_null_oid(&threeway[1]) ||is_null_oid(&threeway[2])) 197returnerror(_("path '%s' does not have necessary versions"), path); 198 199read_mmblob(&ancestor, &threeway[0]); 200read_mmblob(&ours, &threeway[1]); 201read_mmblob(&theirs, &threeway[2]); 202 203/* 204 * NEEDSWORK: re-create conflicts from merges with 205 * merge.renormalize set, too 206 */ 207 status =ll_merge(&result_buf, path, &ancestor,"base", 208&ours,"ours", &theirs,"theirs", NULL); 209free(ancestor.ptr); 210free(ours.ptr); 211free(theirs.ptr); 212if(status <0|| !result_buf.ptr) { 213free(result_buf.ptr); 214returnerror(_("path '%s': cannot merge"), path); 215} 216 217/* 218 * NEEDSWORK: 219 * There is absolutely no reason to write this as a blob object 220 * and create a phony cache entry. This hack is primarily to get 221 * to the write_entry() machinery that massages the contents to 222 * work-tree format and writes out which only allows it for a 223 * cache entry. The code in write_entry() needs to be refactored 224 * to allow us to feed a <buffer, size, mode> instead of a cache 225 * entry. Such a refactoring would help merge_recursive as well 226 * (it also writes the merge result to the object database even 227 * when it may contain conflicts). 228 */ 229if(write_sha1_file(result_buf.ptr, result_buf.size, 230 blob_type, oid.hash)) 231die(_("Unable to add merge result for '%s'"), path); 232free(result_buf.ptr); 233 ce =make_cache_entry(mode, oid.hash, path,2,0); 234if(!ce) 235die(_("make_cache_entry failed for path '%s'"), path); 236 status =checkout_entry(ce, state, NULL); 237free(ce); 238return status; 239} 240 241static intcheckout_paths(const struct checkout_opts *opts, 242const char*revision) 243{ 244int pos; 245struct checkout state = CHECKOUT_INIT; 246static char*ps_matched; 247struct object_id rev; 248struct commit *head; 249int errs =0; 250struct lock_file *lock_file; 251 252if(opts->track != BRANCH_TRACK_UNSPECIFIED) 253die(_("'%s' cannot be used with updating paths"),"--track"); 254 255if(opts->new_branch_log) 256die(_("'%s' cannot be used with updating paths"),"-l"); 257 258if(opts->force && opts->patch_mode) 259die(_("'%s' cannot be used with updating paths"),"-f"); 260 261if(opts->force_detach) 262die(_("'%s' cannot be used with updating paths"),"--detach"); 263 264if(opts->merge && opts->patch_mode) 265die(_("'%s' cannot be used with%s"),"--merge","--patch"); 266 267if(opts->force && opts->merge) 268die(_("'%s' cannot be used with%s"),"-f","-m"); 269 270if(opts->new_branch) 271die(_("Cannot update paths and switch to branch '%s' at the same time."), 272 opts->new_branch); 273 274if(opts->patch_mode) 275returnrun_add_interactive(revision,"--patch=checkout", 276&opts->pathspec); 277 278 lock_file =xcalloc(1,sizeof(struct lock_file)); 279 280hold_locked_index(lock_file, LOCK_DIE_ON_ERROR); 281if(read_cache_preload(&opts->pathspec) <0) 282returnerror(_("index file corrupt")); 283 284if(opts->source_tree) 285read_tree_some(opts->source_tree, &opts->pathspec); 286 287 ps_matched =xcalloc(opts->pathspec.nr,1); 288 289/* 290 * Make sure all pathspecs participated in locating the paths 291 * to be checked out. 292 */ 293for(pos =0; pos < active_nr; pos++) { 294struct cache_entry *ce = active_cache[pos]; 295 ce->ce_flags &= ~CE_MATCHED; 296if(!opts->ignore_skipworktree &&ce_skip_worktree(ce)) 297continue; 298if(opts->source_tree && !(ce->ce_flags & CE_UPDATE)) 299/* 300 * "git checkout tree-ish -- path", but this entry 301 * is in the original index; it will not be checked 302 * out to the working tree and it does not matter 303 * if pathspec matched this entry. We will not do 304 * anything to this entry at all. 305 */ 306continue; 307/* 308 * Either this entry came from the tree-ish we are 309 * checking the paths out of, or we are checking out 310 * of the index. 311 * 312 * If it comes from the tree-ish, we already know it 313 * matches the pathspec and could just stamp 314 * CE_MATCHED to it from update_some(). But we still 315 * need ps_matched and read_tree_recursive (and 316 * eventually tree_entry_interesting) cannot fill 317 * ps_matched yet. Once it can, we can avoid calling 318 * match_pathspec() for _all_ entries when 319 * opts->source_tree != NULL. 320 */ 321if(ce_path_match(ce, &opts->pathspec, ps_matched)) 322 ce->ce_flags |= CE_MATCHED; 323} 324 325if(report_path_error(ps_matched, &opts->pathspec, opts->prefix)) { 326free(ps_matched); 327return1; 328} 329free(ps_matched); 330 331/* "checkout -m path" to recreate conflicted state */ 332if(opts->merge) 333unmerge_marked_index(&the_index); 334 335/* Any unmerged paths? */ 336for(pos =0; pos < active_nr; pos++) { 337const struct cache_entry *ce = active_cache[pos]; 338if(ce->ce_flags & CE_MATCHED) { 339if(!ce_stage(ce)) 340continue; 341if(opts->force) { 342warning(_("path '%s' is unmerged"), ce->name); 343}else if(opts->writeout_stage) { 344 errs |=check_stage(opts->writeout_stage, ce, pos); 345}else if(opts->merge) { 346 errs |=check_stages((1<<2) | (1<<3), ce, pos); 347}else{ 348 errs =1; 349error(_("path '%s' is unmerged"), ce->name); 350} 351 pos =skip_same_name(ce, pos) -1; 352} 353} 354if(errs) 355return1; 356 357/* Now we are committed to check them out */ 358 state.force =1; 359 state.refresh_cache =1; 360 state.istate = &the_index; 361 362enable_delayed_checkout(&state); 363for(pos =0; pos < active_nr; pos++) { 364struct cache_entry *ce = active_cache[pos]; 365if(ce->ce_flags & CE_MATCHED) { 366if(!ce_stage(ce)) { 367 errs |=checkout_entry(ce, &state, NULL); 368continue; 369} 370if(opts->writeout_stage) 371 errs |=checkout_stage(opts->writeout_stage, ce, pos, &state); 372else if(opts->merge) 373 errs |=checkout_merged(pos, &state); 374 pos =skip_same_name(ce, pos) -1; 375} 376} 377 errs |=finish_delayed_checkout(&state); 378 379if(write_locked_index(&the_index, lock_file, COMMIT_LOCK)) 380die(_("unable to write new index file")); 381 382read_ref_full("HEAD",0, rev.hash, NULL); 383 head =lookup_commit_reference_gently(&rev,1); 384 385 errs |=post_checkout_hook(head, head,0); 386return errs; 387} 388 389static voidshow_local_changes(struct object *head, 390const struct diff_options *opts) 391{ 392struct rev_info rev; 393/* I think we want full paths, even if we're in a subdirectory. */ 394init_revisions(&rev, NULL); 395 rev.diffopt.flags = opts->flags; 396 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; 397diff_setup_done(&rev.diffopt); 398add_pending_object(&rev, head, NULL); 399run_diff_index(&rev,0); 400} 401 402static voiddescribe_detached_head(const char*msg,struct commit *commit) 403{ 404struct strbuf sb = STRBUF_INIT; 405if(!parse_commit(commit)) 406pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 407fprintf(stderr,"%s %s...%s\n", msg, 408find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf); 409strbuf_release(&sb); 410} 411 412static intreset_tree(struct tree *tree,const struct checkout_opts *o, 413int worktree,int*writeout_error) 414{ 415struct unpack_trees_options opts; 416struct tree_desc tree_desc; 417 418memset(&opts,0,sizeof(opts)); 419 opts.head_idx = -1; 420 opts.update = worktree; 421 opts.skip_unmerged = !worktree; 422 opts.reset =1; 423 opts.merge =1; 424 opts.fn = oneway_merge; 425 opts.verbose_update = o->show_progress; 426 opts.src_index = &the_index; 427 opts.dst_index = &the_index; 428parse_tree(tree); 429init_tree_desc(&tree_desc, tree->buffer, tree->size); 430switch(unpack_trees(1, &tree_desc, &opts)) { 431case-2: 432*writeout_error =1; 433/* 434 * We return 0 nevertheless, as the index is all right 435 * and more importantly we have made best efforts to 436 * update paths in the work tree, and we cannot revert 437 * them. 438 */ 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 =xcalloc(1,sizeof(struct lock_file)); 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.hash, NULL, 667 REF_NODEREF, 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 refs = revs.pending; 800 revs.leak_pending =1; 801 802if(prepare_revision_walk(&revs)) 803die(_("internal error in revision walk")); 804if(!(old->object.flags & UNINTERESTING)) 805suggest_reattach(old, &revs); 806else 807describe_detached_head(_("Previous HEAD position was"), old); 808 809clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS); 810free(refs.objects); 811} 812 813static intswitch_branches(const struct checkout_opts *opts, 814struct branch_info *new) 815{ 816int ret =0; 817struct branch_info old; 818void*path_to_free; 819struct object_id rev; 820int flag, writeout_error =0; 821memset(&old,0,sizeof(old)); 822 old.path = path_to_free =resolve_refdup("HEAD",0, rev.hash, &flag); 823if(old.path) 824 old.commit =lookup_commit_reference_gently(&rev,1); 825if(!(flag & REF_ISSYMREF)) 826 old.path = NULL; 827 828if(old.path) 829skip_prefix(old.path,"refs/heads/", &old.name); 830 831if(!new->name) { 832new->name ="HEAD"; 833new->commit = old.commit; 834if(!new->commit) 835die(_("You are on a branch yet to be born")); 836parse_commit_or_die(new->commit); 837} 838 839 ret =merge_working_tree(opts, &old,new, &writeout_error); 840if(ret) { 841free(path_to_free); 842return ret; 843} 844 845if(!opts->quiet && !old.path && old.commit &&new->commit != old.commit) 846orphaned_commit_warning(old.commit,new->commit); 847 848update_refs_for_switch(opts, &old,new); 849 850 ret =post_checkout_hook(old.commit,new->commit,1); 851free(path_to_free); 852return ret || writeout_error; 853} 854 855static intgit_checkout_config(const char*var,const char*value,void*cb) 856{ 857if(!strcmp(var,"diff.ignoresubmodules")) { 858struct checkout_opts *opts = cb; 859handle_ignore_submodules_arg(&opts->diff_options, value); 860return0; 861} 862 863if(starts_with(var,"submodule.")) 864returngit_default_submodule_config(var, value, NULL); 865 866returngit_xmerge_config(var, value, NULL); 867} 868 869struct tracking_name_data { 870/* const */char*src_ref; 871char*dst_ref; 872struct object_id *dst_oid; 873int unique; 874}; 875 876static intcheck_tracking_name(struct remote *remote,void*cb_data) 877{ 878struct tracking_name_data *cb = cb_data; 879struct refspec query; 880memset(&query,0,sizeof(struct refspec)); 881 query.src = cb->src_ref; 882if(remote_find_tracking(remote, &query) || 883get_oid(query.dst, cb->dst_oid)) { 884free(query.dst); 885return0; 886} 887if(cb->dst_ref) { 888free(query.dst); 889 cb->unique =0; 890return0; 891} 892 cb->dst_ref = query.dst; 893return0; 894} 895 896static const char*unique_tracking_name(const char*name,struct object_id *oid) 897{ 898struct tracking_name_data cb_data = { NULL, NULL, NULL,1}; 899 cb_data.src_ref =xstrfmt("refs/heads/%s", name); 900 cb_data.dst_oid = oid; 901for_each_remote(check_tracking_name, &cb_data); 902free(cb_data.src_ref); 903if(cb_data.unique) 904return cb_data.dst_ref; 905free(cb_data.dst_ref); 906return NULL; 907} 908 909static intparse_branchname_arg(int argc,const char**argv, 910int dwim_new_local_branch_ok, 911struct branch_info *new, 912struct checkout_opts *opts, 913struct object_id *rev) 914{ 915struct tree **source_tree = &opts->source_tree; 916const char**new_branch = &opts->new_branch; 917int argcount =0; 918struct object_id branch_rev; 919const char*arg; 920int dash_dash_pos; 921int has_dash_dash =0; 922int i; 923 924/* 925 * case 1: git checkout <ref> -- [<paths>] 926 * 927 * <ref> must be a valid tree, everything after the '--' must be 928 * a path. 929 * 930 * case 2: git checkout -- [<paths>] 931 * 932 * everything after the '--' must be paths. 933 * 934 * case 3: git checkout <something> [--] 935 * 936 * (a) If <something> is a commit, that is to 937 * switch to the branch or detach HEAD at it. As a special case, 938 * if <something> is A...B (missing A or B means HEAD but you can 939 * omit at most one side), and if there is a unique merge base 940 * between A and B, A...B names that merge base. 941 * 942 * (b) If <something> is _not_ a commit, either "--" is present 943 * or <something> is not a path, no -t or -b was given, and 944 * and there is a tracking branch whose name is <something> 945 * in one and only one remote, then this is a short-hand to 946 * fork local <something> from that remote-tracking branch. 947 * 948 * (c) Otherwise, if "--" is present, treat it like case (1). 949 * 950 * (d) Otherwise : 951 * - if it's a reference, treat it like case (1) 952 * - else if it's a path, treat it like case (2) 953 * - else: fail. 954 * 955 * case 4: git checkout <something> <paths> 956 * 957 * The first argument must not be ambiguous. 958 * - If it's *only* a reference, treat it like case (1). 959 * - If it's only a path, treat it like case (2). 960 * - else: fail. 961 * 962 */ 963if(!argc) 964return0; 965 966 arg = argv[0]; 967 dash_dash_pos = -1; 968for(i =0; i < argc; i++) { 969if(!strcmp(argv[i],"--")) { 970 dash_dash_pos = i; 971break; 972} 973} 974if(dash_dash_pos ==0) 975return1;/* case (2) */ 976else if(dash_dash_pos ==1) 977 has_dash_dash =1;/* case (3) or (1) */ 978else if(dash_dash_pos >=2) 979die(_("only one reference expected,%dgiven."), dash_dash_pos); 980 981if(!strcmp(arg,"-")) 982 arg ="@{-1}"; 983 984if(get_oid_mb(arg, rev)) { 985/* 986 * Either case (3) or (4), with <something> not being 987 * a commit, or an attempt to use case (1) with an 988 * invalid ref. 989 * 990 * It's likely an error, but we need to find out if 991 * we should auto-create the branch, case (3).(b). 992 */ 993int recover_with_dwim = dwim_new_local_branch_ok; 994 995if(!has_dash_dash && 996(check_filename(opts->prefix, arg) || !no_wildcard(arg))) 997 recover_with_dwim =0; 998/* 999 * Accept "git checkout foo" and "git checkout foo --"1000 * as candidates for dwim.1001 */1002if(!(argc ==1&& !has_dash_dash) &&1003!(argc ==2&& has_dash_dash))1004 recover_with_dwim =0;10051006if(recover_with_dwim) {1007const char*remote =unique_tracking_name(arg, rev);1008if(remote) {1009*new_branch = arg;1010 arg = remote;1011/* DWIMmed to create local branch, case (3).(b) */1012}else{1013 recover_with_dwim =0;1014}1015}10161017if(!recover_with_dwim) {1018if(has_dash_dash)1019die(_("invalid reference:%s"), arg);1020return argcount;1021}1022}10231024/* we can't end up being in (2) anymore, eat the argument */1025 argcount++;1026 argv++;1027 argc--;10281029new->name = arg;1030setup_branch_path(new);10311032if(!check_refname_format(new->path,0) &&1033!read_ref(new->path, branch_rev.hash))1034oidcpy(rev, &branch_rev);1035else1036new->path = NULL;/* not an existing branch */10371038new->commit =lookup_commit_reference_gently(rev,1);1039if(!new->commit) {1040/* not a commit */1041*source_tree =parse_tree_indirect(rev);1042}else{1043parse_commit_or_die(new->commit);1044*source_tree =new->commit->tree;1045}10461047if(!*source_tree)/* case (1): want a tree */1048die(_("reference is not a tree:%s"), arg);1049if(!has_dash_dash) {/* case (3).(d) -> (1) */1050/*1051 * Do not complain the most common case1052 * git checkout branch1053 * even if there happen to be a file called 'branch';1054 * it would be extremely annoying.1055 */1056if(argc)1057verify_non_filename(opts->prefix, arg);1058}else{1059 argcount++;1060 argv++;1061 argc--;1062}10631064return argcount;1065}10661067static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1068{1069int status;1070struct strbuf branch_ref = STRBUF_INIT;10711072if(!opts->new_branch)1073die(_("You are on a branch yet to be born"));1074strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1075 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1076strbuf_release(&branch_ref);1077if(!opts->quiet)1078fprintf(stderr,_("Switched to a new branch '%s'\n"),1079 opts->new_branch);1080return status;1081}10821083static intcheckout_branch(struct checkout_opts *opts,1084struct branch_info *new)1085{1086if(opts->pathspec.nr)1087die(_("paths cannot be used with switching branches"));10881089if(opts->patch_mode)1090die(_("'%s' cannot be used with switching branches"),1091"--patch");10921093if(opts->writeout_stage)1094die(_("'%s' cannot be used with switching branches"),1095"--ours/--theirs");10961097if(opts->force && opts->merge)1098die(_("'%s' cannot be used with '%s'"),"-f","-m");10991100if(opts->force_detach && opts->new_branch)1101die(_("'%s' cannot be used with '%s'"),1102"--detach","-b/-B/--orphan");11031104if(opts->new_orphan_branch) {1105if(opts->track != BRANCH_TRACK_UNSPECIFIED)1106die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1107}else if(opts->force_detach) {1108if(opts->track != BRANCH_TRACK_UNSPECIFIED)1109die(_("'%s' cannot be used with '%s'"),"--detach","-t");1110}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1111 opts->track = git_branch_track;11121113if(new->name && !new->commit)1114die(_("Cannot switch branch to a non-commit '%s'"),1115new->name);11161117if(new->path && !opts->force_detach && !opts->new_branch &&1118!opts->ignore_other_worktrees) {1119struct object_id oid;1120int flag;1121char*head_ref =resolve_refdup("HEAD",0, oid.hash, &flag);1122if(head_ref &&1123(!(flag & REF_ISSYMREF) ||strcmp(head_ref,new->path)))1124die_if_checked_out(new->path,1);1125free(head_ref);1126}11271128if(!new->commit && opts->new_branch) {1129struct object_id rev;1130int flag;11311132if(!read_ref_full("HEAD",0, rev.hash, &flag) &&1133(flag & REF_ISSYMREF) &&is_null_oid(&rev))1134returnswitch_unborn_to_new_branch(opts);1135}1136returnswitch_branches(opts,new);1137}11381139intcmd_checkout(int argc,const char**argv,const char*prefix)1140{1141struct checkout_opts opts;1142struct branch_info new;1143char*conflict_style = NULL;1144int dwim_new_local_branch =1;1145struct option options[] = {1146OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1147OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1148N_("create and checkout a new branch")),1149OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1150N_("create/reset and checkout a branch")),1151OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1152OPT_BOOL(0,"detach", &opts.force_detach,N_("detach HEAD at named commit")),1153OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1154 BRANCH_TRACK_EXPLICIT),1155OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1156OPT_SET_INT('2',"ours", &opts.writeout_stage,N_("checkout our version for unmerged files"),11572),1158OPT_SET_INT('3',"theirs", &opts.writeout_stage,N_("checkout their version for unmerged files"),11593),1160OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)")),1161OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1162OPT_BOOL(0,"overwrite-ignore", &opts.overwrite_ignore,N_("update ignored files (default)")),1163OPT_STRING(0,"conflict", &conflict_style,N_("style"),1164N_("conflict style (merge or diff3)")),1165OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1166OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1167N_("do not limit pathspecs to sparse entries only")),1168OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1169N_("second guess 'git checkout <no-such-branch>'")),1170OPT_BOOL(0,"ignore-other-worktrees", &opts.ignore_other_worktrees,1171N_("do not check if another worktree is holding the given ref")),1172{ OPTION_CALLBACK,0,"recurse-submodules", NULL,1173"checkout","control recursive updating of submodules",1174 PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },1175OPT_BOOL(0,"progress", &opts.show_progress,N_("force progress reporting")),1176OPT_END(),1177};11781179memset(&opts,0,sizeof(opts));1180memset(&new,0,sizeof(new));1181 opts.overwrite_ignore =1;1182 opts.prefix = prefix;1183 opts.show_progress = -1;11841185git_config(git_checkout_config, &opts);11861187 opts.track = BRANCH_TRACK_UNSPECIFIED;11881189 argc =parse_options(argc, argv, prefix, options, checkout_usage,1190 PARSE_OPT_KEEP_DASHDASH);11911192if(opts.show_progress <0) {1193if(opts.quiet)1194 opts.show_progress =0;1195else1196 opts.show_progress =isatty(2);1197}11981199if(conflict_style) {1200 opts.merge =1;/* implied */1201git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1202}12031204if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1205die(_("-b, -B and --orphan are mutually exclusive"));12061207/*1208 * From here on, new_branch will contain the branch to be checked out,1209 * and new_branch_force and new_orphan_branch will tell us which one of1210 * -b/-B/--orphan is being used.1211 */1212if(opts.new_branch_force)1213 opts.new_branch = opts.new_branch_force;12141215if(opts.new_orphan_branch)1216 opts.new_branch = opts.new_orphan_branch;12171218/* --track without -b/-B/--orphan should DWIM */1219if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1220const char*argv0 = argv[0];1221if(!argc || !strcmp(argv0,"--"))1222die(_("--track needs a branch name"));1223skip_prefix(argv0,"refs/", &argv0);1224skip_prefix(argv0,"remotes/", &argv0);1225 argv0 =strchr(argv0,'/');1226if(!argv0 || !argv0[1])1227die(_("Missing branch name; try -b"));1228 opts.new_branch = argv0 +1;1229}12301231/*1232 * Extract branch name from command line arguments, so1233 * all that is left is pathspecs.1234 *1235 * Handle1236 *1237 * 1) git checkout <tree> -- [<paths>]1238 * 2) git checkout -- [<paths>]1239 * 3) git checkout <something> [<paths>]1240 *1241 * including "last branch" syntax and DWIM-ery for names of1242 * remote branches, erroring out for invalid or ambiguous cases.1243 */1244if(argc) {1245struct object_id rev;1246int dwim_ok =1247!opts.patch_mode &&1248 dwim_new_local_branch &&1249 opts.track == BRANCH_TRACK_UNSPECIFIED &&1250!opts.new_branch;1251int n =parse_branchname_arg(argc, argv, dwim_ok,1252&new, &opts, &rev);1253 argv += n;1254 argc -= n;1255}12561257if(argc) {1258parse_pathspec(&opts.pathspec,0,1259 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1260 prefix, argv);12611262if(!opts.pathspec.nr)1263die(_("invalid path specification"));12641265/*1266 * Try to give more helpful suggestion.1267 * new_branch && argc > 1 will be caught later.1268 */1269if(opts.new_branch && argc ==1)1270die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),1271 argv[0], opts.new_branch);12721273if(opts.force_detach)1274die(_("git checkout: --detach does not take a path argument '%s'"),1275 argv[0]);12761277if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1278die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1279"checking out of the index."));1280}12811282if(opts.new_branch) {1283struct strbuf buf = STRBUF_INIT;12841285 opts.branch_exists =1286validate_new_branchname(opts.new_branch, &buf,1287!!opts.new_branch_force,1288!!opts.new_branch_force);12891290strbuf_release(&buf);1291}12921293if(opts.patch_mode || opts.pathspec.nr)1294returncheckout_paths(&opts,new.name);1295else1296returncheckout_branch(&opts, &new);1297}