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 && 99oideq(&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", NULL); 212free(ancestor.ptr); 213free(ours.ptr); 214free(theirs.ptr); 215if(status <0|| !result_buf.ptr) { 216free(result_buf.ptr); 217returnerror(_("path '%s': cannot merge"), path); 218} 219 220/* 221 * NEEDSWORK: 222 * There is absolutely no reason to write this as a blob object 223 * and create a phony cache entry. This hack is primarily to get 224 * to the write_entry() machinery that massages the contents to 225 * work-tree format and writes out which only allows it for a 226 * cache entry. The code in write_entry() needs to be refactored 227 * to allow us to feed a <buffer, size, mode> instead of a cache 228 * entry. Such a refactoring would help merge_recursive as well 229 * (it also writes the merge result to the object database even 230 * when it may contain conflicts). 231 */ 232if(write_object_file(result_buf.ptr, result_buf.size, blob_type, &oid)) 233die(_("Unable to add merge result for '%s'"), path); 234free(result_buf.ptr); 235 ce =make_transient_cache_entry(mode, &oid, path,2); 236if(!ce) 237die(_("make_cache_entry failed for path '%s'"), path); 238 status =checkout_entry(ce, state, NULL); 239discard_cache_entry(ce); 240return status; 241} 242 243static intcheckout_paths(const struct checkout_opts *opts, 244const char*revision) 245{ 246int pos; 247struct checkout state = CHECKOUT_INIT; 248static char*ps_matched; 249struct object_id rev; 250struct commit *head; 251int errs =0; 252struct lock_file lock_file = LOCK_INIT; 253 254if(opts->track != BRANCH_TRACK_UNSPECIFIED) 255die(_("'%s' cannot be used with updating paths"),"--track"); 256 257if(opts->new_branch_log) 258die(_("'%s' cannot be used with updating paths"),"-l"); 259 260if(opts->force && opts->patch_mode) 261die(_("'%s' cannot be used with updating paths"),"-f"); 262 263if(opts->force_detach) 264die(_("'%s' cannot be used with updating paths"),"--detach"); 265 266if(opts->merge && opts->patch_mode) 267die(_("'%s' cannot be used with%s"),"--merge","--patch"); 268 269if(opts->force && opts->merge) 270die(_("'%s' cannot be used with%s"),"-f","-m"); 271 272if(opts->new_branch) 273die(_("Cannot update paths and switch to branch '%s' at the same time."), 274 opts->new_branch); 275 276if(opts->patch_mode) 277returnrun_add_interactive(revision,"--patch=checkout", 278&opts->pathspec); 279 280hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); 281if(read_cache_preload(&opts->pathspec) <0) 282returnerror(_("index file corrupt")); 283 284if(opts->source_tree) 285read_tree_some(opts->source_tree, &opts->pathspec); 286 287 ps_matched =xcalloc(opts->pathspec.nr,1); 288 289/* 290 * Make sure all pathspecs participated in locating the paths 291 * to be checked out. 292 */ 293for(pos =0; pos < active_nr; pos++) { 294struct cache_entry *ce = active_cache[pos]; 295 ce->ce_flags &= ~CE_MATCHED; 296if(!opts->ignore_skipworktree &&ce_skip_worktree(ce)) 297continue; 298if(opts->source_tree && !(ce->ce_flags & CE_UPDATE)) 299/* 300 * "git checkout tree-ish -- path", but this entry 301 * is in the original index; it will not be checked 302 * out to the working tree and it does not matter 303 * if pathspec matched this entry. We will not do 304 * anything to this entry at all. 305 */ 306continue; 307/* 308 * Either this entry came from the tree-ish we are 309 * checking the paths out of, or we are checking out 310 * of the index. 311 * 312 * If it comes from the tree-ish, we already know it 313 * matches the pathspec and could just stamp 314 * CE_MATCHED to it from update_some(). But we still 315 * need ps_matched and read_tree_recursive (and 316 * eventually tree_entry_interesting) cannot fill 317 * ps_matched yet. Once it can, we can avoid calling 318 * match_pathspec() for _all_ entries when 319 * opts->source_tree != NULL. 320 */ 321if(ce_path_match(&the_index, ce, &opts->pathspec, ps_matched)) 322 ce->ce_flags |= CE_MATCHED; 323} 324 325if(report_path_error(ps_matched, &opts->pathspec, opts->prefix)) { 326free(ps_matched); 327return1; 328} 329free(ps_matched); 330 331/* "checkout -m path" to recreate conflicted state */ 332if(opts->merge) 333unmerge_marked_index(&the_index); 334 335/* Any unmerged paths? */ 336for(pos =0; pos < active_nr; pos++) { 337const struct cache_entry *ce = active_cache[pos]; 338if(ce->ce_flags & CE_MATCHED) { 339if(!ce_stage(ce)) 340continue; 341if(opts->force) { 342warning(_("path '%s' is unmerged"), ce->name); 343}else if(opts->writeout_stage) { 344 errs |=check_stage(opts->writeout_stage, ce, pos); 345}else if(opts->merge) { 346 errs |=check_stages((1<<2) | (1<<3), ce, pos); 347}else{ 348 errs =1; 349error(_("path '%s' is unmerged"), ce->name); 350} 351 pos =skip_same_name(ce, pos) -1; 352} 353} 354if(errs) 355return1; 356 357/* Now we are committed to check them out */ 358 state.force =1; 359 state.refresh_cache =1; 360 state.istate = &the_index; 361 362enable_delayed_checkout(&state); 363for(pos =0; pos < active_nr; pos++) { 364struct cache_entry *ce = active_cache[pos]; 365if(ce->ce_flags & CE_MATCHED) { 366if(!ce_stage(ce)) { 367 errs |=checkout_entry(ce, &state, NULL); 368continue; 369} 370if(opts->writeout_stage) 371 errs |=checkout_stage(opts->writeout_stage, ce, pos, &state); 372else if(opts->merge) 373 errs |=checkout_merged(pos, &state); 374 pos =skip_same_name(ce, pos) -1; 375} 376} 377 errs |=finish_delayed_checkout(&state); 378 379if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) 380die(_("unable to write new index file")); 381 382read_ref_full("HEAD",0, &rev, NULL); 383 head =lookup_commit_reference_gently(the_repository, &rev,1); 384 385 errs |=post_checkout_hook(head, head,0); 386return errs; 387} 388 389static voidshow_local_changes(struct object *head, 390const struct diff_options *opts) 391{ 392struct rev_info rev; 393/* I think we want full paths, even if we're in a subdirectory. */ 394init_revisions(&rev, NULL); 395 rev.diffopt.flags = opts->flags; 396 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; 397diff_setup_done(&rev.diffopt); 398add_pending_object(&rev, head, NULL); 399run_diff_index(&rev,0); 400} 401 402static voiddescribe_detached_head(const char*msg,struct commit *commit) 403{ 404struct strbuf sb = STRBUF_INIT; 405 406if(!parse_commit(commit)) 407pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 408if(print_sha1_ellipsis()) { 409fprintf(stderr,"%s %s...%s\n", msg, 410find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV), sb.buf); 411}else{ 412fprintf(stderr,"%s %s %s\n", msg, 413find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV), sb.buf); 414} 415strbuf_release(&sb); 416} 417 418static intreset_tree(struct tree *tree,const struct checkout_opts *o, 419int worktree,int*writeout_error) 420{ 421struct unpack_trees_options opts; 422struct tree_desc tree_desc; 423 424memset(&opts,0,sizeof(opts)); 425 opts.head_idx = -1; 426 opts.update = worktree; 427 opts.skip_unmerged = !worktree; 428 opts.reset =1; 429 opts.merge =1; 430 opts.fn = oneway_merge; 431 opts.verbose_update = o->show_progress; 432 opts.src_index = &the_index; 433 opts.dst_index = &the_index; 434parse_tree(tree); 435init_tree_desc(&tree_desc, tree->buffer, tree->size); 436switch(unpack_trees(1, &tree_desc, &opts)) { 437case-2: 438*writeout_error =1; 439/* 440 * We return 0 nevertheless, as the index is all right 441 * and more importantly we have made best efforts to 442 * update paths in the work tree, and we cannot revert 443 * them. 444 */ 445/* fallthrough */ 446case0: 447return0; 448default: 449return128; 450} 451} 452 453struct branch_info { 454const char*name;/* The short name used */ 455const char*path;/* The full name of a real branch */ 456struct commit *commit;/* The named commit */ 457/* 458 * if not null the branch is detached because it's already 459 * checked out in this checkout 460 */ 461char*checkout; 462}; 463 464static voidsetup_branch_path(struct branch_info *branch) 465{ 466struct strbuf buf = STRBUF_INIT; 467 468strbuf_branchname(&buf, branch->name, INTERPRET_BRANCH_LOCAL); 469if(strcmp(buf.buf, branch->name)) 470 branch->name =xstrdup(buf.buf); 471strbuf_splice(&buf,0,0,"refs/heads/",11); 472 branch->path =strbuf_detach(&buf, NULL); 473} 474 475static intmerge_working_tree(const struct checkout_opts *opts, 476struct branch_info *old_branch_info, 477struct branch_info *new_branch_info, 478int*writeout_error) 479{ 480int ret; 481struct lock_file lock_file = LOCK_INIT; 482 483hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); 484if(read_cache_preload(NULL) <0) 485returnerror(_("index file corrupt")); 486 487resolve_undo_clear(); 488if(opts->force) { 489 ret =reset_tree(get_commit_tree(new_branch_info->commit), 490 opts,1, writeout_error); 491if(ret) 492return ret; 493}else{ 494struct tree_desc trees[2]; 495struct tree *tree; 496struct unpack_trees_options topts; 497 498memset(&topts,0,sizeof(topts)); 499 topts.head_idx = -1; 500 topts.src_index = &the_index; 501 topts.dst_index = &the_index; 502 503setup_unpack_trees_porcelain(&topts,"checkout"); 504 505refresh_cache(REFRESH_QUIET); 506 507if(unmerged_cache()) { 508error(_("you need to resolve your current index first")); 509return1; 510} 511 512/* 2-way merge to the new branch */ 513 topts.initial_checkout =is_cache_unborn(); 514 topts.update =1; 515 topts.merge =1; 516 topts.gently = opts->merge && old_branch_info->commit; 517 topts.verbose_update = opts->show_progress; 518 topts.fn = twoway_merge; 519if(opts->overwrite_ignore) { 520 topts.dir =xcalloc(1,sizeof(*topts.dir)); 521 topts.dir->flags |= DIR_SHOW_IGNORED; 522setup_standard_excludes(topts.dir); 523} 524 tree =parse_tree_indirect(old_branch_info->commit ? 525&old_branch_info->commit->object.oid : 526 the_hash_algo->empty_tree); 527init_tree_desc(&trees[0], tree->buffer, tree->size); 528 tree =parse_tree_indirect(&new_branch_info->commit->object.oid); 529init_tree_desc(&trees[1], tree->buffer, tree->size); 530 531 ret =unpack_trees(2, trees, &topts); 532clear_unpack_trees_porcelain(&topts); 533if(ret == -1) { 534/* 535 * Unpack couldn't do a trivial merge; either 536 * give up or do a real merge, depending on 537 * whether the merge flag was used. 538 */ 539struct tree *result; 540struct tree *work; 541struct merge_options o; 542if(!opts->merge) 543return1; 544 545/* 546 * Without old_branch_info->commit, the below is the same as 547 * the two-tree unpack we already tried and failed. 548 */ 549if(!old_branch_info->commit) 550return1; 551 552/* Do more real merge */ 553 554/* 555 * We update the index fully, then write the 556 * tree from the index, then merge the new 557 * branch with the current tree, with the old 558 * branch as the base. Then we reset the index 559 * (but not the working tree) to the new 560 * branch, leaving the working tree as the 561 * merged version, but skipping unmerged 562 * entries in the index. 563 */ 564 565add_files_to_cache(NULL, NULL,0); 566/* 567 * NEEDSWORK: carrying over local changes 568 * when branches have different end-of-line 569 * normalization (or clean+smudge rules) is 570 * a pain; plumb in an option to set 571 * o.renormalize? 572 */ 573init_merge_options(&o); 574 o.verbosity =0; 575 work =write_tree_from_memory(&o); 576 577 ret =reset_tree(get_commit_tree(new_branch_info->commit), 578 opts,1, 579 writeout_error); 580if(ret) 581return ret; 582 o.ancestor = old_branch_info->name; 583 o.branch1 = new_branch_info->name; 584 o.branch2 ="local"; 585 ret =merge_trees(&o, 586get_commit_tree(new_branch_info->commit), 587 work, 588get_commit_tree(old_branch_info->commit), 589&result); 590if(ret <0) 591exit(128); 592 ret =reset_tree(get_commit_tree(new_branch_info->commit), 593 opts,0, 594 writeout_error); 595strbuf_release(&o.obuf); 596if(ret) 597return ret; 598} 599} 600 601if(!active_cache_tree) 602 active_cache_tree =cache_tree(); 603 604if(!cache_tree_fully_valid(active_cache_tree)) 605cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); 606 607if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) 608die(_("unable to write new index file")); 609 610if(!opts->force && !opts->quiet) 611show_local_changes(&new_branch_info->commit->object, &opts->diff_options); 612 613return0; 614} 615 616static voidreport_tracking(struct branch_info *new_branch_info) 617{ 618struct strbuf sb = STRBUF_INIT; 619struct branch *branch =branch_get(new_branch_info->name); 620 621if(!format_tracking_info(branch, &sb, AHEAD_BEHIND_FULL)) 622return; 623fputs(sb.buf, stdout); 624strbuf_release(&sb); 625} 626 627static voidupdate_refs_for_switch(const struct checkout_opts *opts, 628struct branch_info *old_branch_info, 629struct branch_info *new_branch_info) 630{ 631struct strbuf msg = STRBUF_INIT; 632const char*old_desc, *reflog_msg; 633if(opts->new_branch) { 634if(opts->new_orphan_branch) { 635char*refname; 636 637 refname =mkpathdup("refs/heads/%s", opts->new_orphan_branch); 638if(opts->new_branch_log && 639!should_autocreate_reflog(refname)) { 640int ret; 641struct strbuf err = STRBUF_INIT; 642 643 ret =safe_create_reflog(refname,1, &err); 644if(ret) { 645fprintf(stderr,_("Can not do reflog for '%s':%s\n"), 646 opts->new_orphan_branch, err.buf); 647strbuf_release(&err); 648free(refname); 649return; 650} 651strbuf_release(&err); 652} 653free(refname); 654} 655else 656create_branch(opts->new_branch, new_branch_info->name, 657 opts->new_branch_force ?1:0, 658 opts->new_branch_force ?1:0, 659 opts->new_branch_log, 660 opts->quiet, 661 opts->track); 662 new_branch_info->name = opts->new_branch; 663setup_branch_path(new_branch_info); 664} 665 666 old_desc = old_branch_info->name; 667if(!old_desc && old_branch_info->commit) 668 old_desc =oid_to_hex(&old_branch_info->commit->object.oid); 669 670 reflog_msg =getenv("GIT_REFLOG_ACTION"); 671if(!reflog_msg) 672strbuf_addf(&msg,"checkout: moving from%sto%s", 673 old_desc ? old_desc :"(invalid)", new_branch_info->name); 674else 675strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 676 677if(!strcmp(new_branch_info->name,"HEAD") && !new_branch_info->path && !opts->force_detach) { 678/* Nothing to do. */ 679}else if(opts->force_detach || !new_branch_info->path) {/* No longer on any branch. */ 680update_ref(msg.buf,"HEAD", &new_branch_info->commit->object.oid, NULL, 681 REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR); 682if(!opts->quiet) { 683if(old_branch_info->path && 684 advice_detached_head && !opts->force_detach) 685detach_advice(new_branch_info->name); 686describe_detached_head(_("HEAD is now at"), new_branch_info->commit); 687} 688}else if(new_branch_info->path) {/* Switch branches. */ 689if(create_symref("HEAD", new_branch_info->path, msg.buf) <0) 690die(_("unable to update HEAD")); 691if(!opts->quiet) { 692if(old_branch_info->path && !strcmp(new_branch_info->path, old_branch_info->path)) { 693if(opts->new_branch_force) 694fprintf(stderr,_("Reset branch '%s'\n"), 695 new_branch_info->name); 696else 697fprintf(stderr,_("Already on '%s'\n"), 698 new_branch_info->name); 699}else if(opts->new_branch) { 700if(opts->branch_exists) 701fprintf(stderr,_("Switched to and reset branch '%s'\n"), new_branch_info->name); 702else 703fprintf(stderr,_("Switched to a new branch '%s'\n"), new_branch_info->name); 704}else{ 705fprintf(stderr,_("Switched to branch '%s'\n"), 706 new_branch_info->name); 707} 708} 709if(old_branch_info->path && old_branch_info->name) { 710if(!ref_exists(old_branch_info->path) &&reflog_exists(old_branch_info->path)) 711delete_reflog(old_branch_info->path); 712} 713} 714remove_branch_state(); 715strbuf_release(&msg); 716if(!opts->quiet && 717(new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name,"HEAD")))) 718report_tracking(new_branch_info); 719} 720 721static intadd_pending_uninteresting_ref(const char*refname, 722const struct object_id *oid, 723int flags,void*cb_data) 724{ 725add_pending_oid(cb_data, refname, oid, UNINTERESTING); 726return0; 727} 728 729static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 730{ 731strbuf_addstr(sb," "); 732strbuf_add_unique_abbrev(sb, &commit->object.oid, DEFAULT_ABBREV); 733strbuf_addch(sb,' '); 734if(!parse_commit(commit)) 735pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 736strbuf_addch(sb,'\n'); 737} 738 739#define ORPHAN_CUTOFF 4 740static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 741{ 742struct commit *c, *last = NULL; 743struct strbuf sb = STRBUF_INIT; 744int lost =0; 745while((c =get_revision(revs)) != NULL) { 746if(lost < ORPHAN_CUTOFF) 747describe_one_orphan(&sb, c); 748 last = c; 749 lost++; 750} 751if(ORPHAN_CUTOFF < lost) { 752int more = lost - ORPHAN_CUTOFF; 753if(more ==1) 754describe_one_orphan(&sb, last); 755else 756strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 757} 758 759fprintf(stderr, 760Q_( 761/* The singular version */ 762"Warning: you are leaving%dcommit behind, " 763"not connected to\n" 764"any of your branches:\n\n" 765"%s\n", 766/* The plural version */ 767"Warning: you are leaving%dcommits behind, " 768"not connected to\n" 769"any of your branches:\n\n" 770"%s\n", 771/* Give ngettext() the count */ 772 lost), 773 lost, 774 sb.buf); 775strbuf_release(&sb); 776 777if(advice_detached_head) 778fprintf(stderr, 779Q_( 780/* The singular version */ 781"If you want to keep it by creating a new branch, " 782"this may be a good time\nto do so with:\n\n" 783" git branch <new-branch-name>%s\n\n", 784/* The plural version */ 785"If you want to keep them by creating a new branch, " 786"this may be a good time\nto do so with:\n\n" 787" git branch <new-branch-name>%s\n\n", 788/* Give ngettext() the count */ 789 lost), 790find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV)); 791} 792 793/* 794 * We are about to leave commit that was at the tip of a detached 795 * HEAD. If it is not reachable from any ref, this is the last chance 796 * for the user to do so without resorting to reflog. 797 */ 798static voidorphaned_commit_warning(struct commit *old_commit,struct commit *new_commit) 799{ 800struct rev_info revs; 801struct object *object = &old_commit->object; 802 803init_revisions(&revs, NULL); 804setup_revisions(0, NULL, &revs, NULL); 805 806 object->flags &= ~UNINTERESTING; 807add_pending_object(&revs, object,oid_to_hex(&object->oid)); 808 809for_each_ref(add_pending_uninteresting_ref, &revs); 810add_pending_oid(&revs,"HEAD", &new_commit->object.oid, UNINTERESTING); 811 812if(prepare_revision_walk(&revs)) 813die(_("internal error in revision walk")); 814if(!(old_commit->object.flags & UNINTERESTING)) 815suggest_reattach(old_commit, &revs); 816else 817describe_detached_head(_("Previous HEAD position was"), old_commit); 818 819/* Clean up objects used, as they will be reused. */ 820clear_commit_marks_all(ALL_REV_FLAGS); 821} 822 823static intswitch_branches(const struct checkout_opts *opts, 824struct branch_info *new_branch_info) 825{ 826int ret =0; 827struct branch_info old_branch_info; 828void*path_to_free; 829struct object_id rev; 830int flag, writeout_error =0; 831memset(&old_branch_info,0,sizeof(old_branch_info)); 832 old_branch_info.path = path_to_free =resolve_refdup("HEAD",0, &rev, &flag); 833if(old_branch_info.path) 834 old_branch_info.commit =lookup_commit_reference_gently(the_repository, &rev,1); 835if(!(flag & REF_ISSYMREF)) 836 old_branch_info.path = NULL; 837 838if(old_branch_info.path) 839skip_prefix(old_branch_info.path,"refs/heads/", &old_branch_info.name); 840 841if(!new_branch_info->name) { 842 new_branch_info->name ="HEAD"; 843 new_branch_info->commit = old_branch_info.commit; 844if(!new_branch_info->commit) 845die(_("You are on a branch yet to be born")); 846parse_commit_or_die(new_branch_info->commit); 847} 848 849 ret =merge_working_tree(opts, &old_branch_info, new_branch_info, &writeout_error); 850if(ret) { 851free(path_to_free); 852return ret; 853} 854 855if(!opts->quiet && !old_branch_info.path && old_branch_info.commit && new_branch_info->commit != old_branch_info.commit) 856orphaned_commit_warning(old_branch_info.commit, new_branch_info->commit); 857 858update_refs_for_switch(opts, &old_branch_info, new_branch_info); 859 860 ret =post_checkout_hook(old_branch_info.commit, new_branch_info->commit,1); 861free(path_to_free); 862return ret || writeout_error; 863} 864 865static intgit_checkout_config(const char*var,const char*value,void*cb) 866{ 867if(!strcmp(var,"diff.ignoresubmodules")) { 868struct checkout_opts *opts = cb; 869handle_ignore_submodules_arg(&opts->diff_options, value); 870return0; 871} 872 873if(starts_with(var,"submodule.")) 874returngit_default_submodule_config(var, value, NULL); 875 876returngit_xmerge_config(var, value, NULL); 877} 878 879static intparse_branchname_arg(int argc,const char**argv, 880int dwim_new_local_branch_ok, 881struct branch_info *new_branch_info, 882struct checkout_opts *opts, 883struct object_id *rev, 884int*dwim_remotes_matched) 885{ 886struct tree **source_tree = &opts->source_tree; 887const char**new_branch = &opts->new_branch; 888int argcount =0; 889struct object_id branch_rev; 890const char*arg; 891int dash_dash_pos; 892int has_dash_dash =0; 893int i; 894 895/* 896 * case 1: git checkout <ref> -- [<paths>] 897 * 898 * <ref> must be a valid tree, everything after the '--' must be 899 * a path. 900 * 901 * case 2: git checkout -- [<paths>] 902 * 903 * everything after the '--' must be paths. 904 * 905 * case 3: git checkout <something> [--] 906 * 907 * (a) If <something> is a commit, that is to 908 * switch to the branch or detach HEAD at it. As a special case, 909 * if <something> is A...B (missing A or B means HEAD but you can 910 * omit at most one side), and if there is a unique merge base 911 * between A and B, A...B names that merge base. 912 * 913 * (b) If <something> is _not_ a commit, either "--" is present 914 * or <something> is not a path, no -t or -b was given, and 915 * and there is a tracking branch whose name is <something> 916 * in one and only one remote (or if the branch exists on the 917 * remote named in checkout.defaultRemote), then this is a 918 * short-hand to fork local <something> from that 919 * remote-tracking branch. 920 * 921 * (c) Otherwise, if "--" is present, treat it like case (1). 922 * 923 * (d) Otherwise : 924 * - if it's a reference, treat it like case (1) 925 * - else if it's a path, treat it like case (2) 926 * - else: fail. 927 * 928 * case 4: git checkout <something> <paths> 929 * 930 * The first argument must not be ambiguous. 931 * - If it's *only* a reference, treat it like case (1). 932 * - If it's only a path, treat it like case (2). 933 * - else: fail. 934 * 935 */ 936if(!argc) 937return0; 938 939 arg = argv[0]; 940 dash_dash_pos = -1; 941for(i =0; i < argc; i++) { 942if(!strcmp(argv[i],"--")) { 943 dash_dash_pos = i; 944break; 945} 946} 947if(dash_dash_pos ==0) 948return1;/* case (2) */ 949else if(dash_dash_pos ==1) 950 has_dash_dash =1;/* case (3) or (1) */ 951else if(dash_dash_pos >=2) 952die(_("only one reference expected,%dgiven."), dash_dash_pos); 953 954if(!strcmp(arg,"-")) 955 arg ="@{-1}"; 956 957if(get_oid_mb(arg, rev)) { 958/* 959 * Either case (3) or (4), with <something> not being 960 * a commit, or an attempt to use case (1) with an 961 * invalid ref. 962 * 963 * It's likely an error, but we need to find out if 964 * we should auto-create the branch, case (3).(b). 965 */ 966int recover_with_dwim = dwim_new_local_branch_ok; 967 968if(!has_dash_dash && 969(check_filename(opts->prefix, arg) || !no_wildcard(arg))) 970 recover_with_dwim =0; 971/* 972 * Accept "git checkout foo" and "git checkout foo --" 973 * as candidates for dwim. 974 */ 975if(!(argc ==1&& !has_dash_dash) && 976!(argc ==2&& has_dash_dash)) 977 recover_with_dwim =0; 978 979if(recover_with_dwim) { 980const char*remote =unique_tracking_name(arg, rev, 981 dwim_remotes_matched); 982if(remote) { 983*new_branch = arg; 984 arg = remote; 985/* DWIMmed to create local branch, case (3).(b) */ 986}else{ 987 recover_with_dwim =0; 988} 989} 990 991if(!recover_with_dwim) { 992if(has_dash_dash) 993die(_("invalid reference:%s"), arg); 994return argcount; 995} 996} 997 998/* we can't end up being in (2) anymore, eat the argument */ 999 argcount++;1000 argv++;1001 argc--;10021003 new_branch_info->name = arg;1004setup_branch_path(new_branch_info);10051006if(!check_refname_format(new_branch_info->path,0) &&1007!read_ref(new_branch_info->path, &branch_rev))1008oidcpy(rev, &branch_rev);1009else1010 new_branch_info->path = NULL;/* not an existing branch */10111012 new_branch_info->commit =lookup_commit_reference_gently(the_repository, rev,1);1013if(!new_branch_info->commit) {1014/* not a commit */1015*source_tree =parse_tree_indirect(rev);1016}else{1017parse_commit_or_die(new_branch_info->commit);1018*source_tree =get_commit_tree(new_branch_info->commit);1019}10201021if(!*source_tree)/* case (1): want a tree */1022die(_("reference is not a tree:%s"), arg);1023if(!has_dash_dash) {/* case (3).(d) -> (1) */1024/*1025 * Do not complain the most common case1026 * git checkout branch1027 * even if there happen to be a file called 'branch';1028 * it would be extremely annoying.1029 */1030if(argc)1031verify_non_filename(opts->prefix, arg);1032}else{1033 argcount++;1034 argv++;1035 argc--;1036}10371038return argcount;1039}10401041static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1042{1043int status;1044struct strbuf branch_ref = STRBUF_INIT;10451046if(!opts->new_branch)1047die(_("You are on a branch yet to be born"));1048strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1049 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1050strbuf_release(&branch_ref);1051if(!opts->quiet)1052fprintf(stderr,_("Switched to a new branch '%s'\n"),1053 opts->new_branch);1054return status;1055}10561057static intcheckout_branch(struct checkout_opts *opts,1058struct branch_info *new_branch_info)1059{1060if(opts->pathspec.nr)1061die(_("paths cannot be used with switching branches"));10621063if(opts->patch_mode)1064die(_("'%s' cannot be used with switching branches"),1065"--patch");10661067if(opts->writeout_stage)1068die(_("'%s' cannot be used with switching branches"),1069"--ours/--theirs");10701071if(opts->force && opts->merge)1072die(_("'%s' cannot be used with '%s'"),"-f","-m");10731074if(opts->force_detach && opts->new_branch)1075die(_("'%s' cannot be used with '%s'"),1076"--detach","-b/-B/--orphan");10771078if(opts->new_orphan_branch) {1079if(opts->track != BRANCH_TRACK_UNSPECIFIED)1080die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1081}else if(opts->force_detach) {1082if(opts->track != BRANCH_TRACK_UNSPECIFIED)1083die(_("'%s' cannot be used with '%s'"),"--detach","-t");1084}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1085 opts->track = git_branch_track;10861087if(new_branch_info->name && !new_branch_info->commit)1088die(_("Cannot switch branch to a non-commit '%s'"),1089 new_branch_info->name);10901091if(new_branch_info->path && !opts->force_detach && !opts->new_branch &&1092!opts->ignore_other_worktrees) {1093int flag;1094char*head_ref =resolve_refdup("HEAD",0, NULL, &flag);1095if(head_ref &&1096(!(flag & REF_ISSYMREF) ||strcmp(head_ref, new_branch_info->path)))1097die_if_checked_out(new_branch_info->path,1);1098free(head_ref);1099}11001101if(!new_branch_info->commit && opts->new_branch) {1102struct object_id rev;1103int flag;11041105if(!read_ref_full("HEAD",0, &rev, &flag) &&1106(flag & REF_ISSYMREF) &&is_null_oid(&rev))1107returnswitch_unborn_to_new_branch(opts);1108}1109returnswitch_branches(opts, new_branch_info);1110}11111112intcmd_checkout(int argc,const char**argv,const char*prefix)1113{1114struct checkout_opts opts;1115struct branch_info new_branch_info;1116char*conflict_style = NULL;1117int dwim_new_local_branch =1;1118int dwim_remotes_matched =0;1119struct option options[] = {1120OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1121OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1122N_("create and checkout a new branch")),1123OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1124N_("create/reset and checkout a branch")),1125OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1126OPT_BOOL(0,"detach", &opts.force_detach,N_("detach HEAD at named commit")),1127OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1128 BRANCH_TRACK_EXPLICIT),1129OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1130OPT_SET_INT_F('2',"ours", &opts.writeout_stage,1131N_("checkout our version for unmerged files"),11322, PARSE_OPT_NONEG),1133OPT_SET_INT_F('3',"theirs", &opts.writeout_stage,1134N_("checkout their version for unmerged files"),11353, PARSE_OPT_NONEG),1136OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)"),1137 PARSE_OPT_NOCOMPLETE),1138OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1139OPT_BOOL_F(0,"overwrite-ignore", &opts.overwrite_ignore,1140N_("update ignored files (default)"),1141 PARSE_OPT_NOCOMPLETE),1142OPT_STRING(0,"conflict", &conflict_style,N_("style"),1143N_("conflict style (merge or diff3)")),1144OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1145OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1146N_("do not limit pathspecs to sparse entries only")),1147OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1148N_("second guess 'git checkout <no-such-branch>'")),1149OPT_BOOL(0,"ignore-other-worktrees", &opts.ignore_other_worktrees,1150N_("do not check if another worktree is holding the given ref")),1151{ OPTION_CALLBACK,0,"recurse-submodules", NULL,1152"checkout","control recursive updating of submodules",1153 PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },1154OPT_BOOL(0,"progress", &opts.show_progress,N_("force progress reporting")),1155OPT_END(),1156};11571158memset(&opts,0,sizeof(opts));1159memset(&new_branch_info,0,sizeof(new_branch_info));1160 opts.overwrite_ignore =1;1161 opts.prefix = prefix;1162 opts.show_progress = -1;11631164git_config(git_checkout_config, &opts);11651166 opts.track = BRANCH_TRACK_UNSPECIFIED;11671168 argc =parse_options(argc, argv, prefix, options, checkout_usage,1169 PARSE_OPT_KEEP_DASHDASH);11701171if(opts.show_progress <0) {1172if(opts.quiet)1173 opts.show_progress =0;1174else1175 opts.show_progress =isatty(2);1176}11771178if(conflict_style) {1179 opts.merge =1;/* implied */1180git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1181}11821183if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1184die(_("-b, -B and --orphan are mutually exclusive"));11851186/*1187 * From here on, new_branch will contain the branch to be checked out,1188 * and new_branch_force and new_orphan_branch will tell us which one of1189 * -b/-B/--orphan is being used.1190 */1191if(opts.new_branch_force)1192 opts.new_branch = opts.new_branch_force;11931194if(opts.new_orphan_branch)1195 opts.new_branch = opts.new_orphan_branch;11961197/* --track without -b/-B/--orphan should DWIM */1198if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1199const char*argv0 = argv[0];1200if(!argc || !strcmp(argv0,"--"))1201die(_("--track needs a branch name"));1202skip_prefix(argv0,"refs/", &argv0);1203skip_prefix(argv0,"remotes/", &argv0);1204 argv0 =strchr(argv0,'/');1205if(!argv0 || !argv0[1])1206die(_("missing branch name; try -b"));1207 opts.new_branch = argv0 +1;1208}12091210/*1211 * Extract branch name from command line arguments, so1212 * all that is left is pathspecs.1213 *1214 * Handle1215 *1216 * 1) git checkout <tree> -- [<paths>]1217 * 2) git checkout -- [<paths>]1218 * 3) git checkout <something> [<paths>]1219 *1220 * including "last branch" syntax and DWIM-ery for names of1221 * remote branches, erroring out for invalid or ambiguous cases.1222 */1223if(argc) {1224struct object_id rev;1225int dwim_ok =1226!opts.patch_mode &&1227 dwim_new_local_branch &&1228 opts.track == BRANCH_TRACK_UNSPECIFIED &&1229!opts.new_branch;1230int n =parse_branchname_arg(argc, argv, dwim_ok,1231&new_branch_info, &opts, &rev,1232&dwim_remotes_matched);1233 argv += n;1234 argc -= n;1235}12361237if(argc) {1238parse_pathspec(&opts.pathspec,0,1239 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1240 prefix, argv);12411242if(!opts.pathspec.nr)1243die(_("invalid path specification"));12441245/*1246 * Try to give more helpful suggestion.1247 * new_branch && argc > 1 will be caught later.1248 */1249if(opts.new_branch && argc ==1)1250die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),1251 argv[0], opts.new_branch);12521253if(opts.force_detach)1254die(_("git checkout: --detach does not take a path argument '%s'"),1255 argv[0]);12561257if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1258die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1259"checking out of the index."));1260}12611262if(opts.new_branch) {1263struct strbuf buf = STRBUF_INIT;12641265if(opts.new_branch_force)1266 opts.branch_exists =validate_branchname(opts.new_branch, &buf);1267else1268 opts.branch_exists =1269validate_new_branchname(opts.new_branch, &buf,0);1270strbuf_release(&buf);1271}12721273UNLEAK(opts);1274if(opts.patch_mode || opts.pathspec.nr) {1275int ret =checkout_paths(&opts, new_branch_info.name);1276if(ret && dwim_remotes_matched >1&&1277 advice_checkout_ambiguous_remote_branch_name)1278advise(_("'%s' matched more than one remote tracking branch.\n"1279"We found%dremotes with a reference that matched. So we fell back\n"1280"on trying to resolve the argument as a path, but failed there too!\n"1281"\n"1282"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"1283"you can do so by fully qualifying the name with the --track option:\n"1284"\n"1285" git checkout --track origin/<name>\n"1286"\n"1287"If you'd like to always have checkouts of an ambiguous <name> prefer\n"1288"one remote, e.g. the 'origin' remote, consider setting\n"1289"checkout.defaultRemote=origin in your config."),1290 argv[0],1291 dwim_remotes_matched);1292return ret;1293}else{1294returncheckout_branch(&opts, &new_branch_info);1295}1296}