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; 404 405if(!parse_commit(commit)) 406pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 407if(print_sha1_ellipsis()) { 408fprintf(stderr,"%s %s...%s\n", msg, 409find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf); 410}else{ 411fprintf(stderr,"%s %s %s\n", msg, 412find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf); 413} 414strbuf_release(&sb); 415} 416 417static intreset_tree(struct tree *tree,const struct checkout_opts *o, 418int worktree,int*writeout_error) 419{ 420struct unpack_trees_options opts; 421struct tree_desc tree_desc; 422 423memset(&opts,0,sizeof(opts)); 424 opts.head_idx = -1; 425 opts.update = worktree; 426 opts.skip_unmerged = !worktree; 427 opts.reset =1; 428 opts.merge =1; 429 opts.fn = oneway_merge; 430 opts.verbose_update = o->show_progress; 431 opts.src_index = &the_index; 432 opts.dst_index = &the_index; 433parse_tree(tree); 434init_tree_desc(&tree_desc, tree->buffer, tree->size); 435switch(unpack_trees(1, &tree_desc, &opts)) { 436case-2: 437*writeout_error =1; 438/* 439 * We return 0 nevertheless, as the index is all right 440 * and more importantly we have made best efforts to 441 * update paths in the work tree, and we cannot revert 442 * them. 443 */ 444/* fallthrough */ 445case0: 446return0; 447default: 448return128; 449} 450} 451 452struct branch_info { 453const char*name;/* The short name used */ 454const char*path;/* The full name of a real branch */ 455struct commit *commit;/* The named commit */ 456/* 457 * if not null the branch is detached because it's already 458 * checked out in this checkout 459 */ 460char*checkout; 461}; 462 463static voidsetup_branch_path(struct branch_info *branch) 464{ 465struct strbuf buf = STRBUF_INIT; 466 467strbuf_branchname(&buf, branch->name, INTERPRET_BRANCH_LOCAL); 468if(strcmp(buf.buf, branch->name)) 469 branch->name =xstrdup(buf.buf); 470strbuf_splice(&buf,0,0,"refs/heads/",11); 471 branch->path =strbuf_detach(&buf, NULL); 472} 473 474static intmerge_working_tree(const struct checkout_opts *opts, 475struct branch_info *old, 476struct branch_info *new, 477int*writeout_error) 478{ 479int ret; 480struct lock_file lock_file = LOCK_INIT; 481 482hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); 483if(read_cache_preload(NULL) <0) 484returnerror(_("index file corrupt")); 485 486resolve_undo_clear(); 487if(opts->force) { 488 ret =reset_tree(new->commit->tree, opts,1, writeout_error); 489if(ret) 490return ret; 491}else{ 492struct tree_desc trees[2]; 493struct tree *tree; 494struct unpack_trees_options topts; 495 496memset(&topts,0,sizeof(topts)); 497 topts.head_idx = -1; 498 topts.src_index = &the_index; 499 topts.dst_index = &the_index; 500 501setup_unpack_trees_porcelain(&topts,"checkout"); 502 503refresh_cache(REFRESH_QUIET); 504 505if(unmerged_cache()) { 506error(_("you need to resolve your current index first")); 507return1; 508} 509 510/* 2-way merge to the new branch */ 511 topts.initial_checkout =is_cache_unborn(); 512 topts.update =1; 513 topts.merge =1; 514 topts.gently = opts->merge && old->commit; 515 topts.verbose_update = opts->show_progress; 516 topts.fn = twoway_merge; 517if(opts->overwrite_ignore) { 518 topts.dir =xcalloc(1,sizeof(*topts.dir)); 519 topts.dir->flags |= DIR_SHOW_IGNORED; 520setup_standard_excludes(topts.dir); 521} 522 tree =parse_tree_indirect(old->commit ? 523&old->commit->object.oid : 524 the_hash_algo->empty_tree); 525init_tree_desc(&trees[0], tree->buffer, tree->size); 526 tree =parse_tree_indirect(&new->commit->object.oid); 527init_tree_desc(&trees[1], tree->buffer, tree->size); 528 529 ret =unpack_trees(2, trees, &topts); 530if(ret == -1) { 531/* 532 * Unpack couldn't do a trivial merge; either 533 * give up or do a real merge, depending on 534 * whether the merge flag was used. 535 */ 536struct tree *result; 537struct tree *work; 538struct merge_options o; 539if(!opts->merge) 540return1; 541 542/* 543 * Without old->commit, the below is the same as 544 * the two-tree unpack we already tried and failed. 545 */ 546if(!old->commit) 547return1; 548 549/* Do more real merge */ 550 551/* 552 * We update the index fully, then write the 553 * tree from the index, then merge the new 554 * branch with the current tree, with the old 555 * branch as the base. Then we reset the index 556 * (but not the working tree) to the new 557 * branch, leaving the working tree as the 558 * merged version, but skipping unmerged 559 * entries in the index. 560 */ 561 562add_files_to_cache(NULL, NULL,0); 563/* 564 * NEEDSWORK: carrying over local changes 565 * when branches have different end-of-line 566 * normalization (or clean+smudge rules) is 567 * a pain; plumb in an option to set 568 * o.renormalize? 569 */ 570init_merge_options(&o); 571 o.verbosity =0; 572 work =write_tree_from_memory(&o); 573 574 ret =reset_tree(new->commit->tree, opts,1, 575 writeout_error); 576if(ret) 577return ret; 578 o.ancestor = old->name; 579 o.branch1 =new->name; 580 o.branch2 ="local"; 581 ret =merge_trees(&o,new->commit->tree, work, 582 old->commit->tree, &result); 583if(ret <0) 584exit(128); 585 ret =reset_tree(new->commit->tree, opts,0, 586 writeout_error); 587strbuf_release(&o.obuf); 588if(ret) 589return ret; 590} 591} 592 593if(!active_cache_tree) 594 active_cache_tree =cache_tree(); 595 596if(!cache_tree_fully_valid(active_cache_tree)) 597cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); 598 599if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) 600die(_("unable to write new index file")); 601 602if(!opts->force && !opts->quiet) 603show_local_changes(&new->commit->object, &opts->diff_options); 604 605return0; 606} 607 608static voidreport_tracking(struct branch_info *new) 609{ 610struct strbuf sb = STRBUF_INIT; 611struct branch *branch =branch_get(new->name); 612 613if(!format_tracking_info(branch, &sb)) 614return; 615fputs(sb.buf, stdout); 616strbuf_release(&sb); 617} 618 619static voidupdate_refs_for_switch(const struct checkout_opts *opts, 620struct branch_info *old, 621struct branch_info *new) 622{ 623struct strbuf msg = STRBUF_INIT; 624const char*old_desc, *reflog_msg; 625if(opts->new_branch) { 626if(opts->new_orphan_branch) { 627char*refname; 628 629 refname =mkpathdup("refs/heads/%s", opts->new_orphan_branch); 630if(opts->new_branch_log && 631!should_autocreate_reflog(refname)) { 632int ret; 633struct strbuf err = STRBUF_INIT; 634 635 ret =safe_create_reflog(refname,1, &err); 636if(ret) { 637fprintf(stderr,_("Can not do reflog for '%s':%s\n"), 638 opts->new_orphan_branch, err.buf); 639strbuf_release(&err); 640free(refname); 641return; 642} 643strbuf_release(&err); 644} 645free(refname); 646} 647else 648create_branch(opts->new_branch,new->name, 649 opts->new_branch_force ?1:0, 650 opts->new_branch_log, 651 opts->new_branch_force ?1:0, 652 opts->quiet, 653 opts->track); 654new->name = opts->new_branch; 655setup_branch_path(new); 656} 657 658 old_desc = old->name; 659if(!old_desc && old->commit) 660 old_desc =oid_to_hex(&old->commit->object.oid); 661 662 reflog_msg =getenv("GIT_REFLOG_ACTION"); 663if(!reflog_msg) 664strbuf_addf(&msg,"checkout: moving from%sto%s", 665 old_desc ? old_desc :"(invalid)",new->name); 666else 667strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 668 669if(!strcmp(new->name,"HEAD") && !new->path && !opts->force_detach) { 670/* Nothing to do. */ 671}else if(opts->force_detach || !new->path) {/* No longer on any branch. */ 672update_ref(msg.buf,"HEAD", &new->commit->object.oid, NULL, 673 REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR); 674if(!opts->quiet) { 675if(old->path && 676 advice_detached_head && !opts->force_detach) 677detach_advice(new->name); 678describe_detached_head(_("HEAD is now at"),new->commit); 679} 680}else if(new->path) {/* Switch branches. */ 681if(create_symref("HEAD",new->path, msg.buf) <0) 682die(_("unable to update HEAD")); 683if(!opts->quiet) { 684if(old->path && !strcmp(new->path, old->path)) { 685if(opts->new_branch_force) 686fprintf(stderr,_("Reset branch '%s'\n"), 687new->name); 688else 689fprintf(stderr,_("Already on '%s'\n"), 690new->name); 691}else if(opts->new_branch) { 692if(opts->branch_exists) 693fprintf(stderr,_("Switched to and reset branch '%s'\n"),new->name); 694else 695fprintf(stderr,_("Switched to a new branch '%s'\n"),new->name); 696}else{ 697fprintf(stderr,_("Switched to branch '%s'\n"), 698new->name); 699} 700} 701if(old->path && old->name) { 702if(!ref_exists(old->path) &&reflog_exists(old->path)) 703delete_reflog(old->path); 704} 705} 706remove_branch_state(); 707strbuf_release(&msg); 708if(!opts->quiet && 709(new->path || (!opts->force_detach && !strcmp(new->name,"HEAD")))) 710report_tracking(new); 711} 712 713static intadd_pending_uninteresting_ref(const char*refname, 714const struct object_id *oid, 715int flags,void*cb_data) 716{ 717add_pending_oid(cb_data, refname, oid, UNINTERESTING); 718return0; 719} 720 721static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 722{ 723strbuf_addstr(sb," "); 724strbuf_add_unique_abbrev(sb, commit->object.oid.hash, DEFAULT_ABBREV); 725strbuf_addch(sb,' '); 726if(!parse_commit(commit)) 727pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 728strbuf_addch(sb,'\n'); 729} 730 731#define ORPHAN_CUTOFF 4 732static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 733{ 734struct commit *c, *last = NULL; 735struct strbuf sb = STRBUF_INIT; 736int lost =0; 737while((c =get_revision(revs)) != NULL) { 738if(lost < ORPHAN_CUTOFF) 739describe_one_orphan(&sb, c); 740 last = c; 741 lost++; 742} 743if(ORPHAN_CUTOFF < lost) { 744int more = lost - ORPHAN_CUTOFF; 745if(more ==1) 746describe_one_orphan(&sb, last); 747else 748strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 749} 750 751fprintf(stderr, 752Q_( 753/* The singular version */ 754"Warning: you are leaving%dcommit behind, " 755"not connected to\n" 756"any of your branches:\n\n" 757"%s\n", 758/* The plural version */ 759"Warning: you are leaving%dcommits behind, " 760"not connected to\n" 761"any of your branches:\n\n" 762"%s\n", 763/* Give ngettext() the count */ 764 lost), 765 lost, 766 sb.buf); 767strbuf_release(&sb); 768 769if(advice_detached_head) 770fprintf(stderr, 771Q_( 772/* The singular version */ 773"If you want to keep it by creating a new branch, " 774"this may be a good time\nto do so with:\n\n" 775" git branch <new-branch-name>%s\n\n", 776/* The plural version */ 777"If you want to keep them by creating a new branch, " 778"this may be a good time\nto do so with:\n\n" 779" git branch <new-branch-name>%s\n\n", 780/* Give ngettext() the count */ 781 lost), 782find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV)); 783} 784 785/* 786 * We are about to leave commit that was at the tip of a detached 787 * HEAD. If it is not reachable from any ref, this is the last chance 788 * for the user to do so without resorting to reflog. 789 */ 790static voidorphaned_commit_warning(struct commit *old,struct commit *new) 791{ 792struct rev_info revs; 793struct object *object = &old->object; 794struct object_array refs; 795 796init_revisions(&revs, NULL); 797setup_revisions(0, NULL, &revs, NULL); 798 799 object->flags &= ~UNINTERESTING; 800add_pending_object(&revs, object,oid_to_hex(&object->oid)); 801 802for_each_ref(add_pending_uninteresting_ref, &revs); 803add_pending_oid(&revs,"HEAD", &new->object.oid, UNINTERESTING); 804 805/* Save pending objects, so they can be cleaned up later. */ 806 refs = revs.pending; 807 revs.leak_pending =1; 808 809/* 810 * prepare_revision_walk (together with .leak_pending = 1) makes us 811 * the sole owner of the list of pending objects. 812 */ 813if(prepare_revision_walk(&revs)) 814die(_("internal error in revision walk")); 815if(!(old->object.flags & UNINTERESTING)) 816suggest_reattach(old, &revs); 817else 818describe_detached_head(_("Previous HEAD position was"), old); 819 820/* Clean up objects used, as they will be reused. */ 821clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS); 822 823object_array_clear(&refs); 824} 825 826static intswitch_branches(const struct checkout_opts *opts, 827struct branch_info *new) 828{ 829int ret =0; 830struct branch_info old; 831void*path_to_free; 832struct object_id rev; 833int flag, writeout_error =0; 834memset(&old,0,sizeof(old)); 835 old.path = path_to_free =resolve_refdup("HEAD",0, &rev, &flag); 836if(old.path) 837 old.commit =lookup_commit_reference_gently(&rev,1); 838if(!(flag & REF_ISSYMREF)) 839 old.path = NULL; 840 841if(old.path) 842skip_prefix(old.path,"refs/heads/", &old.name); 843 844if(!new->name) { 845new->name ="HEAD"; 846new->commit = old.commit; 847if(!new->commit) 848die(_("You are on a branch yet to be born")); 849parse_commit_or_die(new->commit); 850} 851 852 ret =merge_working_tree(opts, &old,new, &writeout_error); 853if(ret) { 854free(path_to_free); 855return ret; 856} 857 858if(!opts->quiet && !old.path && old.commit &&new->commit != old.commit) 859orphaned_commit_warning(old.commit,new->commit); 860 861update_refs_for_switch(opts, &old,new); 862 863 ret =post_checkout_hook(old.commit,new->commit,1); 864free(path_to_free); 865return ret || writeout_error; 866} 867 868static intgit_checkout_config(const char*var,const char*value,void*cb) 869{ 870if(!strcmp(var,"diff.ignoresubmodules")) { 871struct checkout_opts *opts = cb; 872handle_ignore_submodules_arg(&opts->diff_options, value); 873return0; 874} 875 876if(starts_with(var,"submodule.")) 877returngit_default_submodule_config(var, value, NULL); 878 879returngit_xmerge_config(var, value, NULL); 880} 881 882static intparse_branchname_arg(int argc,const char**argv, 883int dwim_new_local_branch_ok, 884struct branch_info *new, 885struct checkout_opts *opts, 886struct object_id *rev) 887{ 888struct tree **source_tree = &opts->source_tree; 889const char**new_branch = &opts->new_branch; 890int argcount =0; 891struct object_id branch_rev; 892const char*arg; 893int dash_dash_pos; 894int has_dash_dash =0; 895int i; 896 897/* 898 * case 1: git checkout <ref> -- [<paths>] 899 * 900 * <ref> must be a valid tree, everything after the '--' must be 901 * a path. 902 * 903 * case 2: git checkout -- [<paths>] 904 * 905 * everything after the '--' must be paths. 906 * 907 * case 3: git checkout <something> [--] 908 * 909 * (a) If <something> is a commit, that is to 910 * switch to the branch or detach HEAD at it. As a special case, 911 * if <something> is A...B (missing A or B means HEAD but you can 912 * omit at most one side), and if there is a unique merge base 913 * between A and B, A...B names that merge base. 914 * 915 * (b) If <something> is _not_ a commit, either "--" is present 916 * or <something> is not a path, no -t or -b was given, and 917 * and there is a tracking branch whose name is <something> 918 * in one and only one remote, then this is a short-hand to 919 * fork local <something> from that remote-tracking branch. 920 * 921 * (c) Otherwise, if "--" is present, treat it like case (1). 922 * 923 * (d) Otherwise : 924 * - if it's a reference, treat it like case (1) 925 * - else if it's a path, treat it like case (2) 926 * - else: fail. 927 * 928 * case 4: git checkout <something> <paths> 929 * 930 * The first argument must not be ambiguous. 931 * - If it's *only* a reference, treat it like case (1). 932 * - If it's only a path, treat it like case (2). 933 * - else: fail. 934 * 935 */ 936if(!argc) 937return0; 938 939 arg = argv[0]; 940 dash_dash_pos = -1; 941for(i =0; i < argc; i++) { 942if(!strcmp(argv[i],"--")) { 943 dash_dash_pos = i; 944break; 945} 946} 947if(dash_dash_pos ==0) 948return1;/* case (2) */ 949else if(dash_dash_pos ==1) 950 has_dash_dash =1;/* case (3) or (1) */ 951else if(dash_dash_pos >=2) 952die(_("only one reference expected,%dgiven."), dash_dash_pos); 953 954if(!strcmp(arg,"-")) 955 arg ="@{-1}"; 956 957if(get_oid_mb(arg, rev)) { 958/* 959 * Either case (3) or (4), with <something> not being 960 * a commit, or an attempt to use case (1) with an 961 * invalid ref. 962 * 963 * It's likely an error, but we need to find out if 964 * we should auto-create the branch, case (3).(b). 965 */ 966int recover_with_dwim = dwim_new_local_branch_ok; 967 968if(!has_dash_dash && 969(check_filename(opts->prefix, arg) || !no_wildcard(arg))) 970 recover_with_dwim =0; 971/* 972 * Accept "git checkout foo" and "git checkout foo --" 973 * as candidates for dwim. 974 */ 975if(!(argc ==1&& !has_dash_dash) && 976!(argc ==2&& has_dash_dash)) 977 recover_with_dwim =0; 978 979if(recover_with_dwim) { 980const char*remote =unique_tracking_name(arg, rev); 981if(remote) { 982*new_branch = arg; 983 arg = remote; 984/* DWIMmed to create local branch, case (3).(b) */ 985}else{ 986 recover_with_dwim =0; 987} 988} 989 990if(!recover_with_dwim) { 991if(has_dash_dash) 992die(_("invalid reference:%s"), arg); 993return argcount; 994} 995} 996 997/* we can't end up being in (2) anymore, eat the argument */ 998 argcount++; 999 argv++;1000 argc--;10011002new->name = arg;1003setup_branch_path(new);10041005if(!check_refname_format(new->path,0) &&1006!read_ref(new->path, &branch_rev))1007oidcpy(rev, &branch_rev);1008else1009new->path = NULL;/* not an existing branch */10101011new->commit =lookup_commit_reference_gently(rev,1);1012if(!new->commit) {1013/* not a commit */1014*source_tree =parse_tree_indirect(rev);1015}else{1016parse_commit_or_die(new->commit);1017*source_tree =new->commit->tree;1018}10191020if(!*source_tree)/* case (1): want a tree */1021die(_("reference is not a tree:%s"), arg);1022if(!has_dash_dash) {/* case (3).(d) -> (1) */1023/*1024 * Do not complain the most common case1025 * git checkout branch1026 * even if there happen to be a file called 'branch';1027 * it would be extremely annoying.1028 */1029if(argc)1030verify_non_filename(opts->prefix, arg);1031}else{1032 argcount++;1033 argv++;1034 argc--;1035}10361037return argcount;1038}10391040static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1041{1042int status;1043struct strbuf branch_ref = STRBUF_INIT;10441045if(!opts->new_branch)1046die(_("You are on a branch yet to be born"));1047strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1048 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1049strbuf_release(&branch_ref);1050if(!opts->quiet)1051fprintf(stderr,_("Switched to a new branch '%s'\n"),1052 opts->new_branch);1053return status;1054}10551056static intcheckout_branch(struct checkout_opts *opts,1057struct branch_info *new)1058{1059if(opts->pathspec.nr)1060die(_("paths cannot be used with switching branches"));10611062if(opts->patch_mode)1063die(_("'%s' cannot be used with switching branches"),1064"--patch");10651066if(opts->writeout_stage)1067die(_("'%s' cannot be used with switching branches"),1068"--ours/--theirs");10691070if(opts->force && opts->merge)1071die(_("'%s' cannot be used with '%s'"),"-f","-m");10721073if(opts->force_detach && opts->new_branch)1074die(_("'%s' cannot be used with '%s'"),1075"--detach","-b/-B/--orphan");10761077if(opts->new_orphan_branch) {1078if(opts->track != BRANCH_TRACK_UNSPECIFIED)1079die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1080}else if(opts->force_detach) {1081if(opts->track != BRANCH_TRACK_UNSPECIFIED)1082die(_("'%s' cannot be used with '%s'"),"--detach","-t");1083}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1084 opts->track = git_branch_track;10851086if(new->name && !new->commit)1087die(_("Cannot switch branch to a non-commit '%s'"),1088new->name);10891090if(new->path && !opts->force_detach && !opts->new_branch &&1091!opts->ignore_other_worktrees) {1092int flag;1093char*head_ref =resolve_refdup("HEAD",0, NULL, &flag);1094if(head_ref &&1095(!(flag & REF_ISSYMREF) ||strcmp(head_ref,new->path)))1096die_if_checked_out(new->path,1);1097free(head_ref);1098}10991100if(!new->commit && opts->new_branch) {1101struct object_id rev;1102int flag;11031104if(!read_ref_full("HEAD",0, &rev, &flag) &&1105(flag & REF_ISSYMREF) &&is_null_oid(&rev))1106returnswitch_unborn_to_new_branch(opts);1107}1108returnswitch_branches(opts,new);1109}11101111intcmd_checkout(int argc,const char**argv,const char*prefix)1112{1113struct checkout_opts opts;1114struct branch_info new;1115char*conflict_style = NULL;1116int dwim_new_local_branch =1;1117struct option options[] = {1118OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1119OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1120N_("create and checkout a new branch")),1121OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1122N_("create/reset and checkout a branch")),1123OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1124OPT_BOOL(0,"detach", &opts.force_detach,N_("detach HEAD at named commit")),1125OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1126 BRANCH_TRACK_EXPLICIT),1127OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1128OPT_SET_INT('2',"ours", &opts.writeout_stage,N_("checkout our version for unmerged files"),11292),1130OPT_SET_INT('3',"theirs", &opts.writeout_stage,N_("checkout their version for unmerged files"),11313),1132OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)")),1133OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1134OPT_BOOL(0,"overwrite-ignore", &opts.overwrite_ignore,N_("update ignored files (default)")),1135OPT_STRING(0,"conflict", &conflict_style,N_("style"),1136N_("conflict style (merge or diff3)")),1137OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1138OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1139N_("do not limit pathspecs to sparse entries only")),1140OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1141N_("second guess 'git checkout <no-such-branch>'")),1142OPT_BOOL(0,"ignore-other-worktrees", &opts.ignore_other_worktrees,1143N_("do not check if another worktree is holding the given ref")),1144{ OPTION_CALLBACK,0,"recurse-submodules", NULL,1145"checkout","control recursive updating of submodules",1146 PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },1147OPT_BOOL(0,"progress", &opts.show_progress,N_("force progress reporting")),1148OPT_END(),1149};11501151memset(&opts,0,sizeof(opts));1152memset(&new,0,sizeof(new));1153 opts.overwrite_ignore =1;1154 opts.prefix = prefix;1155 opts.show_progress = -1;11561157git_config(git_checkout_config, &opts);11581159 opts.track = BRANCH_TRACK_UNSPECIFIED;11601161 argc =parse_options(argc, argv, prefix, options, checkout_usage,1162 PARSE_OPT_KEEP_DASHDASH);11631164if(opts.show_progress <0) {1165if(opts.quiet)1166 opts.show_progress =0;1167else1168 opts.show_progress =isatty(2);1169}11701171if(conflict_style) {1172 opts.merge =1;/* implied */1173git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1174}11751176if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1177die(_("-b, -B and --orphan are mutually exclusive"));11781179/*1180 * From here on, new_branch will contain the branch to be checked out,1181 * and new_branch_force and new_orphan_branch will tell us which one of1182 * -b/-B/--orphan is being used.1183 */1184if(opts.new_branch_force)1185 opts.new_branch = opts.new_branch_force;11861187if(opts.new_orphan_branch)1188 opts.new_branch = opts.new_orphan_branch;11891190/* --track without -b/-B/--orphan should DWIM */1191if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1192const char*argv0 = argv[0];1193if(!argc || !strcmp(argv0,"--"))1194die(_("--track needs a branch name"));1195skip_prefix(argv0,"refs/", &argv0);1196skip_prefix(argv0,"remotes/", &argv0);1197 argv0 =strchr(argv0,'/');1198if(!argv0 || !argv0[1])1199die(_("Missing branch name; try -b"));1200 opts.new_branch = argv0 +1;1201}12021203/*1204 * Extract branch name from command line arguments, so1205 * all that is left is pathspecs.1206 *1207 * Handle1208 *1209 * 1) git checkout <tree> -- [<paths>]1210 * 2) git checkout -- [<paths>]1211 * 3) git checkout <something> [<paths>]1212 *1213 * including "last branch" syntax and DWIM-ery for names of1214 * remote branches, erroring out for invalid or ambiguous cases.1215 */1216if(argc) {1217struct object_id rev;1218int dwim_ok =1219!opts.patch_mode &&1220 dwim_new_local_branch &&1221 opts.track == BRANCH_TRACK_UNSPECIFIED &&1222!opts.new_branch;1223int n =parse_branchname_arg(argc, argv, dwim_ok,1224&new, &opts, &rev);1225 argv += n;1226 argc -= n;1227}12281229if(argc) {1230parse_pathspec(&opts.pathspec,0,1231 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1232 prefix, argv);12331234if(!opts.pathspec.nr)1235die(_("invalid path specification"));12361237/*1238 * Try to give more helpful suggestion.1239 * new_branch && argc > 1 will be caught later.1240 */1241if(opts.new_branch && argc ==1)1242die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),1243 argv[0], opts.new_branch);12441245if(opts.force_detach)1246die(_("git checkout: --detach does not take a path argument '%s'"),1247 argv[0]);12481249if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1250die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1251"checking out of the index."));1252}12531254if(opts.new_branch) {1255struct strbuf buf = STRBUF_INIT;12561257if(opts.new_branch_force)1258 opts.branch_exists =validate_branchname(opts.new_branch, &buf);1259else1260 opts.branch_exists =1261validate_new_branchname(opts.new_branch, &buf,0);1262strbuf_release(&buf);1263}12641265UNLEAK(opts);1266if(opts.patch_mode || opts.pathspec.nr)1267returncheckout_paths(&opts,new.name);1268else1269returncheckout_branch(&opts, &new);1270}