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