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