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