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