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; 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", rev,0, &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 428static voidsetup_branch_path(struct branch_info *branch) 429{ 430struct strbuf buf = STRBUF_INIT; 431 432strbuf_branchname(&buf, branch->name); 433if(strcmp(buf.buf, branch->name)) 434 branch->name =xstrdup(buf.buf); 435strbuf_splice(&buf,0,0,"refs/heads/",11); 436 branch->path =strbuf_detach(&buf, NULL); 437} 438 439static intmerge_working_tree(const struct checkout_opts *opts, 440struct branch_info *old, 441struct branch_info *new, 442int*writeout_error) 443{ 444int ret; 445struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file)); 446 447hold_locked_index(lock_file,1); 448if(read_cache_preload(NULL) <0) 449returnerror(_("corrupt index file")); 450 451resolve_undo_clear(); 452if(opts->force) { 453 ret =reset_tree(new->commit->tree, opts,1, writeout_error); 454if(ret) 455return ret; 456}else{ 457struct tree_desc trees[2]; 458struct tree *tree; 459struct unpack_trees_options topts; 460 461memset(&topts,0,sizeof(topts)); 462 topts.head_idx = -1; 463 topts.src_index = &the_index; 464 topts.dst_index = &the_index; 465 466setup_unpack_trees_porcelain(&topts,"checkout"); 467 468refresh_cache(REFRESH_QUIET); 469 470if(unmerged_cache()) { 471error(_("you need to resolve your current index first")); 472return1; 473} 474 475/* 2-way merge to the new branch */ 476 topts.initial_checkout =is_cache_unborn(); 477 topts.update =1; 478 topts.merge =1; 479 topts.gently = opts->merge && old->commit; 480 topts.verbose_update = !opts->quiet &&isatty(2); 481 topts.fn = twoway_merge; 482if(opts->overwrite_ignore) { 483 topts.dir =xcalloc(1,sizeof(*topts.dir)); 484 topts.dir->flags |= DIR_SHOW_IGNORED; 485setup_standard_excludes(topts.dir); 486} 487 tree =parse_tree_indirect(old->commit ? 488 old->commit->object.sha1 : 489 EMPTY_TREE_SHA1_BIN); 490init_tree_desc(&trees[0], tree->buffer, tree->size); 491 tree =parse_tree_indirect(new->commit->object.sha1); 492init_tree_desc(&trees[1], tree->buffer, tree->size); 493 494 ret =unpack_trees(2, trees, &topts); 495if(ret == -1) { 496/* 497 * Unpack couldn't do a trivial merge; either 498 * give up or do a real merge, depending on 499 * whether the merge flag was used. 500 */ 501struct tree *result; 502struct tree *work; 503struct merge_options o; 504if(!opts->merge) 505return1; 506 507/* 508 * Without old->commit, the below is the same as 509 * the two-tree unpack we already tried and failed. 510 */ 511if(!old->commit) 512return1; 513 514/* Do more real merge */ 515 516/* 517 * We update the index fully, then write the 518 * tree from the index, then merge the new 519 * branch with the current tree, with the old 520 * branch as the base. Then we reset the index 521 * (but not the working tree) to the new 522 * branch, leaving the working tree as the 523 * merged version, but skipping unmerged 524 * entries in the index. 525 */ 526 527add_files_to_cache(NULL, NULL,0); 528/* 529 * NEEDSWORK: carrying over local changes 530 * when branches have different end-of-line 531 * normalization (or clean+smudge rules) is 532 * a pain; plumb in an option to set 533 * o.renormalize? 534 */ 535init_merge_options(&o); 536 o.verbosity =0; 537 work =write_tree_from_memory(&o); 538 539 ret =reset_tree(new->commit->tree, opts,1, 540 writeout_error); 541if(ret) 542return ret; 543 o.ancestor = old->name; 544 o.branch1 =new->name; 545 o.branch2 ="local"; 546merge_trees(&o,new->commit->tree, work, 547 old->commit->tree, &result); 548 ret =reset_tree(new->commit->tree, opts,0, 549 writeout_error); 550if(ret) 551return ret; 552} 553} 554 555if(write_locked_index(&the_index, lock_file, COMMIT_LOCK)) 556die(_("unable to write new index file")); 557 558if(!opts->force && !opts->quiet) 559show_local_changes(&new->commit->object, &opts->diff_options); 560 561return0; 562} 563 564static voidreport_tracking(struct branch_info *new) 565{ 566struct strbuf sb = STRBUF_INIT; 567struct branch *branch =branch_get(new->name); 568 569if(!format_tracking_info(branch, &sb)) 570return; 571fputs(sb.buf, stdout); 572strbuf_release(&sb); 573} 574 575static voidupdate_refs_for_switch(const struct checkout_opts *opts, 576struct branch_info *old, 577struct branch_info *new) 578{ 579struct strbuf msg = STRBUF_INIT; 580const char*old_desc, *reflog_msg; 581if(opts->new_branch) { 582if(opts->new_orphan_branch) { 583if(opts->new_branch_log && !log_all_ref_updates) { 584int temp; 585char log_file[PATH_MAX]; 586char*ref_name =mkpath("refs/heads/%s", opts->new_orphan_branch); 587 588 temp = log_all_ref_updates; 589 log_all_ref_updates =1; 590if(log_ref_setup(ref_name, log_file,sizeof(log_file))) { 591fprintf(stderr,_("Can not do reflog for '%s'\n"), 592 opts->new_orphan_branch); 593 log_all_ref_updates = temp; 594return; 595} 596 log_all_ref_updates = temp; 597} 598} 599else 600create_branch(old->name, opts->new_branch,new->name, 601 opts->new_branch_force ?1:0, 602 opts->new_branch_log, 603 opts->new_branch_force ?1:0, 604 opts->quiet, 605 opts->track); 606new->name = opts->new_branch; 607setup_branch_path(new); 608} 609 610 old_desc = old->name; 611if(!old_desc && old->commit) 612 old_desc =sha1_to_hex(old->commit->object.sha1); 613 614 reflog_msg =getenv("GIT_REFLOG_ACTION"); 615if(!reflog_msg) 616strbuf_addf(&msg,"checkout: moving from%sto%s", 617 old_desc ? old_desc :"(invalid)",new->name); 618else 619strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 620 621if(!strcmp(new->name,"HEAD") && !new->path && !opts->force_detach) { 622/* Nothing to do. */ 623}else if(opts->force_detach || !new->path) {/* No longer on any branch. */ 624update_ref(msg.buf,"HEAD",new->commit->object.sha1, NULL, 625 REF_NODEREF, DIE_ON_ERR); 626if(!opts->quiet) { 627if(old->path && advice_detached_head) 628detach_advice(new->name); 629describe_detached_head(_("HEAD is now at"),new->commit); 630} 631}else if(new->path) {/* Switch branches. */ 632create_symref("HEAD",new->path, msg.buf); 633if(!opts->quiet) { 634if(old->path && !strcmp(new->path, old->path)) { 635if(opts->new_branch_force) 636fprintf(stderr,_("Reset branch '%s'\n"), 637new->name); 638else 639fprintf(stderr,_("Already on '%s'\n"), 640new->name); 641}else if(opts->new_branch) { 642if(opts->branch_exists) 643fprintf(stderr,_("Switched to and reset branch '%s'\n"),new->name); 644else 645fprintf(stderr,_("Switched to a new branch '%s'\n"),new->name); 646}else{ 647fprintf(stderr,_("Switched to branch '%s'\n"), 648new->name); 649} 650} 651if(old->path && old->name) { 652char log_file[PATH_MAX], ref_file[PATH_MAX]; 653 654git_snpath(log_file,sizeof(log_file),"logs/%s", old->path); 655git_snpath(ref_file,sizeof(ref_file),"%s", old->path); 656if(!file_exists(ref_file) &&file_exists(log_file)) 657remove_path(log_file); 658} 659} 660remove_branch_state(); 661strbuf_release(&msg); 662if(!opts->quiet && 663(new->path || (!opts->force_detach && !strcmp(new->name,"HEAD")))) 664report_tracking(new); 665} 666 667static intadd_pending_uninteresting_ref(const char*refname, 668const unsigned char*sha1, 669int flags,void*cb_data) 670{ 671add_pending_sha1(cb_data, refname, sha1, UNINTERESTING); 672return0; 673} 674 675static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 676{ 677strbuf_addstr(sb," "); 678strbuf_addstr(sb, 679find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); 680strbuf_addch(sb,' '); 681if(!parse_commit(commit)) 682pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 683strbuf_addch(sb,'\n'); 684} 685 686#define ORPHAN_CUTOFF 4 687static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 688{ 689struct commit *c, *last = NULL; 690struct strbuf sb = STRBUF_INIT; 691int lost =0; 692while((c =get_revision(revs)) != NULL) { 693if(lost < ORPHAN_CUTOFF) 694describe_one_orphan(&sb, c); 695 last = c; 696 lost++; 697} 698if(ORPHAN_CUTOFF < lost) { 699int more = lost - ORPHAN_CUTOFF; 700if(more ==1) 701describe_one_orphan(&sb, last); 702else 703strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 704} 705 706fprintf(stderr, 707Q_( 708/* The singular version */ 709"Warning: you are leaving%dcommit behind, " 710"not connected to\n" 711"any of your branches:\n\n" 712"%s\n", 713/* The plural version */ 714"Warning: you are leaving%dcommits behind, " 715"not connected to\n" 716"any of your branches:\n\n" 717"%s\n", 718/* Give ngettext() the count */ 719 lost), 720 lost, 721 sb.buf); 722strbuf_release(&sb); 723 724if(advice_detached_head) 725fprintf(stderr, 726_( 727"If you want to keep them by creating a new branch, " 728"this may be a good time\nto do so with:\n\n" 729" git branch new_branch_name%s\n\n"), 730find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); 731} 732 733/* 734 * We are about to leave commit that was at the tip of a detached 735 * HEAD. If it is not reachable from any ref, this is the last chance 736 * for the user to do so without resorting to reflog. 737 */ 738static voidorphaned_commit_warning(struct commit *old,struct commit *new) 739{ 740struct rev_info revs; 741struct object *object = &old->object; 742struct object_array refs; 743 744init_revisions(&revs, NULL); 745setup_revisions(0, NULL, &revs, NULL); 746 747 object->flags &= ~UNINTERESTING; 748add_pending_object(&revs, object,sha1_to_hex(object->sha1)); 749 750for_each_ref(add_pending_uninteresting_ref, &revs); 751add_pending_sha1(&revs,"HEAD",new->object.sha1, UNINTERESTING); 752 753 refs = revs.pending; 754 revs.leak_pending =1; 755 756if(prepare_revision_walk(&revs)) 757die(_("internal error in revision walk")); 758if(!(old->object.flags & UNINTERESTING)) 759suggest_reattach(old, &revs); 760else 761describe_detached_head(_("Previous HEAD position was"), old); 762 763clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS); 764free(refs.objects); 765} 766 767static intswitch_branches(const struct checkout_opts *opts, 768struct branch_info *new) 769{ 770int ret =0; 771struct branch_info old; 772void*path_to_free; 773unsigned char rev[20]; 774int flag, writeout_error =0; 775memset(&old,0,sizeof(old)); 776 old.path = path_to_free =resolve_refdup("HEAD", rev,0, &flag); 777 old.commit =lookup_commit_reference_gently(rev,1); 778if(!(flag & REF_ISSYMREF)) 779 old.path = NULL; 780 781if(old.path &&starts_with(old.path,"refs/heads/")) 782 old.name = old.path +strlen("refs/heads/"); 783 784if(!new->name) { 785new->name ="HEAD"; 786new->commit = old.commit; 787if(!new->commit) 788die(_("You are on a branch yet to be born")); 789parse_commit_or_die(new->commit); 790} 791 792 ret =merge_working_tree(opts, &old,new, &writeout_error); 793if(ret) { 794free(path_to_free); 795return ret; 796} 797 798if(!opts->quiet && !old.path && old.commit &&new->commit != old.commit) 799orphaned_commit_warning(old.commit,new->commit); 800 801update_refs_for_switch(opts, &old,new); 802 803 ret =post_checkout_hook(old.commit,new->commit,1); 804free(path_to_free); 805return ret || writeout_error; 806} 807 808static intgit_checkout_config(const char*var,const char*value,void*cb) 809{ 810if(!strcmp(var,"diff.ignoresubmodules")) { 811struct checkout_opts *opts = cb; 812handle_ignore_submodules_arg(&opts->diff_options, value); 813return0; 814} 815 816if(starts_with(var,"submodule.")) 817returnparse_submodule_config_option(var, value); 818 819returngit_xmerge_config(var, value, NULL); 820} 821 822struct tracking_name_data { 823/* const */char*src_ref; 824char*dst_ref; 825unsigned char*dst_sha1; 826int unique; 827}; 828 829static intcheck_tracking_name(struct remote *remote,void*cb_data) 830{ 831struct tracking_name_data *cb = cb_data; 832struct refspec query; 833memset(&query,0,sizeof(struct refspec)); 834 query.src = cb->src_ref; 835if(remote_find_tracking(remote, &query) || 836get_sha1(query.dst, cb->dst_sha1)) { 837free(query.dst); 838return0; 839} 840if(cb->dst_ref) { 841free(query.dst); 842 cb->unique =0; 843return0; 844} 845 cb->dst_ref = query.dst; 846return0; 847} 848 849static const char*unique_tracking_name(const char*name,unsigned char*sha1) 850{ 851struct tracking_name_data cb_data = { NULL, NULL, NULL,1}; 852char src_ref[PATH_MAX]; 853snprintf(src_ref, PATH_MAX,"refs/heads/%s", name); 854 cb_data.src_ref = src_ref; 855 cb_data.dst_sha1 = sha1; 856for_each_remote(check_tracking_name, &cb_data); 857if(cb_data.unique) 858return cb_data.dst_ref; 859free(cb_data.dst_ref); 860return NULL; 861} 862 863static intparse_branchname_arg(int argc,const char**argv, 864int dwim_new_local_branch_ok, 865struct branch_info *new, 866struct tree **source_tree, 867unsigned char rev[20], 868const char**new_branch) 869{ 870int argcount =0; 871unsigned char branch_rev[20]; 872const char*arg; 873int dash_dash_pos; 874int has_dash_dash =0; 875int i; 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 or -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 919 arg = argv[0]; 920 dash_dash_pos = -1; 921for(i =0; i < argc; i++) { 922if(!strcmp(argv[i],"--")) { 923 dash_dash_pos = i; 924break; 925} 926} 927if(dash_dash_pos ==0) 928return1;/* case (2) */ 929else if(dash_dash_pos ==1) 930 has_dash_dash =1;/* case (3) or (1) */ 931else if(dash_dash_pos >=2) 932die(_("only one reference expected,%dgiven."), dash_dash_pos); 933 934if(!strcmp(arg,"-")) 935 arg ="@{-1}"; 936 937if(get_sha1_mb(arg, rev)) { 938/* 939 * Either case (3) or (4), with <something> not being 940 * a commit, or an attempt to use case (1) with an 941 * invalid ref. 942 * 943 * It's likely an error, but we need to find out if 944 * we should auto-create the branch, case (3).(b). 945 */ 946int recover_with_dwim = dwim_new_local_branch_ok; 947 948if(check_filename(NULL, arg) && !has_dash_dash) 949 recover_with_dwim =0; 950/* 951 * Accept "git checkout foo" and "git checkout foo --" 952 * as candidates for dwim. 953 */ 954if(!(argc ==1&& !has_dash_dash) && 955!(argc ==2&& has_dash_dash)) 956 recover_with_dwim =0; 957 958if(recover_with_dwim) { 959const char*remote =unique_tracking_name(arg, rev); 960if(remote) { 961*new_branch = arg; 962 arg = remote; 963/* DWIMmed to create local branch, case (3).(b) */ 964}else{ 965 recover_with_dwim =0; 966} 967} 968 969if(!recover_with_dwim) { 970if(has_dash_dash) 971die(_("invalid reference:%s"), arg); 972return argcount; 973} 974} 975 976/* we can't end up being in (2) anymore, eat the argument */ 977 argcount++; 978 argv++; 979 argc--; 980 981new->name = arg; 982setup_branch_path(new); 983 984if(!check_refname_format(new->path,0) && 985!read_ref(new->path, branch_rev)) 986hashcpy(rev, branch_rev); 987else 988new->path = NULL;/* not an existing branch */ 989 990new->commit =lookup_commit_reference_gently(rev,1); 991if(!new->commit) { 992/* not a commit */ 993*source_tree =parse_tree_indirect(rev); 994}else{ 995parse_commit_or_die(new->commit); 996*source_tree =new->commit->tree; 997} 998 999if(!*source_tree)/* case (1): want a tree */1000die(_("reference is not a tree:%s"), arg);1001if(!has_dash_dash) {/* case (3).(d) -> (1) */1002/*1003 * Do not complain the most common case1004 * git checkout branch1005 * even if there happen to be a file called 'branch';1006 * it would be extremely annoying.1007 */1008if(argc)1009verify_non_filename(NULL, arg);1010}else{1011 argcount++;1012 argv++;1013 argc--;1014}10151016return argcount;1017}10181019static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1020{1021int status;1022struct strbuf branch_ref = STRBUF_INIT;10231024if(!opts->new_branch)1025die(_("You are on a branch yet to be born"));1026strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1027 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1028strbuf_release(&branch_ref);1029if(!opts->quiet)1030fprintf(stderr,_("Switched to a new branch '%s'\n"),1031 opts->new_branch);1032return status;1033}10341035static intcheckout_branch(struct checkout_opts *opts,1036struct branch_info *new)1037{1038if(opts->pathspec.nr)1039die(_("paths cannot be used with switching branches"));10401041if(opts->patch_mode)1042die(_("'%s' cannot be used with switching branches"),1043"--patch");10441045if(opts->writeout_stage)1046die(_("'%s' cannot be used with switching branches"),1047"--ours/--theirs");10481049if(opts->force && opts->merge)1050die(_("'%s' cannot be used with '%s'"),"-f","-m");10511052if(opts->force_detach && opts->new_branch)1053die(_("'%s' cannot be used with '%s'"),1054"--detach","-b/-B/--orphan");10551056if(opts->new_orphan_branch) {1057if(opts->track != BRANCH_TRACK_UNSPECIFIED)1058die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1059}else if(opts->force_detach) {1060if(opts->track != BRANCH_TRACK_UNSPECIFIED)1061die(_("'%s' cannot be used with '%s'"),"--detach","-t");1062}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1063 opts->track = git_branch_track;10641065if(new->name && !new->commit)1066die(_("Cannot switch branch to a non-commit '%s'"),1067new->name);10681069if(!new->commit && opts->new_branch) {1070unsigned char rev[20];1071int flag;10721073if(!read_ref_full("HEAD", rev,0, &flag) &&1074(flag & REF_ISSYMREF) &&is_null_sha1(rev))1075returnswitch_unborn_to_new_branch(opts);1076}1077returnswitch_branches(opts,new);1078}10791080intcmd_checkout(int argc,const char**argv,const char*prefix)1081{1082struct checkout_opts opts;1083struct branch_info new;1084char*conflict_style = NULL;1085int dwim_new_local_branch =1;1086struct option options[] = {1087OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1088OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1089N_("create and checkout a new branch")),1090OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1091N_("create/reset and checkout a branch")),1092OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1093OPT_BOOL(0,"detach", &opts.force_detach,N_("detach the HEAD at named commit")),1094OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1095 BRANCH_TRACK_EXPLICIT),1096OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1097OPT_SET_INT('2',"ours", &opts.writeout_stage,N_("checkout our version for unmerged files"),10982),1099OPT_SET_INT('3',"theirs", &opts.writeout_stage,N_("checkout their version for unmerged files"),11003),1101OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)")),1102OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1103OPT_BOOL(0,"overwrite-ignore", &opts.overwrite_ignore,N_("update ignored files (default)")),1104OPT_STRING(0,"conflict", &conflict_style,N_("style"),1105N_("conflict style (merge or diff3)")),1106OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1107OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1108N_("do not limit pathspecs to sparse entries only")),1109OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1110N_("second guess 'git checkout no-such-branch'")),1111OPT_END(),1112};11131114memset(&opts,0,sizeof(opts));1115memset(&new,0,sizeof(new));1116 opts.overwrite_ignore =1;1117 opts.prefix = prefix;11181119gitmodules_config();1120git_config(git_checkout_config, &opts);11211122 opts.track = BRANCH_TRACK_UNSPECIFIED;11231124 argc =parse_options(argc, argv, prefix, options, checkout_usage,1125 PARSE_OPT_KEEP_DASHDASH);11261127if(conflict_style) {1128 opts.merge =1;/* implied */1129git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1130}11311132if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1133die(_("-b, -B and --orphan are mutually exclusive"));11341135/*1136 * From here on, new_branch will contain the branch to be checked out,1137 * and new_branch_force and new_orphan_branch will tell us which one of1138 * -b/-B/--orphan is being used.1139 */1140if(opts.new_branch_force)1141 opts.new_branch = opts.new_branch_force;11421143if(opts.new_orphan_branch)1144 opts.new_branch = opts.new_orphan_branch;11451146/* --track without -b/-B/--orphan should DWIM */1147if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1148const char*argv0 = argv[0];1149if(!argc || !strcmp(argv0,"--"))1150die(_("--track needs a branch name"));1151if(starts_with(argv0,"refs/"))1152 argv0 +=5;1153if(starts_with(argv0,"remotes/"))1154 argv0 +=8;1155 argv0 =strchr(argv0,'/');1156if(!argv0 || !argv0[1])1157die(_("Missing branch name; try -b"));1158 opts.new_branch = argv0 +1;1159}11601161/*1162 * Extract branch name from command line arguments, so1163 * all that is left is pathspecs.1164 *1165 * Handle1166 *1167 * 1) git checkout <tree> -- [<paths>]1168 * 2) git checkout -- [<paths>]1169 * 3) git checkout <something> [<paths>]1170 *1171 * including "last branch" syntax and DWIM-ery for names of1172 * remote branches, erroring out for invalid or ambiguous cases.1173 */1174if(argc) {1175unsigned char rev[20];1176int dwim_ok =1177!opts.patch_mode &&1178 dwim_new_local_branch &&1179 opts.track == BRANCH_TRACK_UNSPECIFIED &&1180!opts.new_branch;1181int n =parse_branchname_arg(argc, argv, dwim_ok,1182&new, &opts.source_tree,1183 rev, &opts.new_branch);1184 argv += n;1185 argc -= n;1186}11871188if(argc) {1189parse_pathspec(&opts.pathspec,0,1190 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1191 prefix, argv);11921193if(!opts.pathspec.nr)1194die(_("invalid path specification"));11951196/*1197 * Try to give more helpful suggestion.1198 * new_branch && argc > 1 will be caught later.1199 */1200if(opts.new_branch && argc ==1)1201die(_("Cannot update paths and switch to branch '%s' at the same time.\n"1202"Did you intend to checkout '%s' which can not be resolved as commit?"),1203 opts.new_branch, argv[0]);12041205if(opts.force_detach)1206die(_("git checkout: --detach does not take a path argument '%s'"),1207 argv[0]);12081209if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1210die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1211"checking out of the index."));1212}12131214if(opts.new_branch) {1215struct strbuf buf = STRBUF_INIT;12161217 opts.branch_exists =1218validate_new_branchname(opts.new_branch, &buf,1219!!opts.new_branch_force,1220!!opts.new_branch_force);12211222strbuf_release(&buf);1223}12241225if(opts.patch_mode || opts.pathspec.nr)1226returncheckout_paths(&opts,new.name);1227else1228returncheckout_branch(&opts, &new);1229}