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