1#include"cache.h" 2#include"builtin.h" 3#include"parse-options.h" 4#include"refs.h" 5#include"commit.h" 6#include"tree.h" 7#include"tree-walk.h" 8#include"cache-tree.h" 9#include"unpack-trees.h" 10#include"dir.h" 11#include"run-command.h" 12#include"merge-recursive.h" 13#include"branch.h" 14#include"diff.h" 15#include"revision.h" 16#include"remote.h" 17#include"blob.h" 18#include"xdiff-interface.h" 19#include"ll-merge.h" 20#include"resolve-undo.h" 21#include"submodule.h" 22#include"argv-array.h" 23 24static const char*const checkout_usage[] = { 25N_("git checkout [options] <branch>"), 26N_("git checkout [options] [<branch>] -- <file>..."), 27 NULL, 28}; 29 30struct checkout_opts { 31int patch_mode; 32int quiet; 33int merge; 34int force; 35int force_detach; 36int writeout_stage; 37int overwrite_ignore; 38int ignore_skipworktree; 39 40const char*new_branch; 41const char*new_branch_force; 42const char*new_orphan_branch; 43int new_branch_log; 44enum branch_track track; 45struct diff_options diff_options; 46 47int branch_exists; 48const char*prefix; 49struct pathspec pathspec; 50struct tree *source_tree; 51}; 52 53static intpost_checkout_hook(struct commit *old,struct commit *new, 54int changed) 55{ 56returnrun_hook_le(NULL,"post-checkout", 57sha1_to_hex(old ? old->object.sha1 : null_sha1), 58sha1_to_hex(new?new->object.sha1 : null_sha1), 59 changed ?"1":"0", NULL); 60/* "new" can be NULL when checking out from the index before 61 a commit exists. */ 62 63} 64 65static intupdate_some(const unsigned char*sha1,const char*base,int baselen, 66const char*pathname,unsigned mode,int stage,void*context) 67{ 68int len; 69struct cache_entry *ce; 70 71if(S_ISDIR(mode)) 72return READ_TREE_RECURSIVE; 73 74 len = baselen +strlen(pathname); 75 ce =xcalloc(1,cache_entry_size(len)); 76hashcpy(ce->sha1, sha1); 77memcpy(ce->name, base, baselen); 78memcpy(ce->name + baselen, pathname, len - baselen); 79 ce->ce_flags =create_ce_flags(0) | CE_UPDATE; 80 ce->ce_namelen = len; 81 ce->ce_mode =create_ce_mode(mode); 82add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); 83return0; 84} 85 86static intread_tree_some(struct tree *tree,const struct pathspec *pathspec) 87{ 88read_tree_recursive(tree,"",0,0, pathspec, update_some, NULL); 89 90/* update the index with the given tree's info 91 * for all args, expanding wildcards, and exit 92 * with any non-zero return code. 93 */ 94return0; 95} 96 97static intskip_same_name(const struct cache_entry *ce,int pos) 98{ 99while(++pos < active_nr && 100!strcmp(active_cache[pos]->name, ce->name)) 101;/* skip */ 102return pos; 103} 104 105static intcheck_stage(int stage,const struct cache_entry *ce,int pos) 106{ 107while(pos < active_nr && 108!strcmp(active_cache[pos]->name, ce->name)) { 109if(ce_stage(active_cache[pos]) == stage) 110return0; 111 pos++; 112} 113if(stage ==2) 114returnerror(_("path '%s' does not have our version"), ce->name); 115else 116returnerror(_("path '%s' does not have their version"), ce->name); 117} 118 119static intcheck_stages(unsigned stages,const struct cache_entry *ce,int pos) 120{ 121unsigned seen =0; 122const char*name = ce->name; 123 124while(pos < active_nr) { 125 ce = active_cache[pos]; 126if(strcmp(name, ce->name)) 127break; 128 seen |= (1<<ce_stage(ce)); 129 pos++; 130} 131if((stages & seen) != stages) 132returnerror(_("path '%s' does not have all necessary versions"), 133 name); 134return0; 135} 136 137static intcheckout_stage(int stage,struct cache_entry *ce,int pos, 138struct checkout *state) 139{ 140while(pos < active_nr && 141!strcmp(active_cache[pos]->name, ce->name)) { 142if(ce_stage(active_cache[pos]) == stage) 143returncheckout_entry(active_cache[pos], state, NULL); 144 pos++; 145} 146if(stage ==2) 147returnerror(_("path '%s' does not have our version"), ce->name); 148else 149returnerror(_("path '%s' does not have their version"), ce->name); 150} 151 152static intcheckout_merged(int pos,struct checkout *state) 153{ 154struct cache_entry *ce = active_cache[pos]; 155const char*path = ce->name; 156 mmfile_t ancestor, ours, theirs; 157int status; 158unsigned char sha1[20]; 159 mmbuffer_t result_buf; 160unsigned char threeway[3][20]; 161unsigned mode =0; 162 163memset(threeway,0,sizeof(threeway)); 164while(pos < active_nr) { 165int stage; 166 stage =ce_stage(ce); 167if(!stage ||strcmp(path, ce->name)) 168break; 169hashcpy(threeway[stage -1], ce->sha1); 170if(stage ==2) 171 mode =create_ce_mode(ce->ce_mode); 172 pos++; 173 ce = active_cache[pos]; 174} 175if(is_null_sha1(threeway[1]) ||is_null_sha1(threeway[2])) 176returnerror(_("path '%s' does not have necessary versions"), path); 177 178read_mmblob(&ancestor, threeway[0]); 179read_mmblob(&ours, threeway[1]); 180read_mmblob(&theirs, threeway[2]); 181 182/* 183 * NEEDSWORK: re-create conflicts from merges with 184 * merge.renormalize set, too 185 */ 186 status =ll_merge(&result_buf, path, &ancestor,"base", 187&ours,"ours", &theirs,"theirs", NULL); 188free(ancestor.ptr); 189free(ours.ptr); 190free(theirs.ptr); 191if(status <0|| !result_buf.ptr) { 192free(result_buf.ptr); 193returnerror(_("path '%s': cannot merge"), path); 194} 195 196/* 197 * NEEDSWORK: 198 * There is absolutely no reason to write this as a blob object 199 * and create a phony cache entry just to leak. This hack is 200 * primarily to get to the write_entry() machinery that massages 201 * the contents to work-tree format and writes out which only 202 * allows it for a cache entry. The code in write_entry() needs 203 * to be refactored to allow us to feed a <buffer, size, mode> 204 * instead of a cache entry. Such a refactoring would help 205 * merge_recursive as well (it also writes the merge result to the 206 * object database even when it may contain conflicts). 207 */ 208if(write_sha1_file(result_buf.ptr, result_buf.size, 209 blob_type, sha1)) 210die(_("Unable to add merge result for '%s'"), path); 211 ce =make_cache_entry(mode, sha1, path,2,0); 212if(!ce) 213die(_("make_cache_entry failed for path '%s'"), path); 214 status =checkout_entry(ce, state, NULL); 215return status; 216} 217 218static intcheckout_paths(const struct checkout_opts *opts, 219const char*revision) 220{ 221int pos; 222struct checkout state; 223static char*ps_matched; 224unsigned char rev[20]; 225int flag; 226struct commit *head; 227int errs =0; 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(!active_cache_tree) 557 active_cache_tree =cache_tree(); 558 559if(!cache_tree_fully_valid(active_cache_tree)) 560cache_tree_update(active_cache_tree, 561(const struct cache_entry *const*)active_cache, 562 active_nr, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); 563 564if(write_cache(newfd, active_cache, active_nr) || 565commit_locked_index(lock_file)) 566die(_("unable to write new index file")); 567 568if(!opts->force && !opts->quiet) 569show_local_changes(&new->commit->object, &opts->diff_options); 570 571return0; 572} 573 574static voidreport_tracking(struct branch_info *new) 575{ 576struct strbuf sb = STRBUF_INIT; 577struct branch *branch =branch_get(new->name); 578 579if(!format_tracking_info(branch, &sb)) 580return; 581fputs(sb.buf, stdout); 582strbuf_release(&sb); 583} 584 585static voidupdate_refs_for_switch(const struct checkout_opts *opts, 586struct branch_info *old, 587struct branch_info *new) 588{ 589struct strbuf msg = STRBUF_INIT; 590const char*old_desc, *reflog_msg; 591if(opts->new_branch) { 592if(opts->new_orphan_branch) { 593if(opts->new_branch_log && !log_all_ref_updates) { 594int temp; 595char log_file[PATH_MAX]; 596char*ref_name =mkpath("refs/heads/%s", opts->new_orphan_branch); 597 598 temp = log_all_ref_updates; 599 log_all_ref_updates =1; 600if(log_ref_setup(ref_name, log_file,sizeof(log_file))) { 601fprintf(stderr,_("Can not do reflog for '%s'\n"), 602 opts->new_orphan_branch); 603 log_all_ref_updates = temp; 604return; 605} 606 log_all_ref_updates = temp; 607} 608} 609else 610create_branch(old->name, opts->new_branch,new->name, 611 opts->new_branch_force ?1:0, 612 opts->new_branch_log, 613 opts->new_branch_force ?1:0, 614 opts->quiet, 615 opts->track); 616new->name = opts->new_branch; 617setup_branch_path(new); 618} 619 620 old_desc = old->name; 621if(!old_desc && old->commit) 622 old_desc =sha1_to_hex(old->commit->object.sha1); 623 624 reflog_msg =getenv("GIT_REFLOG_ACTION"); 625if(!reflog_msg) 626strbuf_addf(&msg,"checkout: moving from%sto%s", 627 old_desc ? old_desc :"(invalid)",new->name); 628else 629strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 630 631if(!strcmp(new->name,"HEAD") && !new->path && !opts->force_detach) { 632/* Nothing to do. */ 633}else if(opts->force_detach || !new->path) {/* No longer on any branch. */ 634update_ref(msg.buf,"HEAD",new->commit->object.sha1, NULL, 635 REF_NODEREF, DIE_ON_ERR); 636if(!opts->quiet) { 637if(old->path && advice_detached_head) 638detach_advice(new->name); 639describe_detached_head(_("HEAD is now at"),new->commit); 640} 641}else if(new->path) {/* Switch branches. */ 642create_symref("HEAD",new->path, msg.buf); 643if(!opts->quiet) { 644if(old->path && !strcmp(new->path, old->path)) { 645if(opts->new_branch_force) 646fprintf(stderr,_("Reset branch '%s'\n"), 647new->name); 648else 649fprintf(stderr,_("Already on '%s'\n"), 650new->name); 651}else if(opts->new_branch) { 652if(opts->branch_exists) 653fprintf(stderr,_("Switched to and reset branch '%s'\n"),new->name); 654else 655fprintf(stderr,_("Switched to a new branch '%s'\n"),new->name); 656}else{ 657fprintf(stderr,_("Switched to branch '%s'\n"), 658new->name); 659} 660} 661if(old->path && old->name) { 662char log_file[PATH_MAX], ref_file[PATH_MAX]; 663 664git_snpath(log_file,sizeof(log_file),"logs/%s", old->path); 665git_snpath(ref_file,sizeof(ref_file),"%s", old->path); 666if(!file_exists(ref_file) &&file_exists(log_file)) 667remove_path(log_file); 668} 669} 670remove_branch_state(); 671strbuf_release(&msg); 672if(!opts->quiet && 673(new->path || (!opts->force_detach && !strcmp(new->name,"HEAD")))) 674report_tracking(new); 675} 676 677static intadd_pending_uninteresting_ref(const char*refname, 678const unsigned char*sha1, 679int flags,void*cb_data) 680{ 681add_pending_sha1(cb_data, refname, sha1, UNINTERESTING); 682return0; 683} 684 685static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 686{ 687strbuf_addstr(sb," "); 688strbuf_addstr(sb, 689find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); 690strbuf_addch(sb,' '); 691if(!parse_commit(commit)) 692pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 693strbuf_addch(sb,'\n'); 694} 695 696#define ORPHAN_CUTOFF 4 697static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 698{ 699struct commit *c, *last = NULL; 700struct strbuf sb = STRBUF_INIT; 701int lost =0; 702while((c =get_revision(revs)) != NULL) { 703if(lost < ORPHAN_CUTOFF) 704describe_one_orphan(&sb, c); 705 last = c; 706 lost++; 707} 708if(ORPHAN_CUTOFF < lost) { 709int more = lost - ORPHAN_CUTOFF; 710if(more ==1) 711describe_one_orphan(&sb, last); 712else 713strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 714} 715 716fprintf(stderr, 717Q_( 718/* The singular version */ 719"Warning: you are leaving%dcommit behind, " 720"not connected to\n" 721"any of your branches:\n\n" 722"%s\n", 723/* The plural version */ 724"Warning: you are leaving%dcommits behind, " 725"not connected to\n" 726"any of your branches:\n\n" 727"%s\n", 728/* Give ngettext() the count */ 729 lost), 730 lost, 731 sb.buf); 732strbuf_release(&sb); 733 734if(advice_detached_head) 735fprintf(stderr, 736_( 737"If you want to keep them by creating a new branch, " 738"this may be a good time\nto do so with:\n\n" 739" git branch new_branch_name%s\n\n"), 740find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); 741} 742 743/* 744 * We are about to leave commit that was at the tip of a detached 745 * HEAD. If it is not reachable from any ref, this is the last chance 746 * for the user to do so without resorting to reflog. 747 */ 748static voidorphaned_commit_warning(struct commit *old,struct commit *new) 749{ 750struct rev_info revs; 751struct object *object = &old->object; 752struct object_array refs; 753 754init_revisions(&revs, NULL); 755setup_revisions(0, NULL, &revs, NULL); 756 757 object->flags &= ~UNINTERESTING; 758add_pending_object(&revs, object,sha1_to_hex(object->sha1)); 759 760for_each_ref(add_pending_uninteresting_ref, &revs); 761add_pending_sha1(&revs,"HEAD",new->object.sha1, UNINTERESTING); 762 763 refs = revs.pending; 764 revs.leak_pending =1; 765 766if(prepare_revision_walk(&revs)) 767die(_("internal error in revision walk")); 768if(!(old->object.flags & UNINTERESTING)) 769suggest_reattach(old, &revs); 770else 771describe_detached_head(_("Previous HEAD position was"), old); 772 773clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS); 774free(refs.objects); 775} 776 777static intswitch_branches(const struct checkout_opts *opts, 778struct branch_info *new) 779{ 780int ret =0; 781struct branch_info old; 782void*path_to_free; 783unsigned char rev[20]; 784int flag, writeout_error =0; 785memset(&old,0,sizeof(old)); 786 old.path = path_to_free =resolve_refdup("HEAD", rev,0, &flag); 787 old.commit =lookup_commit_reference_gently(rev,1); 788if(!(flag & REF_ISSYMREF)) 789 old.path = NULL; 790 791if(old.path &&starts_with(old.path,"refs/heads/")) 792 old.name = old.path +strlen("refs/heads/"); 793 794if(!new->name) { 795new->name ="HEAD"; 796new->commit = old.commit; 797if(!new->commit) 798die(_("You are on a branch yet to be born")); 799parse_commit_or_die(new->commit); 800} 801 802 ret =merge_working_tree(opts, &old,new, &writeout_error); 803if(ret) { 804free(path_to_free); 805return ret; 806} 807 808if(!opts->quiet && !old.path && old.commit &&new->commit != old.commit) 809orphaned_commit_warning(old.commit,new->commit); 810 811update_refs_for_switch(opts, &old,new); 812 813 ret =post_checkout_hook(old.commit,new->commit,1); 814free(path_to_free); 815return ret || writeout_error; 816} 817 818static intgit_checkout_config(const char*var,const char*value,void*cb) 819{ 820if(!strcmp(var,"diff.ignoresubmodules")) { 821struct checkout_opts *opts = cb; 822handle_ignore_submodules_arg(&opts->diff_options, value); 823return0; 824} 825 826if(starts_with(var,"submodule.")) 827returnparse_submodule_config_option(var, value); 828 829returngit_xmerge_config(var, value, NULL); 830} 831 832struct tracking_name_data { 833/* const */char*src_ref; 834char*dst_ref; 835unsigned char*dst_sha1; 836int unique; 837}; 838 839static intcheck_tracking_name(struct remote *remote,void*cb_data) 840{ 841struct tracking_name_data *cb = cb_data; 842struct refspec query; 843memset(&query,0,sizeof(struct refspec)); 844 query.src = cb->src_ref; 845if(remote_find_tracking(remote, &query) || 846get_sha1(query.dst, cb->dst_sha1)) { 847free(query.dst); 848return0; 849} 850if(cb->dst_ref) { 851free(query.dst); 852 cb->unique =0; 853return0; 854} 855 cb->dst_ref = query.dst; 856return0; 857} 858 859static const char*unique_tracking_name(const char*name,unsigned char*sha1) 860{ 861struct tracking_name_data cb_data = { NULL, NULL, NULL,1}; 862char src_ref[PATH_MAX]; 863snprintf(src_ref, PATH_MAX,"refs/heads/%s", name); 864 cb_data.src_ref = src_ref; 865 cb_data.dst_sha1 = sha1; 866for_each_remote(check_tracking_name, &cb_data); 867if(cb_data.unique) 868return cb_data.dst_ref; 869free(cb_data.dst_ref); 870return NULL; 871} 872 873static intparse_branchname_arg(int argc,const char**argv, 874int dwim_new_local_branch_ok, 875struct branch_info *new, 876struct tree **source_tree, 877unsigned char rev[20], 878const char**new_branch) 879{ 880int argcount =0; 881unsigned char branch_rev[20]; 882const char*arg; 883int dash_dash_pos; 884int has_dash_dash =0; 885int i; 886 887/* 888 * case 1: git checkout <ref> -- [<paths>] 889 * 890 * <ref> must be a valid tree, everything after the '--' must be 891 * a path. 892 * 893 * case 2: git checkout -- [<paths>] 894 * 895 * everything after the '--' must be paths. 896 * 897 * case 3: git checkout <something> [--] 898 * 899 * (a) If <something> is a commit, that is to 900 * switch to the branch or detach HEAD at it. As a special case, 901 * if <something> is A...B (missing A or B means HEAD but you can 902 * omit at most one side), and if there is a unique merge base 903 * between A and B, A...B names that merge base. 904 * 905 * (b) If <something> is _not_ a commit, either "--" is present 906 * or <something> is not a path, no -t or -b was given, and 907 * and there is a tracking branch whose name is <something> 908 * in one and only one remote, then this is a short-hand to 909 * fork local <something> from that remote-tracking branch. 910 * 911 * (c) Otherwise, if "--" is present, treat it like case (1). 912 * 913 * (d) Otherwise : 914 * - if it's a reference, treat it like case (1) 915 * - else if it's a path, treat it like case (2) 916 * - else: fail. 917 * 918 * case 4: git checkout <something> <paths> 919 * 920 * The first argument must not be ambiguous. 921 * - If it's *only* a reference, treat it like case (1). 922 * - If it's only a path, treat it like case (2). 923 * - else: fail. 924 * 925 */ 926if(!argc) 927return0; 928 929 arg = argv[0]; 930 dash_dash_pos = -1; 931for(i =0; i < argc; i++) { 932if(!strcmp(argv[i],"--")) { 933 dash_dash_pos = i; 934break; 935} 936} 937if(dash_dash_pos ==0) 938return1;/* case (2) */ 939else if(dash_dash_pos ==1) 940 has_dash_dash =1;/* case (3) or (1) */ 941else if(dash_dash_pos >=2) 942die(_("only one reference expected,%dgiven."), dash_dash_pos); 943 944if(!strcmp(arg,"-")) 945 arg ="@{-1}"; 946 947if(get_sha1_mb(arg, rev)) { 948/* 949 * Either case (3) or (4), with <something> not being 950 * a commit, or an attempt to use case (1) with an 951 * invalid ref. 952 * 953 * It's likely an error, but we need to find out if 954 * we should auto-create the branch, case (3).(b). 955 */ 956int recover_with_dwim = dwim_new_local_branch_ok; 957 958if(check_filename(NULL, arg) && !has_dash_dash) 959 recover_with_dwim =0; 960/* 961 * Accept "git checkout foo" and "git checkout foo --" 962 * as candidates for dwim. 963 */ 964if(!(argc ==1&& !has_dash_dash) && 965!(argc ==2&& has_dash_dash)) 966 recover_with_dwim =0; 967 968if(recover_with_dwim) { 969const char*remote =unique_tracking_name(arg, rev); 970if(remote) { 971*new_branch = arg; 972 arg = remote; 973/* DWIMmed to create local branch, case (3).(b) */ 974}else{ 975 recover_with_dwim =0; 976} 977} 978 979if(!recover_with_dwim) { 980if(has_dash_dash) 981die(_("invalid reference:%s"), arg); 982return argcount; 983} 984} 985 986/* we can't end up being in (2) anymore, eat the argument */ 987 argcount++; 988 argv++; 989 argc--; 990 991new->name = arg; 992setup_branch_path(new); 993 994if(!check_refname_format(new->path,0) && 995!read_ref(new->path, branch_rev)) 996hashcpy(rev, branch_rev); 997else 998new->path = NULL;/* not an existing branch */ 9991000new->commit =lookup_commit_reference_gently(rev,1);1001if(!new->commit) {1002/* not a commit */1003*source_tree =parse_tree_indirect(rev);1004}else{1005parse_commit_or_die(new->commit);1006*source_tree =new->commit->tree;1007}10081009if(!*source_tree)/* case (1): want a tree */1010die(_("reference is not a tree:%s"), arg);1011if(!has_dash_dash) {/* case (3).(d) -> (1) */1012/*1013 * Do not complain the most common case1014 * git checkout branch1015 * even if there happen to be a file called 'branch';1016 * it would be extremely annoying.1017 */1018if(argc)1019verify_non_filename(NULL, arg);1020}else{1021 argcount++;1022 argv++;1023 argc--;1024}10251026return argcount;1027}10281029static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1030{1031int status;1032struct strbuf branch_ref = STRBUF_INIT;10331034if(!opts->new_branch)1035die(_("You are on a branch yet to be born"));1036strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1037 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1038strbuf_release(&branch_ref);1039if(!opts->quiet)1040fprintf(stderr,_("Switched to a new branch '%s'\n"),1041 opts->new_branch);1042return status;1043}10441045static intcheckout_branch(struct checkout_opts *opts,1046struct branch_info *new)1047{1048if(opts->pathspec.nr)1049die(_("paths cannot be used with switching branches"));10501051if(opts->patch_mode)1052die(_("'%s' cannot be used with switching branches"),1053"--patch");10541055if(opts->writeout_stage)1056die(_("'%s' cannot be used with switching branches"),1057"--ours/--theirs");10581059if(opts->force && opts->merge)1060die(_("'%s' cannot be used with '%s'"),"-f","-m");10611062if(opts->force_detach && opts->new_branch)1063die(_("'%s' cannot be used with '%s'"),1064"--detach","-b/-B/--orphan");10651066if(opts->new_orphan_branch) {1067if(opts->track != BRANCH_TRACK_UNSPECIFIED)1068die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1069}else if(opts->force_detach) {1070if(opts->track != BRANCH_TRACK_UNSPECIFIED)1071die(_("'%s' cannot be used with '%s'"),"--detach","-t");1072}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1073 opts->track = git_branch_track;10741075if(new->name && !new->commit)1076die(_("Cannot switch branch to a non-commit '%s'"),1077new->name);10781079if(!new->commit && opts->new_branch) {1080unsigned char rev[20];1081int flag;10821083if(!read_ref_full("HEAD", rev,0, &flag) &&1084(flag & REF_ISSYMREF) &&is_null_sha1(rev))1085returnswitch_unborn_to_new_branch(opts);1086}1087returnswitch_branches(opts,new);1088}10891090intcmd_checkout(int argc,const char**argv,const char*prefix)1091{1092struct checkout_opts opts;1093struct branch_info new;1094char*conflict_style = NULL;1095int dwim_new_local_branch =1;1096struct option options[] = {1097OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1098OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1099N_("create and checkout a new branch")),1100OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1101N_("create/reset and checkout a branch")),1102OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1103OPT_BOOL(0,"detach", &opts.force_detach,N_("detach the HEAD at named commit")),1104OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1105 BRANCH_TRACK_EXPLICIT),1106OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1107OPT_SET_INT('2',"ours", &opts.writeout_stage,N_("checkout our version for unmerged files"),11082),1109OPT_SET_INT('3',"theirs", &opts.writeout_stage,N_("checkout their version for unmerged files"),11103),1111OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)")),1112OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1113OPT_BOOL(0,"overwrite-ignore", &opts.overwrite_ignore,N_("update ignored files (default)")),1114OPT_STRING(0,"conflict", &conflict_style,N_("style"),1115N_("conflict style (merge or diff3)")),1116OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1117OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1118N_("do not limit pathspecs to sparse entries only")),1119OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1120N_("second guess 'git checkout no-such-branch'")),1121OPT_END(),1122};11231124memset(&opts,0,sizeof(opts));1125memset(&new,0,sizeof(new));1126 opts.overwrite_ignore =1;1127 opts.prefix = prefix;11281129gitmodules_config();1130git_config(git_checkout_config, &opts);11311132 opts.track = BRANCH_TRACK_UNSPECIFIED;11331134 argc =parse_options(argc, argv, prefix, options, checkout_usage,1135 PARSE_OPT_KEEP_DASHDASH);11361137if(conflict_style) {1138 opts.merge =1;/* implied */1139git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1140}11411142if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1143die(_("-b, -B and --orphan are mutually exclusive"));11441145/*1146 * From here on, new_branch will contain the branch to be checked out,1147 * and new_branch_force and new_orphan_branch will tell us which one of1148 * -b/-B/--orphan is being used.1149 */1150if(opts.new_branch_force)1151 opts.new_branch = opts.new_branch_force;11521153if(opts.new_orphan_branch)1154 opts.new_branch = opts.new_orphan_branch;11551156/* --track without -b/-B/--orphan should DWIM */1157if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1158const char*argv0 = argv[0];1159if(!argc || !strcmp(argv0,"--"))1160die(_("--track needs a branch name"));1161if(starts_with(argv0,"refs/"))1162 argv0 +=5;1163if(starts_with(argv0,"remotes/"))1164 argv0 +=8;1165 argv0 =strchr(argv0,'/');1166if(!argv0 || !argv0[1])1167die(_("Missing branch name; try -b"));1168 opts.new_branch = argv0 +1;1169}11701171/*1172 * Extract branch name from command line arguments, so1173 * all that is left is pathspecs.1174 *1175 * Handle1176 *1177 * 1) git checkout <tree> -- [<paths>]1178 * 2) git checkout -- [<paths>]1179 * 3) git checkout <something> [<paths>]1180 *1181 * including "last branch" syntax and DWIM-ery for names of1182 * remote branches, erroring out for invalid or ambiguous cases.1183 */1184if(argc) {1185unsigned char rev[20];1186int dwim_ok =1187!opts.patch_mode &&1188 dwim_new_local_branch &&1189 opts.track == BRANCH_TRACK_UNSPECIFIED &&1190!opts.new_branch;1191int n =parse_branchname_arg(argc, argv, dwim_ok,1192&new, &opts.source_tree,1193 rev, &opts.new_branch);1194 argv += n;1195 argc -= n;1196}11971198if(argc) {1199parse_pathspec(&opts.pathspec,0,1200 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1201 prefix, argv);12021203if(!opts.pathspec.nr)1204die(_("invalid path specification"));12051206/*1207 * Try to give more helpful suggestion.1208 * new_branch && argc > 1 will be caught later.1209 */1210if(opts.new_branch && argc ==1)1211die(_("Cannot update paths and switch to branch '%s' at the same time.\n"1212"Did you intend to checkout '%s' which can not be resolved as commit?"),1213 opts.new_branch, argv[0]);12141215if(opts.force_detach)1216die(_("git checkout: --detach does not take a path argument '%s'"),1217 argv[0]);12181219if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1220die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1221"checking out of the index."));1222}12231224if(opts.new_branch) {1225struct strbuf buf = STRBUF_INIT;12261227 opts.branch_exists =1228validate_new_branchname(opts.new_branch, &buf,1229!!opts.new_branch_force,1230!!opts.new_branch_force);12311232strbuf_release(&buf);1233}12341235if(opts.patch_mode || opts.pathspec.nr)1236returncheckout_paths(&opts,new.name);1237else1238returncheckout_branch(&opts, &new);1239}