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