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 = LOCK_INIT; 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 278hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); 279if(read_cache_preload(&opts->pathspec) <0) 280returnerror(_("index file corrupt")); 281 282if(opts->source_tree) 283read_tree_some(opts->source_tree, &opts->pathspec); 284 285 ps_matched =xcalloc(opts->pathspec.nr,1); 286 287/* 288 * Make sure all pathspecs participated in locating the paths 289 * to be checked out. 290 */ 291for(pos =0; pos < active_nr; pos++) { 292struct cache_entry *ce = active_cache[pos]; 293 ce->ce_flags &= ~CE_MATCHED; 294if(!opts->ignore_skipworktree &&ce_skip_worktree(ce)) 295continue; 296if(opts->source_tree && !(ce->ce_flags & CE_UPDATE)) 297/* 298 * "git checkout tree-ish -- path", but this entry 299 * is in the original index; it will not be checked 300 * out to the working tree and it does not matter 301 * if pathspec matched this entry. We will not do 302 * anything to this entry at all. 303 */ 304continue; 305/* 306 * Either this entry came from the tree-ish we are 307 * checking the paths out of, or we are checking out 308 * of the index. 309 * 310 * If it comes from the tree-ish, we already know it 311 * matches the pathspec and could just stamp 312 * CE_MATCHED to it from update_some(). But we still 313 * need ps_matched and read_tree_recursive (and 314 * eventually tree_entry_interesting) cannot fill 315 * ps_matched yet. Once it can, we can avoid calling 316 * match_pathspec() for _all_ entries when 317 * opts->source_tree != NULL. 318 */ 319if(ce_path_match(ce, &opts->pathspec, ps_matched)) 320 ce->ce_flags |= CE_MATCHED; 321} 322 323if(report_path_error(ps_matched, &opts->pathspec, opts->prefix)) { 324free(ps_matched); 325return1; 326} 327free(ps_matched); 328 329/* "checkout -m path" to recreate conflicted state */ 330if(opts->merge) 331unmerge_marked_index(&the_index); 332 333/* Any unmerged paths? */ 334for(pos =0; pos < active_nr; pos++) { 335const struct cache_entry *ce = active_cache[pos]; 336if(ce->ce_flags & CE_MATCHED) { 337if(!ce_stage(ce)) 338continue; 339if(opts->force) { 340warning(_("path '%s' is unmerged"), ce->name); 341}else if(opts->writeout_stage) { 342 errs |=check_stage(opts->writeout_stage, ce, pos); 343}else if(opts->merge) { 344 errs |=check_stages((1<<2) | (1<<3), ce, pos); 345}else{ 346 errs =1; 347error(_("path '%s' is unmerged"), ce->name); 348} 349 pos =skip_same_name(ce, pos) -1; 350} 351} 352if(errs) 353return1; 354 355/* Now we are committed to check them out */ 356 state.force =1; 357 state.refresh_cache =1; 358 state.istate = &the_index; 359 360enable_delayed_checkout(&state); 361for(pos =0; pos < active_nr; pos++) { 362struct cache_entry *ce = active_cache[pos]; 363if(ce->ce_flags & CE_MATCHED) { 364if(!ce_stage(ce)) { 365 errs |=checkout_entry(ce, &state, NULL); 366continue; 367} 368if(opts->writeout_stage) 369 errs |=checkout_stage(opts->writeout_stage, ce, pos, &state); 370else if(opts->merge) 371 errs |=checkout_merged(pos, &state); 372 pos =skip_same_name(ce, pos) -1; 373} 374} 375 errs |=finish_delayed_checkout(&state); 376 377if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) 378die(_("unable to write new index file")); 379 380read_ref_full("HEAD",0, &rev, NULL); 381 head =lookup_commit_reference_gently(&rev,1); 382 383 errs |=post_checkout_hook(head, head,0); 384return errs; 385} 386 387static voidshow_local_changes(struct object *head, 388const struct diff_options *opts) 389{ 390struct rev_info rev; 391/* I think we want full paths, even if we're in a subdirectory. */ 392init_revisions(&rev, NULL); 393 rev.diffopt.flags = opts->flags; 394 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; 395diff_setup_done(&rev.diffopt); 396add_pending_object(&rev, head, NULL); 397run_diff_index(&rev,0); 398} 399 400static voiddescribe_detached_head(const char*msg,struct commit *commit) 401{ 402struct strbuf sb = STRBUF_INIT; 403 404if(!parse_commit(commit)) 405pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 406if(print_sha1_ellipsis()) { 407fprintf(stderr,"%s %s...%s\n", msg, 408find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf); 409}else{ 410fprintf(stderr,"%s %s %s\n", msg, 411find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf); 412} 413strbuf_release(&sb); 414} 415 416static intreset_tree(struct tree *tree,const struct checkout_opts *o, 417int worktree,int*writeout_error) 418{ 419struct unpack_trees_options opts; 420struct tree_desc tree_desc; 421 422memset(&opts,0,sizeof(opts)); 423 opts.head_idx = -1; 424 opts.update = worktree; 425 opts.skip_unmerged = !worktree; 426 opts.reset =1; 427 opts.merge =1; 428 opts.fn = oneway_merge; 429 opts.verbose_update = o->show_progress; 430 opts.src_index = &the_index; 431 opts.dst_index = &the_index; 432parse_tree(tree); 433init_tree_desc(&tree_desc, tree->buffer, tree->size); 434switch(unpack_trees(1, &tree_desc, &opts)) { 435case-2: 436*writeout_error =1; 437/* 438 * We return 0 nevertheless, as the index is all right 439 * and more importantly we have made best efforts to 440 * update paths in the work tree, and we cannot revert 441 * them. 442 */ 443/* fallthrough */ 444case0: 445return0; 446default: 447return128; 448} 449} 450 451struct branch_info { 452const char*name;/* The short name used */ 453const char*path;/* The full name of a real branch */ 454struct commit *commit;/* The named commit */ 455/* 456 * if not null the branch is detached because it's already 457 * checked out in this checkout 458 */ 459char*checkout; 460}; 461 462static voidsetup_branch_path(struct branch_info *branch) 463{ 464struct strbuf buf = STRBUF_INIT; 465 466strbuf_branchname(&buf, branch->name, INTERPRET_BRANCH_LOCAL); 467if(strcmp(buf.buf, branch->name)) 468 branch->name =xstrdup(buf.buf); 469strbuf_splice(&buf,0,0,"refs/heads/",11); 470 branch->path =strbuf_detach(&buf, NULL); 471} 472 473static intmerge_working_tree(const struct checkout_opts *opts, 474struct branch_info *old, 475struct branch_info *new, 476int*writeout_error) 477{ 478int ret; 479struct lock_file lock_file = LOCK_INIT; 480 481hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); 482if(read_cache_preload(NULL) <0) 483returnerror(_("index file corrupt")); 484 485resolve_undo_clear(); 486if(opts->force) { 487 ret =reset_tree(new->commit->tree, opts,1, writeout_error); 488if(ret) 489return ret; 490}else{ 491struct tree_desc trees[2]; 492struct tree *tree; 493struct unpack_trees_options topts; 494 495memset(&topts,0,sizeof(topts)); 496 topts.head_idx = -1; 497 topts.src_index = &the_index; 498 topts.dst_index = &the_index; 499 500setup_unpack_trees_porcelain(&topts,"checkout"); 501 502refresh_cache(REFRESH_QUIET); 503 504if(unmerged_cache()) { 505error(_("you need to resolve your current index first")); 506return1; 507} 508 509/* 2-way merge to the new branch */ 510 topts.initial_checkout =is_cache_unborn(); 511 topts.update =1; 512 topts.merge =1; 513 topts.gently = opts->merge && old->commit; 514 topts.verbose_update = opts->show_progress; 515 topts.fn = twoway_merge; 516if(opts->overwrite_ignore) { 517 topts.dir =xcalloc(1,sizeof(*topts.dir)); 518 topts.dir->flags |= DIR_SHOW_IGNORED; 519setup_standard_excludes(topts.dir); 520} 521 tree =parse_tree_indirect(old->commit ? 522&old->commit->object.oid : 523&empty_tree_oid); 524init_tree_desc(&trees[0], tree->buffer, tree->size); 525 tree =parse_tree_indirect(&new->commit->object.oid); 526init_tree_desc(&trees[1], tree->buffer, tree->size); 527 528 ret =unpack_trees(2, trees, &topts); 529if(ret == -1) { 530/* 531 * Unpack couldn't do a trivial merge; either 532 * give up or do a real merge, depending on 533 * whether the merge flag was used. 534 */ 535struct tree *result; 536struct tree *work; 537struct merge_options o; 538if(!opts->merge) 539return1; 540 541/* 542 * Without old->commit, the below is the same as 543 * the two-tree unpack we already tried and failed. 544 */ 545if(!old->commit) 546return1; 547 548/* Do more real merge */ 549 550/* 551 * We update the index fully, then write the 552 * tree from the index, then merge the new 553 * branch with the current tree, with the old 554 * branch as the base. Then we reset the index 555 * (but not the working tree) to the new 556 * branch, leaving the working tree as the 557 * merged version, but skipping unmerged 558 * entries in the index. 559 */ 560 561add_files_to_cache(NULL, NULL,0); 562/* 563 * NEEDSWORK: carrying over local changes 564 * when branches have different end-of-line 565 * normalization (or clean+smudge rules) is 566 * a pain; plumb in an option to set 567 * o.renormalize? 568 */ 569init_merge_options(&o); 570 o.verbosity =0; 571 work =write_tree_from_memory(&o); 572 573 ret =reset_tree(new->commit->tree, opts,1, 574 writeout_error); 575if(ret) 576return ret; 577 o.ancestor = old->name; 578 o.branch1 =new->name; 579 o.branch2 ="local"; 580 ret =merge_trees(&o,new->commit->tree, work, 581 old->commit->tree, &result); 582if(ret <0) 583exit(128); 584 ret =reset_tree(new->commit->tree, opts,0, 585 writeout_error); 586strbuf_release(&o.obuf); 587if(ret) 588return ret; 589} 590} 591 592if(!active_cache_tree) 593 active_cache_tree =cache_tree(); 594 595if(!cache_tree_fully_valid(active_cache_tree)) 596cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); 597 598if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) 599die(_("unable to write new index file")); 600 601if(!opts->force && !opts->quiet) 602show_local_changes(&new->commit->object, &opts->diff_options); 603 604return0; 605} 606 607static voidreport_tracking(struct branch_info *new) 608{ 609struct strbuf sb = STRBUF_INIT; 610struct branch *branch =branch_get(new->name); 611 612if(!format_tracking_info(branch, &sb)) 613return; 614fputs(sb.buf, stdout); 615strbuf_release(&sb); 616} 617 618static voidupdate_refs_for_switch(const struct checkout_opts *opts, 619struct branch_info *old, 620struct branch_info *new) 621{ 622struct strbuf msg = STRBUF_INIT; 623const char*old_desc, *reflog_msg; 624if(opts->new_branch) { 625if(opts->new_orphan_branch) { 626char*refname; 627 628 refname =mkpathdup("refs/heads/%s", opts->new_orphan_branch); 629if(opts->new_branch_log && 630!should_autocreate_reflog(refname)) { 631int ret; 632struct strbuf err = STRBUF_INIT; 633 634 ret =safe_create_reflog(refname,1, &err); 635if(ret) { 636fprintf(stderr,_("Can not do reflog for '%s':%s\n"), 637 opts->new_orphan_branch, err.buf); 638strbuf_release(&err); 639free(refname); 640return; 641} 642strbuf_release(&err); 643} 644free(refname); 645} 646else 647create_branch(opts->new_branch,new->name, 648 opts->new_branch_force ?1:0, 649 opts->new_branch_log, 650 opts->new_branch_force ?1:0, 651 opts->quiet, 652 opts->track); 653new->name = opts->new_branch; 654setup_branch_path(new); 655} 656 657 old_desc = old->name; 658if(!old_desc && old->commit) 659 old_desc =oid_to_hex(&old->commit->object.oid); 660 661 reflog_msg =getenv("GIT_REFLOG_ACTION"); 662if(!reflog_msg) 663strbuf_addf(&msg,"checkout: moving from%sto%s", 664 old_desc ? old_desc :"(invalid)",new->name); 665else 666strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 667 668if(!strcmp(new->name,"HEAD") && !new->path && !opts->force_detach) { 669/* Nothing to do. */ 670}else if(opts->force_detach || !new->path) {/* No longer on any branch. */ 671update_ref(msg.buf,"HEAD", &new->commit->object.oid, NULL, 672 REF_NODEREF, UPDATE_REFS_DIE_ON_ERR); 673if(!opts->quiet) { 674if(old->path && 675 advice_detached_head && !opts->force_detach) 676detach_advice(new->name); 677describe_detached_head(_("HEAD is now at"),new->commit); 678} 679}else if(new->path) {/* Switch branches. */ 680if(create_symref("HEAD",new->path, msg.buf) <0) 681die(_("unable to update HEAD")); 682if(!opts->quiet) { 683if(old->path && !strcmp(new->path, old->path)) { 684if(opts->new_branch_force) 685fprintf(stderr,_("Reset branch '%s'\n"), 686new->name); 687else 688fprintf(stderr,_("Already on '%s'\n"), 689new->name); 690}else if(opts->new_branch) { 691if(opts->branch_exists) 692fprintf(stderr,_("Switched to and reset branch '%s'\n"),new->name); 693else 694fprintf(stderr,_("Switched to a new branch '%s'\n"),new->name); 695}else{ 696fprintf(stderr,_("Switched to branch '%s'\n"), 697new->name); 698} 699} 700if(old->path && old->name) { 701if(!ref_exists(old->path) &&reflog_exists(old->path)) 702delete_reflog(old->path); 703} 704} 705remove_branch_state(); 706strbuf_release(&msg); 707if(!opts->quiet && 708(new->path || (!opts->force_detach && !strcmp(new->name,"HEAD")))) 709report_tracking(new); 710} 711 712static intadd_pending_uninteresting_ref(const char*refname, 713const struct object_id *oid, 714int flags,void*cb_data) 715{ 716add_pending_oid(cb_data, refname, oid, UNINTERESTING); 717return0; 718} 719 720static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 721{ 722strbuf_addstr(sb," "); 723strbuf_add_unique_abbrev(sb, commit->object.oid.hash, DEFAULT_ABBREV); 724strbuf_addch(sb,' '); 725if(!parse_commit(commit)) 726pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 727strbuf_addch(sb,'\n'); 728} 729 730#define ORPHAN_CUTOFF 4 731static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 732{ 733struct commit *c, *last = NULL; 734struct strbuf sb = STRBUF_INIT; 735int lost =0; 736while((c =get_revision(revs)) != NULL) { 737if(lost < ORPHAN_CUTOFF) 738describe_one_orphan(&sb, c); 739 last = c; 740 lost++; 741} 742if(ORPHAN_CUTOFF < lost) { 743int more = lost - ORPHAN_CUTOFF; 744if(more ==1) 745describe_one_orphan(&sb, last); 746else 747strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 748} 749 750fprintf(stderr, 751Q_( 752/* The singular version */ 753"Warning: you are leaving%dcommit behind, " 754"not connected to\n" 755"any of your branches:\n\n" 756"%s\n", 757/* The plural version */ 758"Warning: you are leaving%dcommits behind, " 759"not connected to\n" 760"any of your branches:\n\n" 761"%s\n", 762/* Give ngettext() the count */ 763 lost), 764 lost, 765 sb.buf); 766strbuf_release(&sb); 767 768if(advice_detached_head) 769fprintf(stderr, 770Q_( 771/* The singular version */ 772"If you want to keep it by creating a new branch, " 773"this may be a good time\nto do so with:\n\n" 774" git branch <new-branch-name>%s\n\n", 775/* The plural version */ 776"If you want to keep them by creating a new branch, " 777"this may be a good time\nto do so with:\n\n" 778" git branch <new-branch-name>%s\n\n", 779/* Give ngettext() the count */ 780 lost), 781find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV)); 782} 783 784/* 785 * We are about to leave commit that was at the tip of a detached 786 * HEAD. If it is not reachable from any ref, this is the last chance 787 * for the user to do so without resorting to reflog. 788 */ 789static voidorphaned_commit_warning(struct commit *old,struct commit *new) 790{ 791struct rev_info revs; 792struct object *object = &old->object; 793struct object_array refs; 794 795init_revisions(&revs, NULL); 796setup_revisions(0, NULL, &revs, NULL); 797 798 object->flags &= ~UNINTERESTING; 799add_pending_object(&revs, object,oid_to_hex(&object->oid)); 800 801for_each_ref(add_pending_uninteresting_ref, &revs); 802add_pending_oid(&revs,"HEAD", &new->object.oid, UNINTERESTING); 803 804/* Save pending objects, so they can be cleaned up later. */ 805 refs = revs.pending; 806 revs.leak_pending =1; 807 808/* 809 * prepare_revision_walk (together with .leak_pending = 1) makes us 810 * the sole owner of the list of pending objects. 811 */ 812if(prepare_revision_walk(&revs)) 813die(_("internal error in revision walk")); 814if(!(old->object.flags & UNINTERESTING)) 815suggest_reattach(old, &revs); 816else 817describe_detached_head(_("Previous HEAD position was"), old); 818 819/* Clean up objects used, as they will be reused. */ 820clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS); 821 822object_array_clear(&refs); 823} 824 825static intswitch_branches(const struct checkout_opts *opts, 826struct branch_info *new) 827{ 828int ret =0; 829struct branch_info old; 830void*path_to_free; 831struct object_id rev; 832int flag, writeout_error =0; 833memset(&old,0,sizeof(old)); 834 old.path = path_to_free =resolve_refdup("HEAD",0, &rev, &flag); 835if(old.path) 836 old.commit =lookup_commit_reference_gently(&rev,1); 837if(!(flag & REF_ISSYMREF)) 838 old.path = NULL; 839 840if(old.path) 841skip_prefix(old.path,"refs/heads/", &old.name); 842 843if(!new->name) { 844new->name ="HEAD"; 845new->commit = old.commit; 846if(!new->commit) 847die(_("You are on a branch yet to be born")); 848parse_commit_or_die(new->commit); 849} 850 851 ret =merge_working_tree(opts, &old,new, &writeout_error); 852if(ret) { 853free(path_to_free); 854return ret; 855} 856 857if(!opts->quiet && !old.path && old.commit &&new->commit != old.commit) 858orphaned_commit_warning(old.commit,new->commit); 859 860update_refs_for_switch(opts, &old,new); 861 862 ret =post_checkout_hook(old.commit,new->commit,1); 863free(path_to_free); 864return ret || writeout_error; 865} 866 867static intgit_checkout_config(const char*var,const char*value,void*cb) 868{ 869if(!strcmp(var,"diff.ignoresubmodules")) { 870struct checkout_opts *opts = cb; 871handle_ignore_submodules_arg(&opts->diff_options, value); 872return0; 873} 874 875if(starts_with(var,"submodule.")) 876returngit_default_submodule_config(var, value, NULL); 877 878returngit_xmerge_config(var, value, NULL); 879} 880 881struct tracking_name_data { 882/* const */char*src_ref; 883char*dst_ref; 884struct object_id *dst_oid; 885int unique; 886}; 887 888static intcheck_tracking_name(struct remote *remote,void*cb_data) 889{ 890struct tracking_name_data *cb = cb_data; 891struct refspec query; 892memset(&query,0,sizeof(struct refspec)); 893 query.src = cb->src_ref; 894if(remote_find_tracking(remote, &query) || 895get_oid(query.dst, cb->dst_oid)) { 896free(query.dst); 897return0; 898} 899if(cb->dst_ref) { 900free(query.dst); 901 cb->unique =0; 902return0; 903} 904 cb->dst_ref = query.dst; 905return0; 906} 907 908static const char*unique_tracking_name(const char*name,struct object_id *oid) 909{ 910struct tracking_name_data cb_data = { NULL, NULL, NULL,1}; 911 cb_data.src_ref =xstrfmt("refs/heads/%s", name); 912 cb_data.dst_oid = oid; 913for_each_remote(check_tracking_name, &cb_data); 914free(cb_data.src_ref); 915if(cb_data.unique) 916return cb_data.dst_ref; 917free(cb_data.dst_ref); 918return NULL; 919} 920 921static intparse_branchname_arg(int argc,const char**argv, 922int dwim_new_local_branch_ok, 923struct branch_info *new, 924struct checkout_opts *opts, 925struct object_id *rev) 926{ 927struct tree **source_tree = &opts->source_tree; 928const char**new_branch = &opts->new_branch; 929int argcount =0; 930struct object_id branch_rev; 931const char*arg; 932int dash_dash_pos; 933int has_dash_dash =0; 934int i; 935 936/* 937 * case 1: git checkout <ref> -- [<paths>] 938 * 939 * <ref> must be a valid tree, everything after the '--' must be 940 * a path. 941 * 942 * case 2: git checkout -- [<paths>] 943 * 944 * everything after the '--' must be paths. 945 * 946 * case 3: git checkout <something> [--] 947 * 948 * (a) If <something> is a commit, that is to 949 * switch to the branch or detach HEAD at it. As a special case, 950 * if <something> is A...B (missing A or B means HEAD but you can 951 * omit at most one side), and if there is a unique merge base 952 * between A and B, A...B names that merge base. 953 * 954 * (b) If <something> is _not_ a commit, either "--" is present 955 * or <something> is not a path, no -t or -b was given, and 956 * and there is a tracking branch whose name is <something> 957 * in one and only one remote, then this is a short-hand to 958 * fork local <something> from that remote-tracking branch. 959 * 960 * (c) Otherwise, if "--" is present, treat it like case (1). 961 * 962 * (d) Otherwise : 963 * - if it's a reference, treat it like case (1) 964 * - else if it's a path, treat it like case (2) 965 * - else: fail. 966 * 967 * case 4: git checkout <something> <paths> 968 * 969 * The first argument must not be ambiguous. 970 * - If it's *only* a reference, treat it like case (1). 971 * - If it's only a path, treat it like case (2). 972 * - else: fail. 973 * 974 */ 975if(!argc) 976return0; 977 978 arg = argv[0]; 979 dash_dash_pos = -1; 980for(i =0; i < argc; i++) { 981if(!strcmp(argv[i],"--")) { 982 dash_dash_pos = i; 983break; 984} 985} 986if(dash_dash_pos ==0) 987return1;/* case (2) */ 988else if(dash_dash_pos ==1) 989 has_dash_dash =1;/* case (3) or (1) */ 990else if(dash_dash_pos >=2) 991die(_("only one reference expected,%dgiven."), dash_dash_pos); 992 993if(!strcmp(arg,"-")) 994 arg ="@{-1}"; 995 996if(get_oid_mb(arg, rev)) { 997/* 998 * Either case (3) or (4), with <something> not being 999 * a commit, or an attempt to use case (1) with an1000 * invalid ref.1001 *1002 * It's likely an error, but we need to find out if1003 * we should auto-create the branch, case (3).(b).1004 */1005int recover_with_dwim = dwim_new_local_branch_ok;10061007if(!has_dash_dash &&1008(check_filename(opts->prefix, arg) || !no_wildcard(arg)))1009 recover_with_dwim =0;1010/*1011 * Accept "git checkout foo" and "git checkout foo --"1012 * as candidates for dwim.1013 */1014if(!(argc ==1&& !has_dash_dash) &&1015!(argc ==2&& has_dash_dash))1016 recover_with_dwim =0;10171018if(recover_with_dwim) {1019const char*remote =unique_tracking_name(arg, rev);1020if(remote) {1021*new_branch = arg;1022 arg = remote;1023/* DWIMmed to create local branch, case (3).(b) */1024}else{1025 recover_with_dwim =0;1026}1027}10281029if(!recover_with_dwim) {1030if(has_dash_dash)1031die(_("invalid reference:%s"), arg);1032return argcount;1033}1034}10351036/* we can't end up being in (2) anymore, eat the argument */1037 argcount++;1038 argv++;1039 argc--;10401041new->name = arg;1042setup_branch_path(new);10431044if(!check_refname_format(new->path,0) &&1045!read_ref(new->path, &branch_rev))1046oidcpy(rev, &branch_rev);1047else1048new->path = NULL;/* not an existing branch */10491050new->commit =lookup_commit_reference_gently(rev,1);1051if(!new->commit) {1052/* not a commit */1053*source_tree =parse_tree_indirect(rev);1054}else{1055parse_commit_or_die(new->commit);1056*source_tree =new->commit->tree;1057}10581059if(!*source_tree)/* case (1): want a tree */1060die(_("reference is not a tree:%s"), arg);1061if(!has_dash_dash) {/* case (3).(d) -> (1) */1062/*1063 * Do not complain the most common case1064 * git checkout branch1065 * even if there happen to be a file called 'branch';1066 * it would be extremely annoying.1067 */1068if(argc)1069verify_non_filename(opts->prefix, arg);1070}else{1071 argcount++;1072 argv++;1073 argc--;1074}10751076return argcount;1077}10781079static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1080{1081int status;1082struct strbuf branch_ref = STRBUF_INIT;10831084if(!opts->new_branch)1085die(_("You are on a branch yet to be born"));1086strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1087 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1088strbuf_release(&branch_ref);1089if(!opts->quiet)1090fprintf(stderr,_("Switched to a new branch '%s'\n"),1091 opts->new_branch);1092return status;1093}10941095static intcheckout_branch(struct checkout_opts *opts,1096struct branch_info *new)1097{1098if(opts->pathspec.nr)1099die(_("paths cannot be used with switching branches"));11001101if(opts->patch_mode)1102die(_("'%s' cannot be used with switching branches"),1103"--patch");11041105if(opts->writeout_stage)1106die(_("'%s' cannot be used with switching branches"),1107"--ours/--theirs");11081109if(opts->force && opts->merge)1110die(_("'%s' cannot be used with '%s'"),"-f","-m");11111112if(opts->force_detach && opts->new_branch)1113die(_("'%s' cannot be used with '%s'"),1114"--detach","-b/-B/--orphan");11151116if(opts->new_orphan_branch) {1117if(opts->track != BRANCH_TRACK_UNSPECIFIED)1118die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1119}else if(opts->force_detach) {1120if(opts->track != BRANCH_TRACK_UNSPECIFIED)1121die(_("'%s' cannot be used with '%s'"),"--detach","-t");1122}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1123 opts->track = git_branch_track;11241125if(new->name && !new->commit)1126die(_("Cannot switch branch to a non-commit '%s'"),1127new->name);11281129if(new->path && !opts->force_detach && !opts->new_branch &&1130!opts->ignore_other_worktrees) {1131int flag;1132char*head_ref =resolve_refdup("HEAD",0, NULL, &flag);1133if(head_ref &&1134(!(flag & REF_ISSYMREF) ||strcmp(head_ref,new->path)))1135die_if_checked_out(new->path,1);1136free(head_ref);1137}11381139if(!new->commit && opts->new_branch) {1140struct object_id rev;1141int flag;11421143if(!read_ref_full("HEAD",0, &rev, &flag) &&1144(flag & REF_ISSYMREF) &&is_null_oid(&rev))1145returnswitch_unborn_to_new_branch(opts);1146}1147returnswitch_branches(opts,new);1148}11491150intcmd_checkout(int argc,const char**argv,const char*prefix)1151{1152struct checkout_opts opts;1153struct branch_info new;1154char*conflict_style = NULL;1155int dwim_new_local_branch =1;1156struct option options[] = {1157OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1158OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1159N_("create and checkout a new branch")),1160OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1161N_("create/reset and checkout a branch")),1162OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1163OPT_BOOL(0,"detach", &opts.force_detach,N_("detach HEAD at named commit")),1164OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1165 BRANCH_TRACK_EXPLICIT),1166OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1167OPT_SET_INT('2',"ours", &opts.writeout_stage,N_("checkout our version for unmerged files"),11682),1169OPT_SET_INT('3',"theirs", &opts.writeout_stage,N_("checkout their version for unmerged files"),11703),1171OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)")),1172OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1173OPT_BOOL(0,"overwrite-ignore", &opts.overwrite_ignore,N_("update ignored files (default)")),1174OPT_STRING(0,"conflict", &conflict_style,N_("style"),1175N_("conflict style (merge or diff3)")),1176OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1177OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1178N_("do not limit pathspecs to sparse entries only")),1179OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1180N_("second guess 'git checkout <no-such-branch>'")),1181OPT_BOOL(0,"ignore-other-worktrees", &opts.ignore_other_worktrees,1182N_("do not check if another worktree is holding the given ref")),1183{ OPTION_CALLBACK,0,"recurse-submodules", NULL,1184"checkout","control recursive updating of submodules",1185 PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },1186OPT_BOOL(0,"progress", &opts.show_progress,N_("force progress reporting")),1187OPT_END(),1188};11891190memset(&opts,0,sizeof(opts));1191memset(&new,0,sizeof(new));1192 opts.overwrite_ignore =1;1193 opts.prefix = prefix;1194 opts.show_progress = -1;11951196git_config(git_checkout_config, &opts);11971198 opts.track = BRANCH_TRACK_UNSPECIFIED;11991200 argc =parse_options(argc, argv, prefix, options, checkout_usage,1201 PARSE_OPT_KEEP_DASHDASH);12021203if(opts.show_progress <0) {1204if(opts.quiet)1205 opts.show_progress =0;1206else1207 opts.show_progress =isatty(2);1208}12091210if(conflict_style) {1211 opts.merge =1;/* implied */1212git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1213}12141215if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1216die(_("-b, -B and --orphan are mutually exclusive"));12171218/*1219 * From here on, new_branch will contain the branch to be checked out,1220 * and new_branch_force and new_orphan_branch will tell us which one of1221 * -b/-B/--orphan is being used.1222 */1223if(opts.new_branch_force)1224 opts.new_branch = opts.new_branch_force;12251226if(opts.new_orphan_branch)1227 opts.new_branch = opts.new_orphan_branch;12281229/* --track without -b/-B/--orphan should DWIM */1230if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1231const char*argv0 = argv[0];1232if(!argc || !strcmp(argv0,"--"))1233die(_("--track needs a branch name"));1234skip_prefix(argv0,"refs/", &argv0);1235skip_prefix(argv0,"remotes/", &argv0);1236 argv0 =strchr(argv0,'/');1237if(!argv0 || !argv0[1])1238die(_("Missing branch name; try -b"));1239 opts.new_branch = argv0 +1;1240}12411242/*1243 * Extract branch name from command line arguments, so1244 * all that is left is pathspecs.1245 *1246 * Handle1247 *1248 * 1) git checkout <tree> -- [<paths>]1249 * 2) git checkout -- [<paths>]1250 * 3) git checkout <something> [<paths>]1251 *1252 * including "last branch" syntax and DWIM-ery for names of1253 * remote branches, erroring out for invalid or ambiguous cases.1254 */1255if(argc) {1256struct object_id rev;1257int dwim_ok =1258!opts.patch_mode &&1259 dwim_new_local_branch &&1260 opts.track == BRANCH_TRACK_UNSPECIFIED &&1261!opts.new_branch;1262int n =parse_branchname_arg(argc, argv, dwim_ok,1263&new, &opts, &rev);1264 argv += n;1265 argc -= n;1266}12671268if(argc) {1269parse_pathspec(&opts.pathspec,0,1270 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1271 prefix, argv);12721273if(!opts.pathspec.nr)1274die(_("invalid path specification"));12751276/*1277 * Try to give more helpful suggestion.1278 * new_branch && argc > 1 will be caught later.1279 */1280if(opts.new_branch && argc ==1)1281die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),1282 argv[0], opts.new_branch);12831284if(opts.force_detach)1285die(_("git checkout: --detach does not take a path argument '%s'"),1286 argv[0]);12871288if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1289die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1290"checking out of the index."));1291}12921293if(opts.new_branch) {1294struct strbuf buf = STRBUF_INIT;12951296 opts.branch_exists =1297validate_new_branchname(opts.new_branch, &buf,1298!!opts.new_branch_force,1299!!opts.new_branch_force);13001301strbuf_release(&buf);1302}13031304UNLEAK(opts);1305if(opts.patch_mode || opts.pathspec.nr)1306returncheckout_paths(&opts,new.name);1307else1308returncheckout_branch(&opts, &new);1309}