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 const char*const checkout_usage[] = { 25N_("git checkout [<options>] <branch>"), 26N_("git checkout [<options>] [<branch>] -- <file>..."), 27 NULL, 28}; 29 30struct checkout_opts { 31int patch_mode; 32int quiet; 33int merge; 34int force; 35int force_detach; 36int writeout_stage; 37int overwrite_ignore; 38int ignore_skipworktree; 39int ignore_other_worktrees; 40 41const char*new_branch; 42const char*new_branch_force; 43const char*new_orphan_branch; 44int new_branch_log; 45enum branch_track track; 46struct diff_options diff_options; 47 48int branch_exists; 49const char*prefix; 50struct pathspec pathspec; 51struct tree *source_tree; 52 53int new_worktree_mode; 54}; 55 56static intpost_checkout_hook(struct commit *old,struct commit *new, 57int changed) 58{ 59returnrun_hook_le(NULL,"post-checkout", 60sha1_to_hex(old ? old->object.sha1 : null_sha1), 61sha1_to_hex(new?new->object.sha1 : null_sha1), 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->sha1, 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!hashcmp(ce->sha1, old->sha1)) { 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,struct cache_entry *ce,int pos, 159struct 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,struct checkout *state) 174{ 175struct cache_entry *ce = active_cache[pos]; 176const char*path = ce->name; 177 mmfile_t ancestor, ours, theirs; 178int status; 179unsigned char sha1[20]; 180 mmbuffer_t result_buf; 181unsigned char threeway[3][20]; 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; 190hashcpy(threeway[stage -1], ce->sha1); 191if(stage ==2) 192 mode =create_ce_mode(ce->ce_mode); 193 pos++; 194 ce = active_cache[pos]; 195} 196if(is_null_sha1(threeway[1]) ||is_null_sha1(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 just to leak. This hack is 221 * primarily to get to the write_entry() machinery that massages 222 * the contents to work-tree format and writes out which only 223 * allows it for a cache entry. The code in write_entry() needs 224 * to be refactored to allow us to feed a <buffer, size, mode> 225 * instead of a cache entry. Such a refactoring would help 226 * merge_recursive as well (it also writes the merge result to the 227 * object database even when it may contain conflicts). 228 */ 229if(write_sha1_file(result_buf.ptr, result_buf.size, 230 blob_type, sha1)) 231die(_("Unable to add merge result for '%s'"), path); 232 ce =make_cache_entry(mode, sha1, path,2,0); 233if(!ce) 234die(_("make_cache_entry failed for path '%s'"), path); 235 status =checkout_entry(ce, state, NULL); 236return status; 237} 238 239static intcheckout_paths(const struct checkout_opts *opts, 240const char*revision) 241{ 242int pos; 243struct checkout state; 244static char*ps_matched; 245unsigned char rev[20]; 246int flag; 247struct commit *head; 248int errs =0; 249struct lock_file *lock_file; 250 251if(opts->track != BRANCH_TRACK_UNSPECIFIED) 252die(_("'%s' cannot be used with updating paths"),"--track"); 253 254if(opts->new_branch_log) 255die(_("'%s' cannot be used with updating paths"),"-l"); 256 257if(opts->force && opts->patch_mode) 258die(_("'%s' cannot be used with updating paths"),"-f"); 259 260if(opts->force_detach) 261die(_("'%s' cannot be used with updating paths"),"--detach"); 262 263if(opts->merge && opts->patch_mode) 264die(_("'%s' cannot be used with%s"),"--merge","--patch"); 265 266if(opts->force && opts->merge) 267die(_("'%s' cannot be used with%s"),"-f","-m"); 268 269if(opts->new_branch) 270die(_("Cannot update paths and switch to branch '%s' at the same time."), 271 opts->new_branch); 272 273if(opts->patch_mode) 274returnrun_add_interactive(revision,"--patch=checkout", 275&opts->pathspec); 276 277 lock_file =xcalloc(1,sizeof(struct lock_file)); 278 279hold_locked_index(lock_file,1); 280if(read_cache_preload(&opts->pathspec) <0) 281returnerror(_("corrupt index file")); 282 283if(opts->source_tree) 284read_tree_some(opts->source_tree, &opts->pathspec); 285 286 ps_matched =xcalloc(1, opts->pathspec.nr); 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 */ 357memset(&state,0,sizeof(state)); 358 state.force =1; 359 state.refresh_cache =1; 360 state.istate = &the_index; 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 376if(write_locked_index(&the_index, lock_file, COMMIT_LOCK)) 377die(_("unable to write new index file")); 378 379read_ref_full("HEAD",0, rev, &flag); 380 head =lookup_commit_reference_gently(rev,1); 381 382 errs |=post_checkout_hook(head, head,0); 383return errs; 384} 385 386static voidshow_local_changes(struct object *head, 387const struct diff_options *opts) 388{ 389struct rev_info rev; 390/* I think we want full paths, even if we're in a subdirectory. */ 391init_revisions(&rev, NULL); 392 rev.diffopt.flags = opts->flags; 393 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; 394diff_setup_done(&rev.diffopt); 395add_pending_object(&rev, head, NULL); 396run_diff_index(&rev,0); 397} 398 399static voiddescribe_detached_head(const char*msg,struct commit *commit) 400{ 401struct strbuf sb = STRBUF_INIT; 402if(!parse_commit(commit)) 403pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 404fprintf(stderr,"%s %s...%s\n", msg, 405find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), sb.buf); 406strbuf_release(&sb); 407} 408 409static intreset_tree(struct tree *tree,const struct checkout_opts *o, 410int worktree,int*writeout_error) 411{ 412struct unpack_trees_options opts; 413struct tree_desc tree_desc; 414 415memset(&opts,0,sizeof(opts)); 416 opts.head_idx = -1; 417 opts.update = worktree; 418 opts.skip_unmerged = !worktree; 419 opts.reset =1; 420 opts.merge =1; 421 opts.fn = oneway_merge; 422 opts.verbose_update = !o->quiet &&isatty(2); 423 opts.src_index = &the_index; 424 opts.dst_index = &the_index; 425parse_tree(tree); 426init_tree_desc(&tree_desc, tree->buffer, tree->size); 427switch(unpack_trees(1, &tree_desc, &opts)) { 428case-2: 429*writeout_error =1; 430/* 431 * We return 0 nevertheless, as the index is all right 432 * and more importantly we have made best efforts to 433 * update paths in the work tree, and we cannot revert 434 * them. 435 */ 436case0: 437return0; 438default: 439return128; 440} 441} 442 443struct branch_info { 444const char*name;/* The short name used */ 445const char*path;/* The full name of a real branch */ 446struct commit *commit;/* The named commit */ 447/* 448 * if not null the branch is detached because it's already 449 * checked out in this checkout 450 */ 451char*checkout; 452}; 453 454static voidsetup_branch_path(struct branch_info *branch) 455{ 456struct strbuf buf = STRBUF_INIT; 457 458strbuf_branchname(&buf, branch->name); 459if(strcmp(buf.buf, branch->name)) 460 branch->name =xstrdup(buf.buf); 461strbuf_splice(&buf,0,0,"refs/heads/",11); 462 branch->path =strbuf_detach(&buf, NULL); 463} 464 465static intmerge_working_tree(const struct checkout_opts *opts, 466struct branch_info *old, 467struct branch_info *new, 468int*writeout_error) 469{ 470int ret; 471struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file)); 472 473hold_locked_index(lock_file,1); 474if(read_cache_preload(NULL) <0) 475returnerror(_("corrupt index file")); 476 477resolve_undo_clear(); 478if(opts->force) { 479 ret =reset_tree(new->commit->tree, opts,1, writeout_error); 480if(ret) 481return ret; 482}else{ 483struct tree_desc trees[2]; 484struct tree *tree; 485struct unpack_trees_options topts; 486 487memset(&topts,0,sizeof(topts)); 488 topts.head_idx = -1; 489 topts.src_index = &the_index; 490 topts.dst_index = &the_index; 491 492setup_unpack_trees_porcelain(&topts,"checkout"); 493 494refresh_cache(REFRESH_QUIET); 495 496if(unmerged_cache()) { 497error(_("you need to resolve your current index first")); 498return1; 499} 500 501/* 2-way merge to the new branch */ 502 topts.initial_checkout =is_cache_unborn(); 503 topts.update =1; 504 topts.merge =1; 505 topts.gently = opts->merge && old->commit; 506 topts.verbose_update = !opts->quiet &&isatty(2); 507 topts.fn = twoway_merge; 508if(opts->overwrite_ignore) { 509 topts.dir =xcalloc(1,sizeof(*topts.dir)); 510 topts.dir->flags |= DIR_SHOW_IGNORED; 511setup_standard_excludes(topts.dir); 512} 513 tree =parse_tree_indirect(old->commit && !opts->new_worktree_mode ? 514 old->commit->object.sha1 : 515 EMPTY_TREE_SHA1_BIN); 516init_tree_desc(&trees[0], tree->buffer, tree->size); 517 tree =parse_tree_indirect(new->commit->object.sha1); 518init_tree_desc(&trees[1], tree->buffer, tree->size); 519 520 ret =unpack_trees(2, trees, &topts); 521if(ret == -1) { 522/* 523 * Unpack couldn't do a trivial merge; either 524 * give up or do a real merge, depending on 525 * whether the merge flag was used. 526 */ 527struct tree *result; 528struct tree *work; 529struct merge_options o; 530if(!opts->merge) 531return1; 532 533/* 534 * Without old->commit, the below is the same as 535 * the two-tree unpack we already tried and failed. 536 */ 537if(!old->commit) 538return1; 539 540/* Do more real merge */ 541 542/* 543 * We update the index fully, then write the 544 * tree from the index, then merge the new 545 * branch with the current tree, with the old 546 * branch as the base. Then we reset the index 547 * (but not the working tree) to the new 548 * branch, leaving the working tree as the 549 * merged version, but skipping unmerged 550 * entries in the index. 551 */ 552 553add_files_to_cache(NULL, NULL,0); 554/* 555 * NEEDSWORK: carrying over local changes 556 * when branches have different end-of-line 557 * normalization (or clean+smudge rules) is 558 * a pain; plumb in an option to set 559 * o.renormalize? 560 */ 561init_merge_options(&o); 562 o.verbosity =0; 563 work =write_tree_from_memory(&o); 564 565 ret =reset_tree(new->commit->tree, opts,1, 566 writeout_error); 567if(ret) 568return ret; 569 o.ancestor = old->name; 570 o.branch1 =new->name; 571 o.branch2 ="local"; 572merge_trees(&o,new->commit->tree, work, 573 old->commit->tree, &result); 574 ret =reset_tree(new->commit->tree, opts,0, 575 writeout_error); 576if(ret) 577return ret; 578} 579} 580 581if(!active_cache_tree) 582 active_cache_tree =cache_tree(); 583 584if(!cache_tree_fully_valid(active_cache_tree)) 585cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); 586 587if(write_locked_index(&the_index, lock_file, COMMIT_LOCK)) 588die(_("unable to write new index file")); 589 590if(!opts->force && !opts->quiet) 591show_local_changes(&new->commit->object, &opts->diff_options); 592 593return0; 594} 595 596static voidreport_tracking(struct branch_info *new) 597{ 598struct strbuf sb = STRBUF_INIT; 599struct branch *branch =branch_get(new->name); 600 601if(!format_tracking_info(branch, &sb)) 602return; 603fputs(sb.buf, stdout); 604strbuf_release(&sb); 605} 606 607static voidupdate_refs_for_switch(const struct checkout_opts *opts, 608struct branch_info *old, 609struct branch_info *new) 610{ 611struct strbuf msg = STRBUF_INIT; 612const char*old_desc, *reflog_msg; 613if(opts->new_branch) { 614if(opts->new_orphan_branch) { 615if(opts->new_branch_log && !log_all_ref_updates) { 616int ret; 617char*refname; 618struct strbuf err = STRBUF_INIT; 619 620 refname =mkpathdup("refs/heads/%s", opts->new_orphan_branch); 621 ret =safe_create_reflog(refname,1, &err); 622free(refname); 623if(ret) { 624fprintf(stderr,_("Can not do reflog for '%s':%s\n"), 625 opts->new_orphan_branch, err.buf); 626strbuf_release(&err); 627return; 628} 629strbuf_release(&err); 630} 631} 632else 633create_branch(old->name, opts->new_branch,new->name, 634 opts->new_branch_force ?1:0, 635 opts->new_branch_log, 636 opts->new_branch_force ?1:0, 637 opts->quiet, 638 opts->track); 639new->name = opts->new_branch; 640setup_branch_path(new); 641} 642 643 old_desc = old->name; 644if(!old_desc && old->commit) 645 old_desc =sha1_to_hex(old->commit->object.sha1); 646 647 reflog_msg =getenv("GIT_REFLOG_ACTION"); 648if(!reflog_msg) 649strbuf_addf(&msg,"checkout: moving from%sto%s", 650 old_desc ? old_desc :"(invalid)",new->name); 651else 652strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 653 654if(!strcmp(new->name,"HEAD") && !new->path && !opts->force_detach) { 655/* Nothing to do. */ 656}else if(opts->force_detach || !new->path) {/* No longer on any branch. */ 657update_ref(msg.buf,"HEAD",new->commit->object.sha1, NULL, 658 REF_NODEREF, UPDATE_REFS_DIE_ON_ERR); 659if(!opts->quiet) { 660if(old->path && advice_detached_head) 661detach_advice(new->name); 662describe_detached_head(_("HEAD is now at"),new->commit); 663} 664}else if(new->path) {/* Switch branches. */ 665create_symref("HEAD",new->path, msg.buf); 666if(!opts->quiet) { 667if(old->path && !strcmp(new->path, old->path)) { 668if(opts->new_branch_force) 669fprintf(stderr,_("Reset branch '%s'\n"), 670new->name); 671else 672fprintf(stderr,_("Already on '%s'\n"), 673new->name); 674}else if(opts->new_branch) { 675if(opts->branch_exists) 676fprintf(stderr,_("Switched to and reset branch '%s'\n"),new->name); 677else 678fprintf(stderr,_("Switched to a new branch '%s'\n"),new->name); 679}else{ 680fprintf(stderr,_("Switched to branch '%s'\n"), 681new->name); 682} 683} 684if(old->path && old->name) { 685if(!ref_exists(old->path) &&reflog_exists(old->path)) 686delete_reflog(old->path); 687} 688} 689remove_branch_state(); 690strbuf_release(&msg); 691if(!opts->quiet && 692(new->path || (!opts->force_detach && !strcmp(new->name,"HEAD")))) 693report_tracking(new); 694} 695 696static intadd_pending_uninteresting_ref(const char*refname, 697const struct object_id *oid, 698int flags,void*cb_data) 699{ 700add_pending_sha1(cb_data, refname, oid->hash, UNINTERESTING); 701return0; 702} 703 704static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 705{ 706strbuf_addstr(sb," "); 707strbuf_addstr(sb, 708find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); 709strbuf_addch(sb,' '); 710if(!parse_commit(commit)) 711pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 712strbuf_addch(sb,'\n'); 713} 714 715#define ORPHAN_CUTOFF 4 716static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 717{ 718struct commit *c, *last = NULL; 719struct strbuf sb = STRBUF_INIT; 720int lost =0; 721while((c =get_revision(revs)) != NULL) { 722if(lost < ORPHAN_CUTOFF) 723describe_one_orphan(&sb, c); 724 last = c; 725 lost++; 726} 727if(ORPHAN_CUTOFF < lost) { 728int more = lost - ORPHAN_CUTOFF; 729if(more ==1) 730describe_one_orphan(&sb, last); 731else 732strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 733} 734 735fprintf(stderr, 736Q_( 737/* The singular version */ 738"Warning: you are leaving%dcommit behind, " 739"not connected to\n" 740"any of your branches:\n\n" 741"%s\n", 742/* The plural version */ 743"Warning: you are leaving%dcommits behind, " 744"not connected to\n" 745"any of your branches:\n\n" 746"%s\n", 747/* Give ngettext() the count */ 748 lost), 749 lost, 750 sb.buf); 751strbuf_release(&sb); 752 753if(advice_detached_head) 754fprintf(stderr, 755Q_( 756/* The singular version */ 757"If you want to keep it by creating a new branch, " 758"this may be a good time\nto do so with:\n\n" 759" git branch <new-branch-name>%s\n\n", 760/* The plural version */ 761"If you want to keep them by creating a new branch, " 762"this may be a good time\nto do so with:\n\n" 763" git branch <new-branch-name>%s\n\n", 764/* Give ngettext() the count */ 765 lost), 766find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); 767} 768 769/* 770 * We are about to leave commit that was at the tip of a detached 771 * HEAD. If it is not reachable from any ref, this is the last chance 772 * for the user to do so without resorting to reflog. 773 */ 774static voidorphaned_commit_warning(struct commit *old,struct commit *new) 775{ 776struct rev_info revs; 777struct object *object = &old->object; 778struct object_array refs; 779 780init_revisions(&revs, NULL); 781setup_revisions(0, NULL, &revs, NULL); 782 783 object->flags &= ~UNINTERESTING; 784add_pending_object(&revs, object,sha1_to_hex(object->sha1)); 785 786for_each_ref(add_pending_uninteresting_ref, &revs); 787add_pending_sha1(&revs,"HEAD",new->object.sha1, UNINTERESTING); 788 789 refs = revs.pending; 790 revs.leak_pending =1; 791 792if(prepare_revision_walk(&revs)) 793die(_("internal error in revision walk")); 794if(!(old->object.flags & UNINTERESTING)) 795suggest_reattach(old, &revs); 796else 797describe_detached_head(_("Previous HEAD position was"), old); 798 799clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS); 800free(refs.objects); 801} 802 803static intswitch_branches(const struct checkout_opts *opts, 804struct branch_info *new) 805{ 806int ret =0; 807struct branch_info old; 808void*path_to_free; 809unsigned char rev[20]; 810int flag, writeout_error =0; 811memset(&old,0,sizeof(old)); 812 old.path = path_to_free =resolve_refdup("HEAD",0, rev, &flag); 813 old.commit =lookup_commit_reference_gently(rev,1); 814if(!(flag & REF_ISSYMREF)) 815 old.path = NULL; 816 817if(old.path) 818skip_prefix(old.path,"refs/heads/", &old.name); 819 820if(!new->name) { 821new->name ="HEAD"; 822new->commit = old.commit; 823if(!new->commit) 824die(_("You are on a branch yet to be born")); 825parse_commit_or_die(new->commit); 826} 827 828 ret =merge_working_tree(opts, &old,new, &writeout_error); 829if(ret) { 830free(path_to_free); 831return ret; 832} 833 834if(!opts->quiet && !old.path && old.commit && 835new->commit != old.commit && !opts->new_worktree_mode) 836orphaned_commit_warning(old.commit,new->commit); 837 838update_refs_for_switch(opts, &old,new); 839 840 ret =post_checkout_hook(old.commit,new->commit,1); 841free(path_to_free); 842return ret || writeout_error; 843} 844 845static intgit_checkout_config(const char*var,const char*value,void*cb) 846{ 847if(!strcmp(var,"diff.ignoresubmodules")) { 848struct checkout_opts *opts = cb; 849handle_ignore_submodules_arg(&opts->diff_options, value); 850return0; 851} 852 853if(starts_with(var,"submodule.")) 854returnparse_submodule_config_option(var, value); 855 856returngit_xmerge_config(var, value, NULL); 857} 858 859struct tracking_name_data { 860/* const */char*src_ref; 861char*dst_ref; 862unsigned char*dst_sha1; 863int unique; 864}; 865 866static intcheck_tracking_name(struct remote *remote,void*cb_data) 867{ 868struct tracking_name_data *cb = cb_data; 869struct refspec query; 870memset(&query,0,sizeof(struct refspec)); 871 query.src = cb->src_ref; 872if(remote_find_tracking(remote, &query) || 873get_sha1(query.dst, cb->dst_sha1)) { 874free(query.dst); 875return0; 876} 877if(cb->dst_ref) { 878free(query.dst); 879 cb->unique =0; 880return0; 881} 882 cb->dst_ref = query.dst; 883return0; 884} 885 886static const char*unique_tracking_name(const char*name,unsigned char*sha1) 887{ 888struct tracking_name_data cb_data = { NULL, NULL, NULL,1}; 889char src_ref[PATH_MAX]; 890snprintf(src_ref, PATH_MAX,"refs/heads/%s", name); 891 cb_data.src_ref = src_ref; 892 cb_data.dst_sha1 = sha1; 893for_each_remote(check_tracking_name, &cb_data); 894if(cb_data.unique) 895return cb_data.dst_ref; 896free(cb_data.dst_ref); 897return NULL; 898} 899 900static voidcheck_linked_checkout(struct branch_info *new,const char*id) 901{ 902struct strbuf sb = STRBUF_INIT; 903struct strbuf path = STRBUF_INIT; 904struct strbuf gitdir = STRBUF_INIT; 905const char*start, *end; 906 907if(id) 908strbuf_addf(&path,"%s/worktrees/%s/HEAD",get_git_common_dir(), id); 909else 910strbuf_addf(&path,"%s/HEAD",get_git_common_dir()); 911 912if(strbuf_read_file(&sb, path.buf,0) <0|| 913!skip_prefix(sb.buf,"ref:", &start)) 914goto done; 915while(isspace(*start)) 916 start++; 917 end = start; 918while(*end && !isspace(*end)) 919 end++; 920if(strncmp(start,new->path, end - start) ||new->path[end - start] !='\0') 921goto done; 922if(id) { 923strbuf_reset(&path); 924strbuf_addf(&path,"%s/worktrees/%s/gitdir",get_git_common_dir(), id); 925if(strbuf_read_file(&gitdir, path.buf,0) <=0) 926goto done; 927strbuf_rtrim(&gitdir); 928}else 929strbuf_addstr(&gitdir,get_git_common_dir()); 930die(_("'%s' is already checked out at '%s'"),new->name, gitdir.buf); 931done: 932strbuf_release(&path); 933strbuf_release(&sb); 934strbuf_release(&gitdir); 935} 936 937static voidcheck_linked_checkouts(struct branch_info *new) 938{ 939struct strbuf path = STRBUF_INIT; 940DIR*dir; 941struct dirent *d; 942 943strbuf_addf(&path,"%s/worktrees",get_git_common_dir()); 944if((dir =opendir(path.buf)) == NULL) { 945strbuf_release(&path); 946return; 947} 948 949/* 950 * $GIT_COMMON_DIR/HEAD is practically outside 951 * $GIT_DIR so resolve_ref_unsafe() won't work (it 952 * uses git_path). Parse the ref ourselves. 953 */ 954check_linked_checkout(new, NULL); 955 956while((d =readdir(dir)) != NULL) { 957if(!strcmp(d->d_name,".") || !strcmp(d->d_name,"..")) 958continue; 959check_linked_checkout(new, d->d_name); 960} 961strbuf_release(&path); 962closedir(dir); 963} 964 965static intparse_branchname_arg(int argc,const char**argv, 966int dwim_new_local_branch_ok, 967struct branch_info *new, 968struct checkout_opts *opts, 969unsigned char rev[20]) 970{ 971struct tree **source_tree = &opts->source_tree; 972const char**new_branch = &opts->new_branch; 973int argcount =0; 974unsigned char branch_rev[20]; 975const char*arg; 976int dash_dash_pos; 977int has_dash_dash =0; 978int i; 979 980/* 981 * case 1: git checkout <ref> -- [<paths>] 982 * 983 * <ref> must be a valid tree, everything after the '--' must be 984 * a path. 985 * 986 * case 2: git checkout -- [<paths>] 987 * 988 * everything after the '--' must be paths. 989 * 990 * case 3: git checkout <something> [--] 991 * 992 * (a) If <something> is a commit, that is to 993 * switch to the branch or detach HEAD at it. As a special case, 994 * if <something> is A...B (missing A or B means HEAD but you can 995 * omit at most one side), and if there is a unique merge base 996 * between A and B, A...B names that merge base. 997 * 998 * (b) If <something> is _not_ a commit, either "--" is present 999 * or <something> is not a path, no -t or -b was given, and1000 * and there is a tracking branch whose name is <something>1001 * in one and only one remote, then this is a short-hand to1002 * fork local <something> from that remote-tracking branch.1003 *1004 * (c) Otherwise, if "--" is present, treat it like case (1).1005 *1006 * (d) Otherwise :1007 * - if it's a reference, treat it like case (1)1008 * - else if it's a path, treat it like case (2)1009 * - else: fail.1010 *1011 * case 4: git checkout <something> <paths>1012 *1013 * The first argument must not be ambiguous.1014 * - If it's *only* a reference, treat it like case (1).1015 * - If it's only a path, treat it like case (2).1016 * - else: fail.1017 *1018 */1019if(!argc)1020return0;10211022 arg = argv[0];1023 dash_dash_pos = -1;1024for(i =0; i < argc; i++) {1025if(!strcmp(argv[i],"--")) {1026 dash_dash_pos = i;1027break;1028}1029}1030if(dash_dash_pos ==0)1031return1;/* case (2) */1032else if(dash_dash_pos ==1)1033 has_dash_dash =1;/* case (3) or (1) */1034else if(dash_dash_pos >=2)1035die(_("only one reference expected,%dgiven."), dash_dash_pos);10361037if(!strcmp(arg,"-"))1038 arg ="@{-1}";10391040if(get_sha1_mb(arg, rev)) {1041/*1042 * Either case (3) or (4), with <something> not being1043 * a commit, or an attempt to use case (1) with an1044 * invalid ref.1045 *1046 * It's likely an error, but we need to find out if1047 * we should auto-create the branch, case (3).(b).1048 */1049int recover_with_dwim = dwim_new_local_branch_ok;10501051if(check_filename(NULL, arg) && !has_dash_dash)1052 recover_with_dwim =0;1053/*1054 * Accept "git checkout foo" and "git checkout foo --"1055 * as candidates for dwim.1056 */1057if(!(argc ==1&& !has_dash_dash) &&1058!(argc ==2&& has_dash_dash))1059 recover_with_dwim =0;10601061if(recover_with_dwim) {1062const char*remote =unique_tracking_name(arg, rev);1063if(remote) {1064*new_branch = arg;1065 arg = remote;1066/* DWIMmed to create local branch, case (3).(b) */1067}else{1068 recover_with_dwim =0;1069}1070}10711072if(!recover_with_dwim) {1073if(has_dash_dash)1074die(_("invalid reference:%s"), arg);1075return argcount;1076}1077}10781079/* we can't end up being in (2) anymore, eat the argument */1080 argcount++;1081 argv++;1082 argc--;10831084new->name = arg;1085setup_branch_path(new);10861087if(!check_refname_format(new->path,0) &&1088!read_ref(new->path, branch_rev))1089hashcpy(rev, branch_rev);1090else1091new->path = NULL;/* not an existing branch */10921093new->commit =lookup_commit_reference_gently(rev,1);1094if(!new->commit) {1095/* not a commit */1096*source_tree =parse_tree_indirect(rev);1097}else{1098parse_commit_or_die(new->commit);1099*source_tree =new->commit->tree;1100}11011102if(!*source_tree)/* case (1): want a tree */1103die(_("reference is not a tree:%s"), arg);1104if(!has_dash_dash) {/* case (3).(d) -> (1) */1105/*1106 * Do not complain the most common case1107 * git checkout branch1108 * even if there happen to be a file called 'branch';1109 * it would be extremely annoying.1110 */1111if(argc)1112verify_non_filename(NULL, arg);1113}else{1114 argcount++;1115 argv++;1116 argc--;1117}11181119return argcount;1120}11211122static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1123{1124int status;1125struct strbuf branch_ref = STRBUF_INIT;11261127if(!opts->new_branch)1128die(_("You are on a branch yet to be born"));1129strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1130 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1131strbuf_release(&branch_ref);1132if(!opts->quiet)1133fprintf(stderr,_("Switched to a new branch '%s'\n"),1134 opts->new_branch);1135return status;1136}11371138static intcheckout_branch(struct checkout_opts *opts,1139struct branch_info *new)1140{1141if(opts->pathspec.nr)1142die(_("paths cannot be used with switching branches"));11431144if(opts->patch_mode)1145die(_("'%s' cannot be used with switching branches"),1146"--patch");11471148if(opts->writeout_stage)1149die(_("'%s' cannot be used with switching branches"),1150"--ours/--theirs");11511152if(opts->force && opts->merge)1153die(_("'%s' cannot be used with '%s'"),"-f","-m");11541155if(opts->force_detach && opts->new_branch)1156die(_("'%s' cannot be used with '%s'"),1157"--detach","-b/-B/--orphan");11581159if(opts->new_orphan_branch) {1160if(opts->track != BRANCH_TRACK_UNSPECIFIED)1161die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1162}else if(opts->force_detach) {1163if(opts->track != BRANCH_TRACK_UNSPECIFIED)1164die(_("'%s' cannot be used with '%s'"),"--detach","-t");1165}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1166 opts->track = git_branch_track;11671168if(new->name && !new->commit)1169die(_("Cannot switch branch to a non-commit '%s'"),1170new->name);11711172if(new->path && !opts->force_detach && !opts->new_branch) {1173unsigned char sha1[20];1174int flag;1175char*head_ref =resolve_refdup("HEAD",0, sha1, &flag);1176if(head_ref &&1177(!(flag & REF_ISSYMREF) ||strcmp(head_ref,new->path)) &&1178!opts->ignore_other_worktrees)1179check_linked_checkouts(new);1180free(head_ref);1181}11821183if(!new->commit && opts->new_branch) {1184unsigned char rev[20];1185int flag;11861187if(!read_ref_full("HEAD",0, rev, &flag) &&1188(flag & REF_ISSYMREF) &&is_null_sha1(rev))1189returnswitch_unborn_to_new_branch(opts);1190}1191returnswitch_branches(opts,new);1192}11931194intcmd_checkout(int argc,const char**argv,const char*prefix)1195{1196struct checkout_opts opts;1197struct branch_info new;1198char*conflict_style = NULL;1199int dwim_new_local_branch =1;1200struct option options[] = {1201OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1202OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1203N_("create and checkout a new branch")),1204OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1205N_("create/reset and checkout a branch")),1206OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1207OPT_BOOL(0,"detach", &opts.force_detach,N_("detach the HEAD at named commit")),1208OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1209 BRANCH_TRACK_EXPLICIT),1210OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1211OPT_SET_INT('2',"ours", &opts.writeout_stage,N_("checkout our version for unmerged files"),12122),1213OPT_SET_INT('3',"theirs", &opts.writeout_stage,N_("checkout their version for unmerged files"),12143),1215OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)")),1216OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1217OPT_BOOL(0,"overwrite-ignore", &opts.overwrite_ignore,N_("update ignored files (default)")),1218OPT_STRING(0,"conflict", &conflict_style,N_("style"),1219N_("conflict style (merge or diff3)")),1220OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1221OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1222N_("do not limit pathspecs to sparse entries only")),1223OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1224N_("second guess 'git checkout <no-such-branch>'")),1225OPT_BOOL(0,"ignore-other-worktrees", &opts.ignore_other_worktrees,1226N_("do not check if another worktree is holding the given ref")),1227OPT_END(),1228};12291230memset(&opts,0,sizeof(opts));1231memset(&new,0,sizeof(new));1232 opts.overwrite_ignore =1;1233 opts.prefix = prefix;12341235gitmodules_config();1236git_config(git_checkout_config, &opts);12371238 opts.track = BRANCH_TRACK_UNSPECIFIED;12391240 argc =parse_options(argc, argv, prefix, options, checkout_usage,1241 PARSE_OPT_KEEP_DASHDASH);12421243 opts.new_worktree_mode =getenv("GIT_CHECKOUT_NEW_WORKTREE") != NULL;12441245if(conflict_style) {1246 opts.merge =1;/* implied */1247git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1248}12491250if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1251die(_("-b, -B and --orphan are mutually exclusive"));12521253/*1254 * From here on, new_branch will contain the branch to be checked out,1255 * and new_branch_force and new_orphan_branch will tell us which one of1256 * -b/-B/--orphan is being used.1257 */1258if(opts.new_branch_force)1259 opts.new_branch = opts.new_branch_force;12601261if(opts.new_orphan_branch)1262 opts.new_branch = opts.new_orphan_branch;12631264/* --track without -b/-B/--orphan should DWIM */1265if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1266const char*argv0 = argv[0];1267if(!argc || !strcmp(argv0,"--"))1268die(_("--track needs a branch name"));1269skip_prefix(argv0,"refs/", &argv0);1270skip_prefix(argv0,"remotes/", &argv0);1271 argv0 =strchr(argv0,'/');1272if(!argv0 || !argv0[1])1273die(_("Missing branch name; try -b"));1274 opts.new_branch = argv0 +1;1275}12761277/*1278 * Extract branch name from command line arguments, so1279 * all that is left is pathspecs.1280 *1281 * Handle1282 *1283 * 1) git checkout <tree> -- [<paths>]1284 * 2) git checkout -- [<paths>]1285 * 3) git checkout <something> [<paths>]1286 *1287 * including "last branch" syntax and DWIM-ery for names of1288 * remote branches, erroring out for invalid or ambiguous cases.1289 */1290if(argc) {1291unsigned char rev[20];1292int dwim_ok =1293!opts.patch_mode &&1294 dwim_new_local_branch &&1295 opts.track == BRANCH_TRACK_UNSPECIFIED &&1296!opts.new_branch;1297int n =parse_branchname_arg(argc, argv, dwim_ok,1298&new, &opts, rev);1299 argv += n;1300 argc -= n;1301}13021303if(argc) {1304parse_pathspec(&opts.pathspec,0,1305 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1306 prefix, argv);13071308if(!opts.pathspec.nr)1309die(_("invalid path specification"));13101311/*1312 * Try to give more helpful suggestion.1313 * new_branch && argc > 1 will be caught later.1314 */1315if(opts.new_branch && argc ==1)1316die(_("Cannot update paths and switch to branch '%s' at the same time.\n"1317"Did you intend to checkout '%s' which can not be resolved as commit?"),1318 opts.new_branch, argv[0]);13191320if(opts.force_detach)1321die(_("git checkout: --detach does not take a path argument '%s'"),1322 argv[0]);13231324if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1325die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1326"checking out of the index."));1327}13281329if(opts.new_branch) {1330struct strbuf buf = STRBUF_INIT;13311332 opts.branch_exists =1333validate_new_branchname(opts.new_branch, &buf,1334!!opts.new_branch_force,1335!!opts.new_branch_force);13361337strbuf_release(&buf);1338}13391340if(opts.patch_mode || opts.pathspec.nr)1341returncheckout_paths(&opts,new.name);1342else1343returncheckout_branch(&opts, &new);1344}