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(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; 228int newfd; 229struct lock_file *lock_file; 230 231if(opts->track != BRANCH_TRACK_UNSPECIFIED) 232die(_("'%s' cannot be used with updating paths"),"--track"); 233 234if(opts->new_branch_log) 235die(_("'%s' cannot be used with updating paths"),"-l"); 236 237if(opts->force && opts->patch_mode) 238die(_("'%s' cannot be used with updating paths"),"-f"); 239 240if(opts->force_detach) 241die(_("'%s' cannot be used with updating paths"),"--detach"); 242 243if(opts->merge && opts->patch_mode) 244die(_("'%s' cannot be used with%s"),"--merge","--patch"); 245 246if(opts->force && opts->merge) 247die(_("'%s' cannot be used with%s"),"-f","-m"); 248 249if(opts->new_branch) 250die(_("Cannot update paths and switch to branch '%s' at the same time."), 251 opts->new_branch); 252 253if(opts->patch_mode) 254returnrun_add_interactive(revision,"--patch=checkout", 255&opts->pathspec); 256 257 lock_file =xcalloc(1,sizeof(struct lock_file)); 258 259 newfd =hold_locked_index(lock_file,1); 260if(read_cache_preload(&opts->pathspec) <0) 261returnerror(_("corrupt index file")); 262 263if(opts->source_tree) 264read_tree_some(opts->source_tree, &opts->pathspec); 265 266 ps_matched =xcalloc(1, opts->pathspec.nr); 267 268/* 269 * Make sure all pathspecs participated in locating the paths 270 * to be checked out. 271 */ 272for(pos =0; pos < active_nr; pos++) { 273struct cache_entry *ce = active_cache[pos]; 274 ce->ce_flags &= ~CE_MATCHED; 275if(!opts->ignore_skipworktree &&ce_skip_worktree(ce)) 276continue; 277if(opts->source_tree && !(ce->ce_flags & CE_UPDATE)) 278/* 279 * "git checkout tree-ish -- path", but this entry 280 * is in the original index; it will not be checked 281 * out to the working tree and it does not matter 282 * if pathspec matched this entry. We will not do 283 * anything to this entry at all. 284 */ 285continue; 286/* 287 * Either this entry came from the tree-ish we are 288 * checking the paths out of, or we are checking out 289 * of the index. 290 * 291 * If it comes from the tree-ish, we already know it 292 * matches the pathspec and could just stamp 293 * CE_MATCHED to it from update_some(). But we still 294 * need ps_matched and read_tree_recursive (and 295 * eventually tree_entry_interesting) cannot fill 296 * ps_matched yet. Once it can, we can avoid calling 297 * match_pathspec() for _all_ entries when 298 * opts->source_tree != NULL. 299 */ 300if(ce_path_match(ce, &opts->pathspec, ps_matched)) 301 ce->ce_flags |= CE_MATCHED; 302} 303 304if(report_path_error(ps_matched, &opts->pathspec, opts->prefix)) { 305free(ps_matched); 306return1; 307} 308free(ps_matched); 309 310/* "checkout -m path" to recreate conflicted state */ 311if(opts->merge) 312unmerge_marked_index(&the_index); 313 314/* Any unmerged paths? */ 315for(pos =0; pos < active_nr; pos++) { 316const struct cache_entry *ce = active_cache[pos]; 317if(ce->ce_flags & CE_MATCHED) { 318if(!ce_stage(ce)) 319continue; 320if(opts->force) { 321warning(_("path '%s' is unmerged"), ce->name); 322}else if(opts->writeout_stage) { 323 errs |=check_stage(opts->writeout_stage, ce, pos); 324}else if(opts->merge) { 325 errs |=check_stages((1<<2) | (1<<3), ce, pos); 326}else{ 327 errs =1; 328error(_("path '%s' is unmerged"), ce->name); 329} 330 pos =skip_same_name(ce, pos) -1; 331} 332} 333if(errs) 334return1; 335 336/* Now we are committed to check them out */ 337memset(&state,0,sizeof(state)); 338 state.force =1; 339 state.refresh_cache =1; 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_cache(newfd, active_cache, active_nr) || 356commit_locked_index(lock_file)) 357die(_("unable to write new index file")); 358 359read_ref_full("HEAD", rev,0, &flag); 360 head =lookup_commit_reference_gently(rev,1); 361 362 errs |=post_checkout_hook(head, head,0); 363return errs; 364} 365 366static voidshow_local_changes(struct object *head, 367const struct diff_options *opts) 368{ 369struct rev_info rev; 370/* I think we want full paths, even if we're in a subdirectory. */ 371init_revisions(&rev, NULL); 372 rev.diffopt.flags = opts->flags; 373 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; 374diff_setup_done(&rev.diffopt); 375add_pending_object(&rev, head, NULL); 376run_diff_index(&rev,0); 377} 378 379static voiddescribe_detached_head(const char*msg,struct commit *commit) 380{ 381struct strbuf sb = STRBUF_INIT; 382if(!parse_commit(commit)) 383pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 384fprintf(stderr,"%s %s...%s\n", msg, 385find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), sb.buf); 386strbuf_release(&sb); 387} 388 389static intreset_tree(struct tree *tree,const struct checkout_opts *o, 390int worktree,int*writeout_error) 391{ 392struct unpack_trees_options opts; 393struct tree_desc tree_desc; 394 395memset(&opts,0,sizeof(opts)); 396 opts.head_idx = -1; 397 opts.update = worktree; 398 opts.skip_unmerged = !worktree; 399 opts.reset =1; 400 opts.merge =1; 401 opts.fn = oneway_merge; 402 opts.verbose_update = !o->quiet &&isatty(2); 403 opts.src_index = &the_index; 404 opts.dst_index = &the_index; 405parse_tree(tree); 406init_tree_desc(&tree_desc, tree->buffer, tree->size); 407switch(unpack_trees(1, &tree_desc, &opts)) { 408case-2: 409*writeout_error =1; 410/* 411 * We return 0 nevertheless, as the index is all right 412 * and more importantly we have made best efforts to 413 * update paths in the work tree, and we cannot revert 414 * them. 415 */ 416case0: 417return0; 418default: 419return128; 420} 421} 422 423struct branch_info { 424const char*name;/* The short name used */ 425const char*path;/* The full name of a real branch */ 426struct commit *commit;/* The named commit */ 427}; 428 429static voidsetup_branch_path(struct branch_info *branch) 430{ 431struct strbuf buf = STRBUF_INIT; 432 433strbuf_branchname(&buf, branch->name); 434if(strcmp(buf.buf, branch->name)) 435 branch->name =xstrdup(buf.buf); 436strbuf_splice(&buf,0,0,"refs/heads/",11); 437 branch->path =strbuf_detach(&buf, NULL); 438} 439 440static intmerge_working_tree(const struct checkout_opts *opts, 441struct branch_info *old, 442struct branch_info *new, 443int*writeout_error) 444{ 445int ret; 446struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file)); 447int newfd =hold_locked_index(lock_file,1); 448 449if(read_cache_preload(NULL) <0) 450returnerror(_("corrupt index file")); 451 452resolve_undo_clear(); 453if(opts->force) { 454 ret =reset_tree(new->commit->tree, opts,1, writeout_error); 455if(ret) 456return ret; 457}else{ 458struct tree_desc trees[2]; 459struct tree *tree; 460struct unpack_trees_options topts; 461 462memset(&topts,0,sizeof(topts)); 463 topts.head_idx = -1; 464 topts.src_index = &the_index; 465 topts.dst_index = &the_index; 466 467setup_unpack_trees_porcelain(&topts,"checkout"); 468 469refresh_cache(REFRESH_QUIET); 470 471if(unmerged_cache()) { 472error(_("you need to resolve your current index first")); 473return1; 474} 475 476/* 2-way merge to the new branch */ 477 topts.initial_checkout =is_cache_unborn(); 478 topts.update =1; 479 topts.merge =1; 480 topts.gently = opts->merge && old->commit; 481 topts.verbose_update = !opts->quiet &&isatty(2); 482 topts.fn = twoway_merge; 483if(opts->overwrite_ignore) { 484 topts.dir =xcalloc(1,sizeof(*topts.dir)); 485 topts.dir->flags |= DIR_SHOW_IGNORED; 486setup_standard_excludes(topts.dir); 487} 488 tree =parse_tree_indirect(old->commit ? 489 old->commit->object.sha1 : 490 EMPTY_TREE_SHA1_BIN); 491init_tree_desc(&trees[0], tree->buffer, tree->size); 492 tree =parse_tree_indirect(new->commit->object.sha1); 493init_tree_desc(&trees[1], tree->buffer, tree->size); 494 495 ret =unpack_trees(2, trees, &topts); 496if(ret == -1) { 497/* 498 * Unpack couldn't do a trivial merge; either 499 * give up or do a real merge, depending on 500 * whether the merge flag was used. 501 */ 502struct tree *result; 503struct tree *work; 504struct merge_options o; 505if(!opts->merge) 506return1; 507 508/* 509 * Without old->commit, the below is the same as 510 * the two-tree unpack we already tried and failed. 511 */ 512if(!old->commit) 513return1; 514 515/* Do more real merge */ 516 517/* 518 * We update the index fully, then write the 519 * tree from the index, then merge the new 520 * branch with the current tree, with the old 521 * branch as the base. Then we reset the index 522 * (but not the working tree) to the new 523 * branch, leaving the working tree as the 524 * merged version, but skipping unmerged 525 * entries in the index. 526 */ 527 528add_files_to_cache(NULL, NULL,0); 529/* 530 * NEEDSWORK: carrying over local changes 531 * when branches have different end-of-line 532 * normalization (or clean+smudge rules) is 533 * a pain; plumb in an option to set 534 * o.renormalize? 535 */ 536init_merge_options(&o); 537 o.verbosity =0; 538 work =write_tree_from_memory(&o); 539 540 ret =reset_tree(new->commit->tree, opts,1, 541 writeout_error); 542if(ret) 543return ret; 544 o.ancestor = old->name; 545 o.branch1 =new->name; 546 o.branch2 ="local"; 547merge_trees(&o,new->commit->tree, work, 548 old->commit->tree, &result); 549 ret =reset_tree(new->commit->tree, opts,0, 550 writeout_error); 551if(ret) 552return ret; 553} 554} 555 556if(write_cache(newfd, active_cache, active_nr) || 557commit_locked_index(lock_file)) 558die(_("unable to write new index file")); 559 560if(!opts->force && !opts->quiet) 561show_local_changes(&new->commit->object, &opts->diff_options); 562 563return0; 564} 565 566static voidreport_tracking(struct branch_info *new) 567{ 568struct strbuf sb = STRBUF_INIT; 569struct branch *branch =branch_get(new->name); 570 571if(!format_tracking_info(branch, &sb)) 572return; 573fputs(sb.buf, stdout); 574strbuf_release(&sb); 575} 576 577static voidupdate_refs_for_switch(const struct checkout_opts *opts, 578struct branch_info *old, 579struct branch_info *new) 580{ 581struct strbuf msg = STRBUF_INIT; 582const char*old_desc, *reflog_msg; 583if(opts->new_branch) { 584if(opts->new_orphan_branch) { 585if(opts->new_branch_log && !log_all_ref_updates) { 586int temp; 587char log_file[PATH_MAX]; 588char*ref_name =mkpath("refs/heads/%s", opts->new_orphan_branch); 589 590 temp = log_all_ref_updates; 591 log_all_ref_updates =1; 592if(log_ref_setup(ref_name, log_file,sizeof(log_file))) { 593fprintf(stderr,_("Can not do reflog for '%s'\n"), 594 opts->new_orphan_branch); 595 log_all_ref_updates = temp; 596return; 597} 598 log_all_ref_updates = temp; 599} 600} 601else 602create_branch(old->name, opts->new_branch,new->name, 603 opts->new_branch_force ?1:0, 604 opts->new_branch_log, 605 opts->new_branch_force ?1:0, 606 opts->quiet, 607 opts->track); 608new->name = opts->new_branch; 609setup_branch_path(new); 610} 611 612 old_desc = old->name; 613if(!old_desc && old->commit) 614 old_desc =sha1_to_hex(old->commit->object.sha1); 615 616 reflog_msg =getenv("GIT_REFLOG_ACTION"); 617if(!reflog_msg) 618strbuf_addf(&msg,"checkout: moving from%sto%s", 619 old_desc ? old_desc :"(invalid)",new->name); 620else 621strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 622 623if(!strcmp(new->name,"HEAD") && !new->path && !opts->force_detach) { 624/* Nothing to do. */ 625}else if(opts->force_detach || !new->path) {/* No longer on any branch. */ 626update_ref(msg.buf,"HEAD",new->commit->object.sha1, NULL, 627 REF_NODEREF, DIE_ON_ERR); 628if(!opts->quiet) { 629if(old->path && advice_detached_head) 630detach_advice(new->name); 631describe_detached_head(_("HEAD is now at"),new->commit); 632} 633}else if(new->path) {/* Switch branches. */ 634create_symref("HEAD",new->path, msg.buf); 635if(!opts->quiet) { 636if(old->path && !strcmp(new->path, old->path)) { 637if(opts->new_branch_force) 638fprintf(stderr,_("Reset branch '%s'\n"), 639new->name); 640else 641fprintf(stderr,_("Already on '%s'\n"), 642new->name); 643}else if(opts->new_branch) { 644if(opts->branch_exists) 645fprintf(stderr,_("Switched to and reset branch '%s'\n"),new->name); 646else 647fprintf(stderr,_("Switched to a new branch '%s'\n"),new->name); 648}else{ 649fprintf(stderr,_("Switched to branch '%s'\n"), 650new->name); 651} 652} 653if(old->path && old->name) { 654char log_file[PATH_MAX], ref_file[PATH_MAX]; 655 656git_snpath(log_file,sizeof(log_file),"logs/%s", old->path); 657git_snpath(ref_file,sizeof(ref_file),"%s", old->path); 658if(!file_exists(ref_file) &&file_exists(log_file)) 659remove_path(log_file); 660} 661} 662remove_branch_state(); 663strbuf_release(&msg); 664if(!opts->quiet && 665(new->path || (!opts->force_detach && !strcmp(new->name,"HEAD")))) 666report_tracking(new); 667} 668 669static intadd_pending_uninteresting_ref(const char*refname, 670const unsigned char*sha1, 671int flags,void*cb_data) 672{ 673add_pending_sha1(cb_data, refname, sha1, UNINTERESTING); 674return0; 675} 676 677static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 678{ 679strbuf_addstr(sb," "); 680strbuf_addstr(sb, 681find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); 682strbuf_addch(sb,' '); 683if(!parse_commit(commit)) 684pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 685strbuf_addch(sb,'\n'); 686} 687 688#define ORPHAN_CUTOFF 4 689static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 690{ 691struct commit *c, *last = NULL; 692struct strbuf sb = STRBUF_INIT; 693int lost =0; 694while((c =get_revision(revs)) != NULL) { 695if(lost < ORPHAN_CUTOFF) 696describe_one_orphan(&sb, c); 697 last = c; 698 lost++; 699} 700if(ORPHAN_CUTOFF < lost) { 701int more = lost - ORPHAN_CUTOFF; 702if(more ==1) 703describe_one_orphan(&sb, last); 704else 705strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 706} 707 708fprintf(stderr, 709Q_( 710/* The singular version */ 711"Warning: you are leaving%dcommit behind, " 712"not connected to\n" 713"any of your branches:\n\n" 714"%s\n", 715/* The plural version */ 716"Warning: you are leaving%dcommits behind, " 717"not connected to\n" 718"any of your branches:\n\n" 719"%s\n", 720/* Give ngettext() the count */ 721 lost), 722 lost, 723 sb.buf); 724strbuf_release(&sb); 725 726if(advice_detached_head) 727fprintf(stderr, 728_( 729"If you want to keep them by creating a new branch, " 730"this may be a good time\nto do so with:\n\n" 731" git branch new_branch_name%s\n\n"), 732find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); 733} 734 735/* 736 * We are about to leave commit that was at the tip of a detached 737 * HEAD. If it is not reachable from any ref, this is the last chance 738 * for the user to do so without resorting to reflog. 739 */ 740static voidorphaned_commit_warning(struct commit *old,struct commit *new) 741{ 742struct rev_info revs; 743struct object *object = &old->object; 744struct object_array refs; 745 746init_revisions(&revs, NULL); 747setup_revisions(0, NULL, &revs, NULL); 748 749 object->flags &= ~UNINTERESTING; 750add_pending_object(&revs, object,sha1_to_hex(object->sha1)); 751 752for_each_ref(add_pending_uninteresting_ref, &revs); 753add_pending_sha1(&revs,"HEAD",new->object.sha1, UNINTERESTING); 754 755 refs = revs.pending; 756 revs.leak_pending =1; 757 758if(prepare_revision_walk(&revs)) 759die(_("internal error in revision walk")); 760if(!(old->object.flags & UNINTERESTING)) 761suggest_reattach(old, &revs); 762else 763describe_detached_head(_("Previous HEAD position was"), old); 764 765clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS); 766free(refs.objects); 767} 768 769static intswitch_branches(const struct checkout_opts *opts, 770struct branch_info *new) 771{ 772int ret =0; 773struct branch_info old; 774void*path_to_free; 775unsigned char rev[20]; 776int flag, writeout_error =0; 777memset(&old,0,sizeof(old)); 778 old.path = path_to_free =resolve_refdup("HEAD", rev,0, &flag); 779 old.commit =lookup_commit_reference_gently(rev,1); 780if(!(flag & REF_ISSYMREF)) 781 old.path = NULL; 782 783if(old.path &&starts_with(old.path,"refs/heads/")) 784 old.name = old.path +strlen("refs/heads/"); 785 786if(!new->name) { 787new->name ="HEAD"; 788new->commit = old.commit; 789if(!new->commit) 790die(_("You are on a branch yet to be born")); 791parse_commit_or_die(new->commit); 792} 793 794 ret =merge_working_tree(opts, &old,new, &writeout_error); 795if(ret) { 796free(path_to_free); 797return ret; 798} 799 800if(!opts->quiet && !old.path && old.commit &&new->commit != old.commit) 801orphaned_commit_warning(old.commit,new->commit); 802 803update_refs_for_switch(opts, &old,new); 804 805 ret =post_checkout_hook(old.commit,new->commit,1); 806free(path_to_free); 807return ret || writeout_error; 808} 809 810static intgit_checkout_config(const char*var,const char*value,void*cb) 811{ 812if(!strcmp(var,"diff.ignoresubmodules")) { 813struct checkout_opts *opts = cb; 814handle_ignore_submodules_arg(&opts->diff_options, value); 815return0; 816} 817 818if(starts_with(var,"submodule.")) 819returnparse_submodule_config_option(var, value); 820 821returngit_xmerge_config(var, value, NULL); 822} 823 824struct tracking_name_data { 825/* const */char*src_ref; 826char*dst_ref; 827unsigned char*dst_sha1; 828int unique; 829}; 830 831static intcheck_tracking_name(struct remote *remote,void*cb_data) 832{ 833struct tracking_name_data *cb = cb_data; 834struct refspec query; 835memset(&query,0,sizeof(struct refspec)); 836 query.src = cb->src_ref; 837if(remote_find_tracking(remote, &query) || 838get_sha1(query.dst, cb->dst_sha1)) { 839free(query.dst); 840return0; 841} 842if(cb->dst_ref) { 843free(query.dst); 844 cb->unique =0; 845return0; 846} 847 cb->dst_ref = 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 dash_dash_pos; 876int has_dash_dash =0; 877int i; 878 879/* 880 * case 1: git checkout <ref> -- [<paths>] 881 * 882 * <ref> must be a valid tree, everything after the '--' must be 883 * a path. 884 * 885 * case 2: git checkout -- [<paths>] 886 * 887 * everything after the '--' must be paths. 888 * 889 * case 3: git checkout <something> [--] 890 * 891 * (a) If <something> is a commit, that is to 892 * switch to the branch or detach HEAD at it. As a special case, 893 * if <something> is A...B (missing A or B means HEAD but you can 894 * omit at most one side), and if there is a unique merge base 895 * between A and B, A...B names that merge base. 896 * 897 * (b) If <something> is _not_ a commit, either "--" is present 898 * or <something> is not a path, no -t nor -b was given, and 899 * and there is a tracking branch whose name is <something> 900 * in one and only one remote, then this is a short-hand to 901 * fork local <something> from that remote-tracking branch. 902 * 903 * (c) Otherwise, if "--" is present, treat it like case (1). 904 * 905 * (d) Otherwise : 906 * - if it's a reference, treat it like case (1) 907 * - else if it's a path, treat it like case (2) 908 * - else: fail. 909 * 910 * case 4: git checkout <something> <paths> 911 * 912 * The first argument must not be ambiguous. 913 * - If it's *only* a reference, treat it like case (1). 914 * - If it's only a path, treat it like case (2). 915 * - else: fail. 916 * 917 */ 918if(!argc) 919return0; 920 921 arg = argv[0]; 922 dash_dash_pos = -1; 923for(i =0; i < argc; i++) { 924if(!strcmp(argv[i],"--")) { 925 dash_dash_pos = i; 926break; 927} 928} 929if(dash_dash_pos ==0) 930return1;/* case (2) */ 931else if(dash_dash_pos ==1) 932 has_dash_dash =1;/* case (3) or (1) */ 933else if(dash_dash_pos >=2) 934die(_("only one reference expected,%dgiven."), dash_dash_pos); 935 936if(!strcmp(arg,"-")) 937 arg ="@{-1}"; 938 939if(get_sha1_mb(arg, rev)) { 940/* 941 * Either case (3) or (4), with <something> not being 942 * a commit, or an attempt to use case (1) with an 943 * invalid ref. 944 * 945 * It's likely an error, but we need to find out if 946 * we should auto-create the branch, case (3).(b). 947 */ 948int recover_with_dwim = dwim_new_local_branch_ok; 949 950if(check_filename(NULL, arg) && !has_dash_dash) 951 recover_with_dwim =0; 952/* 953 * Accept "git checkout foo" and "git checkout foo --" 954 * as candidates for dwim. 955 */ 956if(!(argc ==1&& !has_dash_dash) && 957!(argc ==2&& has_dash_dash)) 958 recover_with_dwim =0; 959 960if(recover_with_dwim) { 961const char*remote =unique_tracking_name(arg, rev); 962if(remote) { 963*new_branch = arg; 964 arg = remote; 965/* DWIMmed to create local branch, case (3).(b) */ 966}else{ 967 recover_with_dwim =0; 968} 969} 970 971if(!recover_with_dwim) { 972if(has_dash_dash) 973die(_("invalid reference:%s"), arg); 974return argcount; 975} 976} 977 978/* we can't end up being in (2) anymore, eat the argument */ 979 argcount++; 980 argv++; 981 argc--; 982 983new->name = arg; 984setup_branch_path(new); 985 986if(!check_refname_format(new->path,0) && 987!read_ref(new->path, branch_rev)) 988hashcpy(rev, branch_rev); 989else 990new->path = NULL;/* not an existing branch */ 991 992new->commit =lookup_commit_reference_gently(rev,1); 993if(!new->commit) { 994/* not a commit */ 995*source_tree =parse_tree_indirect(rev); 996}else{ 997parse_commit_or_die(new->commit); 998*source_tree =new->commit->tree; 999}10001001if(!*source_tree)/* case (1): want a tree */1002die(_("reference is not a tree:%s"), arg);1003if(!has_dash_dash) {/* case (3).(d) -> (1) */1004/*1005 * Do not complain the most common case1006 * git checkout branch1007 * even if there happen to be a file called 'branch';1008 * it would be extremely annoying.1009 */1010if(argc)1011verify_non_filename(NULL, arg);1012}else{1013 argcount++;1014 argv++;1015 argc--;1016}10171018return argcount;1019}10201021static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1022{1023int status;1024struct strbuf branch_ref = STRBUF_INIT;10251026if(!opts->new_branch)1027die(_("You are on a branch yet to be born"));1028strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1029 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1030strbuf_release(&branch_ref);1031if(!opts->quiet)1032fprintf(stderr,_("Switched to a new branch '%s'\n"),1033 opts->new_branch);1034return status;1035}10361037static intcheckout_branch(struct checkout_opts *opts,1038struct branch_info *new)1039{1040if(opts->pathspec.nr)1041die(_("paths cannot be used with switching branches"));10421043if(opts->patch_mode)1044die(_("'%s' cannot be used with switching branches"),1045"--patch");10461047if(opts->writeout_stage)1048die(_("'%s' cannot be used with switching branches"),1049"--ours/--theirs");10501051if(opts->force && opts->merge)1052die(_("'%s' cannot be used with '%s'"),"-f","-m");10531054if(opts->force_detach && opts->new_branch)1055die(_("'%s' cannot be used with '%s'"),1056"--detach","-b/-B/--orphan");10571058if(opts->new_orphan_branch) {1059if(opts->track != BRANCH_TRACK_UNSPECIFIED)1060die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1061}else if(opts->force_detach) {1062if(opts->track != BRANCH_TRACK_UNSPECIFIED)1063die(_("'%s' cannot be used with '%s'"),"--detach","-t");1064}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1065 opts->track = git_branch_track;10661067if(new->name && !new->commit)1068die(_("Cannot switch branch to a non-commit '%s'"),1069new->name);10701071if(!new->commit && opts->new_branch) {1072unsigned char rev[20];1073int flag;10741075if(!read_ref_full("HEAD", rev,0, &flag) &&1076(flag & REF_ISSYMREF) &&is_null_sha1(rev))1077returnswitch_unborn_to_new_branch(opts);1078}1079returnswitch_branches(opts,new);1080}10811082intcmd_checkout(int argc,const char**argv,const char*prefix)1083{1084struct checkout_opts opts;1085struct branch_info new;1086char*conflict_style = NULL;1087int dwim_new_local_branch =1;1088struct option options[] = {1089OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1090OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1091N_("create and checkout a new branch")),1092OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1093N_("create/reset and checkout a branch")),1094OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1095OPT_BOOL(0,"detach", &opts.force_detach,N_("detach the HEAD at named commit")),1096OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1097 BRANCH_TRACK_EXPLICIT),1098OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1099OPT_SET_INT('2',"ours", &opts.writeout_stage,N_("checkout our version for unmerged files"),11002),1101OPT_SET_INT('3',"theirs", &opts.writeout_stage,N_("checkout their version for unmerged files"),11023),1103OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)")),1104OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1105OPT_BOOL(0,"overwrite-ignore", &opts.overwrite_ignore,N_("update ignored files (default)")),1106OPT_STRING(0,"conflict", &conflict_style,N_("style"),1107N_("conflict style (merge or diff3)")),1108OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1109OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1110N_("do not limit pathspecs to sparse entries only")),1111OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1112N_("second guess 'git checkout no-such-branch'")),1113OPT_END(),1114};11151116memset(&opts,0,sizeof(opts));1117memset(&new,0,sizeof(new));1118 opts.overwrite_ignore =1;1119 opts.prefix = prefix;11201121gitmodules_config();1122git_config(git_checkout_config, &opts);11231124 opts.track = BRANCH_TRACK_UNSPECIFIED;11251126 argc =parse_options(argc, argv, prefix, options, checkout_usage,1127 PARSE_OPT_KEEP_DASHDASH);11281129if(conflict_style) {1130 opts.merge =1;/* implied */1131git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1132}11331134if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1135die(_("-b, -B and --orphan are mutually exclusive"));11361137/*1138 * From here on, new_branch will contain the branch to be checked out,1139 * and new_branch_force and new_orphan_branch will tell us which one of1140 * -b/-B/--orphan is being used.1141 */1142if(opts.new_branch_force)1143 opts.new_branch = opts.new_branch_force;11441145if(opts.new_orphan_branch)1146 opts.new_branch = opts.new_orphan_branch;11471148/* --track without -b/-B/--orphan should DWIM */1149if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1150const char*argv0 = argv[0];1151if(!argc || !strcmp(argv0,"--"))1152die(_("--track needs a branch name"));1153if(starts_with(argv0,"refs/"))1154 argv0 +=5;1155if(starts_with(argv0,"remotes/"))1156 argv0 +=8;1157 argv0 =strchr(argv0,'/');1158if(!argv0 || !argv0[1])1159die(_("Missing branch name; try -b"));1160 opts.new_branch = argv0 +1;1161}11621163/*1164 * Extract branch name from command line arguments, so1165 * all that is left is pathspecs.1166 *1167 * Handle1168 *1169 * 1) git checkout <tree> -- [<paths>]1170 * 2) git checkout -- [<paths>]1171 * 3) git checkout <something> [<paths>]1172 *1173 * including "last branch" syntax and DWIM-ery for names of1174 * remote branches, erroring out for invalid or ambiguous cases.1175 */1176if(argc) {1177unsigned char rev[20];1178int dwim_ok =1179!opts.patch_mode &&1180 dwim_new_local_branch &&1181 opts.track == BRANCH_TRACK_UNSPECIFIED &&1182!opts.new_branch;1183int n =parse_branchname_arg(argc, argv, dwim_ok,1184&new, &opts.source_tree,1185 rev, &opts.new_branch);1186 argv += n;1187 argc -= n;1188}11891190if(argc) {1191parse_pathspec(&opts.pathspec,0,1192 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1193 prefix, argv);11941195if(!opts.pathspec.nr)1196die(_("invalid path specification"));11971198/*1199 * Try to give more helpful suggestion.1200 * new_branch && argc > 1 will be caught later.1201 */1202if(opts.new_branch && argc ==1)1203die(_("Cannot update paths and switch to branch '%s' at the same time.\n"1204"Did you intend to checkout '%s' which can not be resolved as commit?"),1205 opts.new_branch, argv[0]);12061207if(opts.force_detach)1208die(_("git checkout: --detach does not take a path argument '%s'"),1209 argv[0]);12101211if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1212die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1213"checking out of the index."));1214}12151216if(opts.new_branch) {1217struct strbuf buf = STRBUF_INIT;12181219 opts.branch_exists =1220validate_new_branchname(opts.new_branch, &buf,1221!!opts.new_branch_force,1222!!opts.new_branch_force);12231224strbuf_release(&buf);1225}12261227if(opts.patch_mode || opts.pathspec.nr)1228returncheckout_paths(&opts,new.name);1229else1230returncheckout_branch(&opts, &new);1231}