1#include"cache.h" 2#include"builtin.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#include"argv-array.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; 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; 339for(pos =0; pos < active_nr; pos++) { 340struct cache_entry *ce = active_cache[pos]; 341if(ce->ce_flags & CE_MATCHED) { 342if(!ce_stage(ce)) { 343 errs |=checkout_entry(ce, &state, NULL); 344continue; 345} 346if(opts->writeout_stage) 347 errs |=checkout_stage(opts->writeout_stage, ce, pos, &state); 348else if(opts->merge) 349 errs |=checkout_merged(pos, &state); 350 pos =skip_same_name(ce, pos) -1; 351} 352} 353 354if(write_locked_index(&the_index, lock_file, COMMIT_LOCK)) 355die(_("unable to write new index file")); 356 357read_ref_full("HEAD", rev,0, &flag); 358 head =lookup_commit_reference_gently(rev,1); 359 360 errs |=post_checkout_hook(head, head,0); 361return errs; 362} 363 364static voidshow_local_changes(struct object *head, 365const struct diff_options *opts) 366{ 367struct rev_info rev; 368/* I think we want full paths, even if we're in a subdirectory. */ 369init_revisions(&rev, NULL); 370 rev.diffopt.flags = opts->flags; 371 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; 372diff_setup_done(&rev.diffopt); 373add_pending_object(&rev, head, NULL); 374run_diff_index(&rev,0); 375} 376 377static voiddescribe_detached_head(const char*msg,struct commit *commit) 378{ 379struct strbuf sb = STRBUF_INIT; 380if(!parse_commit(commit)) 381pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 382fprintf(stderr,"%s %s...%s\n", msg, 383find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), sb.buf); 384strbuf_release(&sb); 385} 386 387static intreset_tree(struct tree *tree,const struct checkout_opts *o, 388int worktree,int*writeout_error) 389{ 390struct unpack_trees_options opts; 391struct tree_desc tree_desc; 392 393memset(&opts,0,sizeof(opts)); 394 opts.head_idx = -1; 395 opts.update = worktree; 396 opts.skip_unmerged = !worktree; 397 opts.reset =1; 398 opts.merge =1; 399 opts.fn = oneway_merge; 400 opts.verbose_update = !o->quiet &&isatty(2); 401 opts.src_index = &the_index; 402 opts.dst_index = &the_index; 403parse_tree(tree); 404init_tree_desc(&tree_desc, tree->buffer, tree->size); 405switch(unpack_trees(1, &tree_desc, &opts)) { 406case-2: 407*writeout_error =1; 408/* 409 * We return 0 nevertheless, as the index is all right 410 * and more importantly we have made best efforts to 411 * update paths in the work tree, and we cannot revert 412 * them. 413 */ 414case0: 415return0; 416default: 417return128; 418} 419} 420 421struct branch_info { 422const char*name;/* The short name used */ 423const char*path;/* The full name of a real branch */ 424struct commit *commit;/* The named commit */ 425}; 426 427static voidsetup_branch_path(struct branch_info *branch) 428{ 429struct strbuf buf = STRBUF_INIT; 430 431strbuf_branchname(&buf, branch->name); 432if(strcmp(buf.buf, branch->name)) 433 branch->name =xstrdup(buf.buf); 434strbuf_splice(&buf,0,0,"refs/heads/",11); 435 branch->path =strbuf_detach(&buf, NULL); 436} 437 438static intmerge_working_tree(const struct checkout_opts *opts, 439struct branch_info *old, 440struct branch_info *new, 441int*writeout_error) 442{ 443int ret; 444struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file)); 445 446hold_locked_index(lock_file,1); 447if(read_cache_preload(NULL) <0) 448returnerror(_("corrupt index file")); 449 450resolve_undo_clear(); 451if(opts->force) { 452 ret =reset_tree(new->commit->tree, opts,1, writeout_error); 453if(ret) 454return ret; 455}else{ 456struct tree_desc trees[2]; 457struct tree *tree; 458struct unpack_trees_options topts; 459 460memset(&topts,0,sizeof(topts)); 461 topts.head_idx = -1; 462 topts.src_index = &the_index; 463 topts.dst_index = &the_index; 464 465setup_unpack_trees_porcelain(&topts,"checkout"); 466 467refresh_cache(REFRESH_QUIET); 468 469if(unmerged_cache()) { 470error(_("you need to resolve your current index first")); 471return1; 472} 473 474/* 2-way merge to the new branch */ 475 topts.initial_checkout =is_cache_unborn(); 476 topts.update =1; 477 topts.merge =1; 478 topts.gently = opts->merge && old->commit; 479 topts.verbose_update = !opts->quiet &&isatty(2); 480 topts.fn = twoway_merge; 481if(opts->overwrite_ignore) { 482 topts.dir =xcalloc(1,sizeof(*topts.dir)); 483 topts.dir->flags |= DIR_SHOW_IGNORED; 484setup_standard_excludes(topts.dir); 485} 486 tree =parse_tree_indirect(old->commit ? 487 old->commit->object.sha1 : 488 EMPTY_TREE_SHA1_BIN); 489init_tree_desc(&trees[0], tree->buffer, tree->size); 490 tree =parse_tree_indirect(new->commit->object.sha1); 491init_tree_desc(&trees[1], tree->buffer, tree->size); 492 493 ret =unpack_trees(2, trees, &topts); 494if(ret == -1) { 495/* 496 * Unpack couldn't do a trivial merge; either 497 * give up or do a real merge, depending on 498 * whether the merge flag was used. 499 */ 500struct tree *result; 501struct tree *work; 502struct merge_options o; 503if(!opts->merge) 504return1; 505 506/* 507 * Without old->commit, the below is the same as 508 * the two-tree unpack we already tried and failed. 509 */ 510if(!old->commit) 511return1; 512 513/* Do more real merge */ 514 515/* 516 * We update the index fully, then write the 517 * tree from the index, then merge the new 518 * branch with the current tree, with the old 519 * branch as the base. Then we reset the index 520 * (but not the working tree) to the new 521 * branch, leaving the working tree as the 522 * merged version, but skipping unmerged 523 * entries in the index. 524 */ 525 526add_files_to_cache(NULL, NULL,0); 527/* 528 * NEEDSWORK: carrying over local changes 529 * when branches have different end-of-line 530 * normalization (or clean+smudge rules) is 531 * a pain; plumb in an option to set 532 * o.renormalize? 533 */ 534init_merge_options(&o); 535 o.verbosity =0; 536 work =write_tree_from_memory(&o); 537 538 ret =reset_tree(new->commit->tree, opts,1, 539 writeout_error); 540if(ret) 541return ret; 542 o.ancestor = old->name; 543 o.branch1 =new->name; 544 o.branch2 ="local"; 545merge_trees(&o,new->commit->tree, work, 546 old->commit->tree, &result); 547 ret =reset_tree(new->commit->tree, opts,0, 548 writeout_error); 549if(ret) 550return ret; 551} 552} 553 554if(write_locked_index(&the_index, lock_file, COMMIT_LOCK)) 555die(_("unable to write new index file")); 556 557if(!opts->force && !opts->quiet) 558show_local_changes(&new->commit->object, &opts->diff_options); 559 560return0; 561} 562 563static voidreport_tracking(struct branch_info *new) 564{ 565struct strbuf sb = STRBUF_INIT; 566struct branch *branch =branch_get(new->name); 567 568if(!format_tracking_info(branch, &sb)) 569return; 570fputs(sb.buf, stdout); 571strbuf_release(&sb); 572} 573 574static voidupdate_refs_for_switch(const struct checkout_opts *opts, 575struct branch_info *old, 576struct branch_info *new) 577{ 578struct strbuf msg = STRBUF_INIT; 579const char*old_desc, *reflog_msg; 580if(opts->new_branch) { 581if(opts->new_orphan_branch) { 582if(opts->new_branch_log && !log_all_ref_updates) { 583int temp; 584char log_file[PATH_MAX]; 585char*ref_name =mkpath("refs/heads/%s", opts->new_orphan_branch); 586 587 temp = log_all_ref_updates; 588 log_all_ref_updates =1; 589if(log_ref_setup(ref_name, log_file,sizeof(log_file))) { 590fprintf(stderr,_("Can not do reflog for '%s'\n"), 591 opts->new_orphan_branch); 592 log_all_ref_updates = temp; 593return; 594} 595 log_all_ref_updates = temp; 596} 597} 598else 599create_branch(old->name, opts->new_branch,new->name, 600 opts->new_branch_force ?1:0, 601 opts->new_branch_log, 602 opts->new_branch_force ?1:0, 603 opts->quiet, 604 opts->track); 605new->name = opts->new_branch; 606setup_branch_path(new); 607} 608 609 old_desc = old->name; 610if(!old_desc && old->commit) 611 old_desc =sha1_to_hex(old->commit->object.sha1); 612 613 reflog_msg =getenv("GIT_REFLOG_ACTION"); 614if(!reflog_msg) 615strbuf_addf(&msg,"checkout: moving from%sto%s", 616 old_desc ? old_desc :"(invalid)",new->name); 617else 618strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 619 620if(!strcmp(new->name,"HEAD") && !new->path && !opts->force_detach) { 621/* Nothing to do. */ 622}else if(opts->force_detach || !new->path) {/* No longer on any branch. */ 623update_ref(msg.buf,"HEAD",new->commit->object.sha1, NULL, 624 REF_NODEREF, DIE_ON_ERR); 625if(!opts->quiet) { 626if(old->path && advice_detached_head) 627detach_advice(new->name); 628describe_detached_head(_("HEAD is now at"),new->commit); 629} 630}else if(new->path) {/* Switch branches. */ 631create_symref("HEAD",new->path, msg.buf); 632if(!opts->quiet) { 633if(old->path && !strcmp(new->path, old->path)) { 634if(opts->new_branch_force) 635fprintf(stderr,_("Reset branch '%s'\n"), 636new->name); 637else 638fprintf(stderr,_("Already on '%s'\n"), 639new->name); 640}else if(opts->new_branch) { 641if(opts->branch_exists) 642fprintf(stderr,_("Switched to and reset branch '%s'\n"),new->name); 643else 644fprintf(stderr,_("Switched to a new branch '%s'\n"),new->name); 645}else{ 646fprintf(stderr,_("Switched to branch '%s'\n"), 647new->name); 648} 649} 650if(old->path && old->name) { 651char log_file[PATH_MAX], ref_file[PATH_MAX]; 652 653git_snpath(log_file,sizeof(log_file),"logs/%s", old->path); 654git_snpath(ref_file,sizeof(ref_file),"%s", old->path); 655if(!file_exists(ref_file) &&file_exists(log_file)) 656remove_path(log_file); 657} 658} 659remove_branch_state(); 660strbuf_release(&msg); 661if(!opts->quiet && 662(new->path || (!opts->force_detach && !strcmp(new->name,"HEAD")))) 663report_tracking(new); 664} 665 666static intadd_pending_uninteresting_ref(const char*refname, 667const unsigned char*sha1, 668int flags,void*cb_data) 669{ 670add_pending_sha1(cb_data, refname, sha1, UNINTERESTING); 671return0; 672} 673 674static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 675{ 676strbuf_addstr(sb," "); 677strbuf_addstr(sb, 678find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); 679strbuf_addch(sb,' '); 680if(!parse_commit(commit)) 681pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 682strbuf_addch(sb,'\n'); 683} 684 685#define ORPHAN_CUTOFF 4 686static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 687{ 688struct commit *c, *last = NULL; 689struct strbuf sb = STRBUF_INIT; 690int lost =0; 691while((c =get_revision(revs)) != NULL) { 692if(lost < ORPHAN_CUTOFF) 693describe_one_orphan(&sb, c); 694 last = c; 695 lost++; 696} 697if(ORPHAN_CUTOFF < lost) { 698int more = lost - ORPHAN_CUTOFF; 699if(more ==1) 700describe_one_orphan(&sb, last); 701else 702strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 703} 704 705fprintf(stderr, 706Q_( 707/* The singular version */ 708"Warning: you are leaving%dcommit behind, " 709"not connected to\n" 710"any of your branches:\n\n" 711"%s\n", 712/* The plural version */ 713"Warning: you are leaving%dcommits behind, " 714"not connected to\n" 715"any of your branches:\n\n" 716"%s\n", 717/* Give ngettext() the count */ 718 lost), 719 lost, 720 sb.buf); 721strbuf_release(&sb); 722 723if(advice_detached_head) 724fprintf(stderr, 725_( 726"If you want to keep them by creating a new branch, " 727"this may be a good time\nto do so with:\n\n" 728" git branch new_branch_name%s\n\n"), 729find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); 730} 731 732/* 733 * We are about to leave commit that was at the tip of a detached 734 * HEAD. If it is not reachable from any ref, this is the last chance 735 * for the user to do so without resorting to reflog. 736 */ 737static voidorphaned_commit_warning(struct commit *old,struct commit *new) 738{ 739struct rev_info revs; 740struct object *object = &old->object; 741struct object_array refs; 742 743init_revisions(&revs, NULL); 744setup_revisions(0, NULL, &revs, NULL); 745 746 object->flags &= ~UNINTERESTING; 747add_pending_object(&revs, object,sha1_to_hex(object->sha1)); 748 749for_each_ref(add_pending_uninteresting_ref, &revs); 750add_pending_sha1(&revs,"HEAD",new->object.sha1, UNINTERESTING); 751 752 refs = revs.pending; 753 revs.leak_pending =1; 754 755if(prepare_revision_walk(&revs)) 756die(_("internal error in revision walk")); 757if(!(old->object.flags & UNINTERESTING)) 758suggest_reattach(old, &revs); 759else 760describe_detached_head(_("Previous HEAD position was"), old); 761 762clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS); 763free(refs.objects); 764} 765 766static intswitch_branches(const struct checkout_opts *opts, 767struct branch_info *new) 768{ 769int ret =0; 770struct branch_info old; 771void*path_to_free; 772unsigned char rev[20]; 773int flag, writeout_error =0; 774memset(&old,0,sizeof(old)); 775 old.path = path_to_free =resolve_refdup("HEAD", rev,0, &flag); 776 old.commit =lookup_commit_reference_gently(rev,1); 777if(!(flag & REF_ISSYMREF)) 778 old.path = NULL; 779 780if(old.path &&starts_with(old.path,"refs/heads/")) 781 old.name = old.path +strlen("refs/heads/"); 782 783if(!new->name) { 784new->name ="HEAD"; 785new->commit = old.commit; 786if(!new->commit) 787die(_("You are on a branch yet to be born")); 788parse_commit_or_die(new->commit); 789} 790 791 ret =merge_working_tree(opts, &old,new, &writeout_error); 792if(ret) { 793free(path_to_free); 794return ret; 795} 796 797if(!opts->quiet && !old.path && old.commit &&new->commit != old.commit) 798orphaned_commit_warning(old.commit,new->commit); 799 800update_refs_for_switch(opts, &old,new); 801 802 ret =post_checkout_hook(old.commit,new->commit,1); 803free(path_to_free); 804return ret || writeout_error; 805} 806 807static intgit_checkout_config(const char*var,const char*value,void*cb) 808{ 809if(!strcmp(var,"diff.ignoresubmodules")) { 810struct checkout_opts *opts = cb; 811handle_ignore_submodules_arg(&opts->diff_options, value); 812return0; 813} 814 815if(starts_with(var,"submodule.")) 816returnparse_submodule_config_option(var, value); 817 818returngit_xmerge_config(var, value, NULL); 819} 820 821struct tracking_name_data { 822/* const */char*src_ref; 823char*dst_ref; 824unsigned char*dst_sha1; 825int unique; 826}; 827 828static intcheck_tracking_name(struct remote *remote,void*cb_data) 829{ 830struct tracking_name_data *cb = cb_data; 831struct refspec query; 832memset(&query,0,sizeof(struct refspec)); 833 query.src = cb->src_ref; 834if(remote_find_tracking(remote, &query) || 835get_sha1(query.dst, cb->dst_sha1)) { 836free(query.dst); 837return0; 838} 839if(cb->dst_ref) { 840free(query.dst); 841 cb->unique =0; 842return0; 843} 844 cb->dst_ref = query.dst; 845return0; 846} 847 848static const char*unique_tracking_name(const char*name,unsigned char*sha1) 849{ 850struct tracking_name_data cb_data = { NULL, NULL, NULL,1}; 851char src_ref[PATH_MAX]; 852snprintf(src_ref, PATH_MAX,"refs/heads/%s", name); 853 cb_data.src_ref = src_ref; 854 cb_data.dst_sha1 = sha1; 855for_each_remote(check_tracking_name, &cb_data); 856if(cb_data.unique) 857return cb_data.dst_ref; 858free(cb_data.dst_ref); 859return NULL; 860} 861 862static intparse_branchname_arg(int argc,const char**argv, 863int dwim_new_local_branch_ok, 864struct branch_info *new, 865struct tree **source_tree, 866unsigned char rev[20], 867const char**new_branch) 868{ 869int argcount =0; 870unsigned char branch_rev[20]; 871const char*arg; 872int dash_dash_pos; 873int has_dash_dash =0; 874int i; 875 876/* 877 * case 1: git checkout <ref> -- [<paths>] 878 * 879 * <ref> must be a valid tree, everything after the '--' must be 880 * a path. 881 * 882 * case 2: git checkout -- [<paths>] 883 * 884 * everything after the '--' must be paths. 885 * 886 * case 3: git checkout <something> [--] 887 * 888 * (a) If <something> is a commit, that is to 889 * switch to the branch or detach HEAD at it. As a special case, 890 * if <something> is A...B (missing A or B means HEAD but you can 891 * omit at most one side), and if there is a unique merge base 892 * between A and B, A...B names that merge base. 893 * 894 * (b) If <something> is _not_ a commit, either "--" is present 895 * or <something> is not a path, no -t or -b was given, and 896 * and there is a tracking branch whose name is <something> 897 * in one and only one remote, then this is a short-hand to 898 * fork local <something> from that remote-tracking branch. 899 * 900 * (c) Otherwise, if "--" is present, treat it like case (1). 901 * 902 * (d) Otherwise : 903 * - if it's a reference, treat it like case (1) 904 * - else if it's a path, treat it like case (2) 905 * - else: fail. 906 * 907 * case 4: git checkout <something> <paths> 908 * 909 * The first argument must not be ambiguous. 910 * - If it's *only* a reference, treat it like case (1). 911 * - If it's only a path, treat it like case (2). 912 * - else: fail. 913 * 914 */ 915if(!argc) 916return0; 917 918 arg = argv[0]; 919 dash_dash_pos = -1; 920for(i =0; i < argc; i++) { 921if(!strcmp(argv[i],"--")) { 922 dash_dash_pos = i; 923break; 924} 925} 926if(dash_dash_pos ==0) 927return1;/* case (2) */ 928else if(dash_dash_pos ==1) 929 has_dash_dash =1;/* case (3) or (1) */ 930else if(dash_dash_pos >=2) 931die(_("only one reference expected,%dgiven."), dash_dash_pos); 932 933if(!strcmp(arg,"-")) 934 arg ="@{-1}"; 935 936if(get_sha1_mb(arg, rev)) { 937/* 938 * Either case (3) or (4), with <something> not being 939 * a commit, or an attempt to use case (1) with an 940 * invalid ref. 941 * 942 * It's likely an error, but we need to find out if 943 * we should auto-create the branch, case (3).(b). 944 */ 945int recover_with_dwim = dwim_new_local_branch_ok; 946 947if(check_filename(NULL, arg) && !has_dash_dash) 948 recover_with_dwim =0; 949/* 950 * Accept "git checkout foo" and "git checkout foo --" 951 * as candidates for dwim. 952 */ 953if(!(argc ==1&& !has_dash_dash) && 954!(argc ==2&& has_dash_dash)) 955 recover_with_dwim =0; 956 957if(recover_with_dwim) { 958const char*remote =unique_tracking_name(arg, rev); 959if(remote) { 960*new_branch = arg; 961 arg = remote; 962/* DWIMmed to create local branch, case (3).(b) */ 963}else{ 964 recover_with_dwim =0; 965} 966} 967 968if(!recover_with_dwim) { 969if(has_dash_dash) 970die(_("invalid reference:%s"), arg); 971return argcount; 972} 973} 974 975/* we can't end up being in (2) anymore, eat the argument */ 976 argcount++; 977 argv++; 978 argc--; 979 980new->name = arg; 981setup_branch_path(new); 982 983if(!check_refname_format(new->path,0) && 984!read_ref(new->path, branch_rev)) 985hashcpy(rev, branch_rev); 986else 987new->path = NULL;/* not an existing branch */ 988 989new->commit =lookup_commit_reference_gently(rev,1); 990if(!new->commit) { 991/* not a commit */ 992*source_tree =parse_tree_indirect(rev); 993}else{ 994parse_commit_or_die(new->commit); 995*source_tree =new->commit->tree; 996} 997 998if(!*source_tree)/* case (1): want a tree */ 999die(_("reference is not a tree:%s"), arg);1000if(!has_dash_dash) {/* case (3).(d) -> (1) */1001/*1002 * Do not complain the most common case1003 * git checkout branch1004 * even if there happen to be a file called 'branch';1005 * it would be extremely annoying.1006 */1007if(argc)1008verify_non_filename(NULL, arg);1009}else{1010 argcount++;1011 argv++;1012 argc--;1013}10141015return argcount;1016}10171018static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1019{1020int status;1021struct strbuf branch_ref = STRBUF_INIT;10221023if(!opts->new_branch)1024die(_("You are on a branch yet to be born"));1025strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1026 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1027strbuf_release(&branch_ref);1028if(!opts->quiet)1029fprintf(stderr,_("Switched to a new branch '%s'\n"),1030 opts->new_branch);1031return status;1032}10331034static intcheckout_branch(struct checkout_opts *opts,1035struct branch_info *new)1036{1037if(opts->pathspec.nr)1038die(_("paths cannot be used with switching branches"));10391040if(opts->patch_mode)1041die(_("'%s' cannot be used with switching branches"),1042"--patch");10431044if(opts->writeout_stage)1045die(_("'%s' cannot be used with switching branches"),1046"--ours/--theirs");10471048if(opts->force && opts->merge)1049die(_("'%s' cannot be used with '%s'"),"-f","-m");10501051if(opts->force_detach && opts->new_branch)1052die(_("'%s' cannot be used with '%s'"),1053"--detach","-b/-B/--orphan");10541055if(opts->new_orphan_branch) {1056if(opts->track != BRANCH_TRACK_UNSPECIFIED)1057die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1058}else if(opts->force_detach) {1059if(opts->track != BRANCH_TRACK_UNSPECIFIED)1060die(_("'%s' cannot be used with '%s'"),"--detach","-t");1061}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1062 opts->track = git_branch_track;10631064if(new->name && !new->commit)1065die(_("Cannot switch branch to a non-commit '%s'"),1066new->name);10671068if(!new->commit && opts->new_branch) {1069unsigned char rev[20];1070int flag;10711072if(!read_ref_full("HEAD", rev,0, &flag) &&1073(flag & REF_ISSYMREF) &&is_null_sha1(rev))1074returnswitch_unborn_to_new_branch(opts);1075}1076returnswitch_branches(opts,new);1077}10781079intcmd_checkout(int argc,const char**argv,const char*prefix)1080{1081struct checkout_opts opts;1082struct branch_info new;1083char*conflict_style = NULL;1084int dwim_new_local_branch =1;1085struct option options[] = {1086OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1087OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1088N_("create and checkout a new branch")),1089OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1090N_("create/reset and checkout a branch")),1091OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1092OPT_BOOL(0,"detach", &opts.force_detach,N_("detach the HEAD at named commit")),1093OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1094 BRANCH_TRACK_EXPLICIT),1095OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1096OPT_SET_INT('2',"ours", &opts.writeout_stage,N_("checkout our version for unmerged files"),10972),1098OPT_SET_INT('3',"theirs", &opts.writeout_stage,N_("checkout their version for unmerged files"),10993),1100OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)")),1101OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1102OPT_BOOL(0,"overwrite-ignore", &opts.overwrite_ignore,N_("update ignored files (default)")),1103OPT_STRING(0,"conflict", &conflict_style,N_("style"),1104N_("conflict style (merge or diff3)")),1105OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1106OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1107N_("do not limit pathspecs to sparse entries only")),1108OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1109N_("second guess 'git checkout no-such-branch'")),1110OPT_END(),1111};11121113memset(&opts,0,sizeof(opts));1114memset(&new,0,sizeof(new));1115 opts.overwrite_ignore =1;1116 opts.prefix = prefix;11171118gitmodules_config();1119git_config(git_checkout_config, &opts);11201121 opts.track = BRANCH_TRACK_UNSPECIFIED;11221123 argc =parse_options(argc, argv, prefix, options, checkout_usage,1124 PARSE_OPT_KEEP_DASHDASH);11251126if(conflict_style) {1127 opts.merge =1;/* implied */1128git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1129}11301131if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1132die(_("-b, -B and --orphan are mutually exclusive"));11331134/*1135 * From here on, new_branch will contain the branch to be checked out,1136 * and new_branch_force and new_orphan_branch will tell us which one of1137 * -b/-B/--orphan is being used.1138 */1139if(opts.new_branch_force)1140 opts.new_branch = opts.new_branch_force;11411142if(opts.new_orphan_branch)1143 opts.new_branch = opts.new_orphan_branch;11441145/* --track without -b/-B/--orphan should DWIM */1146if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1147const char*argv0 = argv[0];1148if(!argc || !strcmp(argv0,"--"))1149die(_("--track needs a branch name"));1150if(starts_with(argv0,"refs/"))1151 argv0 +=5;1152if(starts_with(argv0,"remotes/"))1153 argv0 +=8;1154 argv0 =strchr(argv0,'/');1155if(!argv0 || !argv0[1])1156die(_("Missing branch name; try -b"));1157 opts.new_branch = argv0 +1;1158}11591160/*1161 * Extract branch name from command line arguments, so1162 * all that is left is pathspecs.1163 *1164 * Handle1165 *1166 * 1) git checkout <tree> -- [<paths>]1167 * 2) git checkout -- [<paths>]1168 * 3) git checkout <something> [<paths>]1169 *1170 * including "last branch" syntax and DWIM-ery for names of1171 * remote branches, erroring out for invalid or ambiguous cases.1172 */1173if(argc) {1174unsigned char rev[20];1175int dwim_ok =1176!opts.patch_mode &&1177 dwim_new_local_branch &&1178 opts.track == BRANCH_TRACK_UNSPECIFIED &&1179!opts.new_branch;1180int n =parse_branchname_arg(argc, argv, dwim_ok,1181&new, &opts.source_tree,1182 rev, &opts.new_branch);1183 argv += n;1184 argc -= n;1185}11861187if(argc) {1188parse_pathspec(&opts.pathspec,0,1189 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1190 prefix, argv);11911192if(!opts.pathspec.nr)1193die(_("invalid path specification"));11941195/*1196 * Try to give more helpful suggestion.1197 * new_branch && argc > 1 will be caught later.1198 */1199if(opts.new_branch && argc ==1)1200die(_("Cannot update paths and switch to branch '%s' at the same time.\n"1201"Did you intend to checkout '%s' which can not be resolved as commit?"),1202 opts.new_branch, argv[0]);12031204if(opts.force_detach)1205die(_("git checkout: --detach does not take a path argument '%s'"),1206 argv[0]);12071208if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1209die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1210"checking out of the index."));1211}12121213if(opts.new_branch) {1214struct strbuf buf = STRBUF_INIT;12151216 opts.branch_exists =1217validate_new_branchname(opts.new_branch, &buf,1218!!opts.new_branch_force,1219!!opts.new_branch_force);12201221strbuf_release(&buf);1222}12231224if(opts.patch_mode || opts.pathspec.nr)1225returncheckout_paths(&opts,new.name);1226else1227returncheckout_branch(&opts, &new);1228}