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