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