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