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", 59sha1_to_hex(old ? old->object.oid.hash : null_sha1), 60sha1_to_hex(new?new->object.oid.hash : null_sha1), 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->sha1, 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!hashcmp(ce->sha1, old->sha1)) { 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,struct cache_entry *ce,int pos, 158struct 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,struct checkout *state) 173{ 174struct cache_entry *ce = active_cache[pos]; 175const char*path = ce->name; 176 mmfile_t ancestor, ours, theirs; 177int status; 178unsigned char sha1[20]; 179 mmbuffer_t result_buf; 180unsigned char threeway[3][20]; 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; 189hashcpy(threeway[stage -1], ce->sha1); 190if(stage ==2) 191 mode =create_ce_mode(ce->ce_mode); 192 pos++; 193 ce = active_cache[pos]; 194} 195if(is_null_sha1(threeway[1]) ||is_null_sha1(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, sha1)) 230die(_("Unable to add merge result for '%s'"), path); 231 ce =make_cache_entry(mode, sha1, 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; 243static char*ps_matched; 244unsigned char rev[20]; 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,1); 278if(read_cache_preload(&opts->pathspec) <0) 279returnerror(_("corrupt index file")); 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 */ 355memset(&state,0,sizeof(state)); 356 state.force =1; 357 state.refresh_cache =1; 358 state.istate = &the_index; 359for(pos =0; pos < active_nr; pos++) { 360struct cache_entry *ce = active_cache[pos]; 361if(ce->ce_flags & CE_MATCHED) { 362if(!ce_stage(ce)) { 363 errs |=checkout_entry(ce, &state, NULL); 364continue; 365} 366if(opts->writeout_stage) 367 errs |=checkout_stage(opts->writeout_stage, ce, pos, &state); 368else if(opts->merge) 369 errs |=checkout_merged(pos, &state); 370 pos =skip_same_name(ce, pos) -1; 371} 372} 373 374if(write_locked_index(&the_index, lock_file, COMMIT_LOCK)) 375die(_("unable to write new index file")); 376 377read_ref_full("HEAD",0, rev, NULL); 378 head =lookup_commit_reference_gently(rev,1); 379 380 errs |=post_checkout_hook(head, head,0); 381return errs; 382} 383 384static voidshow_local_changes(struct object *head, 385const struct diff_options *opts) 386{ 387struct rev_info rev; 388/* I think we want full paths, even if we're in a subdirectory. */ 389init_revisions(&rev, NULL); 390 rev.diffopt.flags = opts->flags; 391 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; 392diff_setup_done(&rev.diffopt); 393add_pending_object(&rev, head, NULL); 394run_diff_index(&rev,0); 395} 396 397static voiddescribe_detached_head(const char*msg,struct commit *commit) 398{ 399struct strbuf sb = STRBUF_INIT; 400if(!parse_commit(commit)) 401pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 402fprintf(stderr,"%s %s...%s\n", msg, 403find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf); 404strbuf_release(&sb); 405} 406 407static intreset_tree(struct tree *tree,const struct checkout_opts *o, 408int worktree,int*writeout_error) 409{ 410struct unpack_trees_options opts; 411struct tree_desc tree_desc; 412 413memset(&opts,0,sizeof(opts)); 414 opts.head_idx = -1; 415 opts.update = worktree; 416 opts.skip_unmerged = !worktree; 417 opts.reset =1; 418 opts.merge =1; 419 opts.fn = oneway_merge; 420 opts.verbose_update = o->show_progress; 421 opts.src_index = &the_index; 422 opts.dst_index = &the_index; 423parse_tree(tree); 424init_tree_desc(&tree_desc, tree->buffer, tree->size); 425switch(unpack_trees(1, &tree_desc, &opts)) { 426case-2: 427*writeout_error =1; 428/* 429 * We return 0 nevertheless, as the index is all right 430 * and more importantly we have made best efforts to 431 * update paths in the work tree, and we cannot revert 432 * them. 433 */ 434case0: 435return0; 436default: 437return128; 438} 439} 440 441struct branch_info { 442const char*name;/* The short name used */ 443const char*path;/* The full name of a real branch */ 444struct commit *commit;/* The named commit */ 445/* 446 * if not null the branch is detached because it's already 447 * checked out in this checkout 448 */ 449char*checkout; 450}; 451 452static voidsetup_branch_path(struct branch_info *branch) 453{ 454struct strbuf buf = STRBUF_INIT; 455 456strbuf_branchname(&buf, branch->name); 457if(strcmp(buf.buf, branch->name)) 458 branch->name =xstrdup(buf.buf); 459strbuf_splice(&buf,0,0,"refs/heads/",11); 460 branch->path =strbuf_detach(&buf, NULL); 461} 462 463static intmerge_working_tree(const struct checkout_opts *opts, 464struct branch_info *old, 465struct branch_info *new, 466int*writeout_error) 467{ 468int ret; 469struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file)); 470 471hold_locked_index(lock_file,1); 472if(read_cache_preload(NULL) <0) 473returnerror(_("corrupt index file")); 474 475resolve_undo_clear(); 476if(opts->force) { 477 ret =reset_tree(new->commit->tree, opts,1, writeout_error); 478if(ret) 479return ret; 480}else{ 481struct tree_desc trees[2]; 482struct tree *tree; 483struct unpack_trees_options topts; 484 485memset(&topts,0,sizeof(topts)); 486 topts.head_idx = -1; 487 topts.src_index = &the_index; 488 topts.dst_index = &the_index; 489 490setup_unpack_trees_porcelain(&topts,"checkout"); 491 492refresh_cache(REFRESH_QUIET); 493 494if(unmerged_cache()) { 495error(_("you need to resolve your current index first")); 496return1; 497} 498 499/* 2-way merge to the new branch */ 500 topts.initial_checkout =is_cache_unborn(); 501 topts.update =1; 502 topts.merge =1; 503 topts.gently = opts->merge && old->commit; 504 topts.verbose_update = opts->show_progress; 505 topts.fn = twoway_merge; 506if(opts->overwrite_ignore) { 507 topts.dir =xcalloc(1,sizeof(*topts.dir)); 508 topts.dir->flags |= DIR_SHOW_IGNORED; 509setup_standard_excludes(topts.dir); 510} 511 tree =parse_tree_indirect(old->commit ? 512 old->commit->object.oid.hash : 513 EMPTY_TREE_SHA1_BIN); 514init_tree_desc(&trees[0], tree->buffer, tree->size); 515 tree =parse_tree_indirect(new->commit->object.oid.hash); 516init_tree_desc(&trees[1], tree->buffer, tree->size); 517 518 ret =unpack_trees(2, trees, &topts); 519if(ret == -1) { 520/* 521 * Unpack couldn't do a trivial merge; either 522 * give up or do a real merge, depending on 523 * whether the merge flag was used. 524 */ 525struct tree *result; 526struct tree *work; 527struct merge_options o; 528if(!opts->merge) 529return1; 530 531/* 532 * Without old->commit, the below is the same as 533 * the two-tree unpack we already tried and failed. 534 */ 535if(!old->commit) 536return1; 537 538/* Do more real merge */ 539 540/* 541 * We update the index fully, then write the 542 * tree from the index, then merge the new 543 * branch with the current tree, with the old 544 * branch as the base. Then we reset the index 545 * (but not the working tree) to the new 546 * branch, leaving the working tree as the 547 * merged version, but skipping unmerged 548 * entries in the index. 549 */ 550 551add_files_to_cache(NULL, NULL,0,0); 552/* 553 * NEEDSWORK: carrying over local changes 554 * when branches have different end-of-line 555 * normalization (or clean+smudge rules) is 556 * a pain; plumb in an option to set 557 * o.renormalize? 558 */ 559init_merge_options(&o); 560 o.verbosity =0; 561 work =write_tree_from_memory(&o); 562 563 ret =reset_tree(new->commit->tree, opts,1, 564 writeout_error); 565if(ret) 566return ret; 567 o.ancestor = old->name; 568 o.branch1 =new->name; 569 o.branch2 ="local"; 570merge_trees(&o,new->commit->tree, work, 571 old->commit->tree, &result); 572 ret =reset_tree(new->commit->tree, opts,0, 573 writeout_error); 574if(ret) 575return ret; 576} 577} 578 579if(!active_cache_tree) 580 active_cache_tree =cache_tree(); 581 582if(!cache_tree_fully_valid(active_cache_tree)) 583cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); 584 585if(write_locked_index(&the_index, lock_file, COMMIT_LOCK)) 586die(_("unable to write new index file")); 587 588if(!opts->force && !opts->quiet) 589show_local_changes(&new->commit->object, &opts->diff_options); 590 591return0; 592} 593 594static voidreport_tracking(struct branch_info *new) 595{ 596struct strbuf sb = STRBUF_INIT; 597struct branch *branch =branch_get(new->name); 598 599if(!format_tracking_info(branch, &sb)) 600return; 601fputs(sb.buf, stdout); 602strbuf_release(&sb); 603} 604 605static voidupdate_refs_for_switch(const struct checkout_opts *opts, 606struct branch_info *old, 607struct branch_info *new) 608{ 609struct strbuf msg = STRBUF_INIT; 610const char*old_desc, *reflog_msg; 611if(opts->new_branch) { 612if(opts->new_orphan_branch) { 613if(opts->new_branch_log && !log_all_ref_updates) { 614int ret; 615char*refname; 616struct strbuf err = STRBUF_INIT; 617 618 refname =mkpathdup("refs/heads/%s", opts->new_orphan_branch); 619 ret =safe_create_reflog(refname,1, &err); 620free(refname); 621if(ret) { 622fprintf(stderr,_("Can not do reflog for '%s':%s\n"), 623 opts->new_orphan_branch, err.buf); 624strbuf_release(&err); 625return; 626} 627strbuf_release(&err); 628} 629} 630else 631create_branch(old->name, opts->new_branch,new->name, 632 opts->new_branch_force ?1:0, 633 opts->new_branch_log, 634 opts->new_branch_force ?1:0, 635 opts->quiet, 636 opts->track); 637new->name = opts->new_branch; 638setup_branch_path(new); 639} 640 641 old_desc = old->name; 642if(!old_desc && old->commit) 643 old_desc =oid_to_hex(&old->commit->object.oid); 644 645 reflog_msg =getenv("GIT_REFLOG_ACTION"); 646if(!reflog_msg) 647strbuf_addf(&msg,"checkout: moving from%sto%s", 648 old_desc ? old_desc :"(invalid)",new->name); 649else 650strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 651 652if(!strcmp(new->name,"HEAD") && !new->path && !opts->force_detach) { 653/* Nothing to do. */ 654}else if(opts->force_detach || !new->path) {/* No longer on any branch. */ 655update_ref(msg.buf,"HEAD",new->commit->object.oid.hash, NULL, 656 REF_NODEREF, UPDATE_REFS_DIE_ON_ERR); 657if(!opts->quiet) { 658if(old->path && advice_detached_head) 659detach_advice(new->name); 660describe_detached_head(_("HEAD is now at"),new->commit); 661} 662}else if(new->path) {/* Switch branches. */ 663if(create_symref("HEAD",new->path, msg.buf) <0) 664die(_("unable to update HEAD")); 665if(!opts->quiet) { 666if(old->path && !strcmp(new->path, old->path)) { 667if(opts->new_branch_force) 668fprintf(stderr,_("Reset branch '%s'\n"), 669new->name); 670else 671fprintf(stderr,_("Already on '%s'\n"), 672new->name); 673}else if(opts->new_branch) { 674if(opts->branch_exists) 675fprintf(stderr,_("Switched to and reset branch '%s'\n"),new->name); 676else 677fprintf(stderr,_("Switched to a new branch '%s'\n"),new->name); 678}else{ 679fprintf(stderr,_("Switched to branch '%s'\n"), 680new->name); 681} 682} 683if(old->path && old->name) { 684if(!ref_exists(old->path) &&reflog_exists(old->path)) 685delete_reflog(old->path); 686} 687} 688remove_branch_state(); 689strbuf_release(&msg); 690if(!opts->quiet && 691(new->path || (!opts->force_detach && !strcmp(new->name,"HEAD")))) 692report_tracking(new); 693} 694 695static intadd_pending_uninteresting_ref(const char*refname, 696const struct object_id *oid, 697int flags,void*cb_data) 698{ 699add_pending_sha1(cb_data, refname, oid->hash, UNINTERESTING); 700return0; 701} 702 703static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 704{ 705strbuf_addstr(sb," "); 706strbuf_add_unique_abbrev(sb, commit->object.oid.hash, DEFAULT_ABBREV); 707strbuf_addch(sb,' '); 708if(!parse_commit(commit)) 709pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 710strbuf_addch(sb,'\n'); 711} 712 713#define ORPHAN_CUTOFF 4 714static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 715{ 716struct commit *c, *last = NULL; 717struct strbuf sb = STRBUF_INIT; 718int lost =0; 719while((c =get_revision(revs)) != NULL) { 720if(lost < ORPHAN_CUTOFF) 721describe_one_orphan(&sb, c); 722 last = c; 723 lost++; 724} 725if(ORPHAN_CUTOFF < lost) { 726int more = lost - ORPHAN_CUTOFF; 727if(more ==1) 728describe_one_orphan(&sb, last); 729else 730strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 731} 732 733fprintf(stderr, 734Q_( 735/* The singular version */ 736"Warning: you are leaving%dcommit behind, " 737"not connected to\n" 738"any of your branches:\n\n" 739"%s\n", 740/* The plural version */ 741"Warning: you are leaving%dcommits behind, " 742"not connected to\n" 743"any of your branches:\n\n" 744"%s\n", 745/* Give ngettext() the count */ 746 lost), 747 lost, 748 sb.buf); 749strbuf_release(&sb); 750 751if(advice_detached_head) 752fprintf(stderr, 753Q_( 754/* The singular version */ 755"If you want to keep it by creating a new branch, " 756"this may be a good time\nto do so with:\n\n" 757" git branch <new-branch-name>%s\n\n", 758/* The plural version */ 759"If you want to keep them by creating a new branch, " 760"this may be a good time\nto do so with:\n\n" 761" git branch <new-branch-name>%s\n\n", 762/* Give ngettext() the count */ 763 lost), 764find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV)); 765} 766 767/* 768 * We are about to leave commit that was at the tip of a detached 769 * HEAD. If it is not reachable from any ref, this is the last chance 770 * for the user to do so without resorting to reflog. 771 */ 772static voidorphaned_commit_warning(struct commit *old,struct commit *new) 773{ 774struct rev_info revs; 775struct object *object = &old->object; 776struct object_array refs; 777 778init_revisions(&revs, NULL); 779setup_revisions(0, NULL, &revs, NULL); 780 781 object->flags &= ~UNINTERESTING; 782add_pending_object(&revs, object,oid_to_hex(&object->oid)); 783 784for_each_ref(add_pending_uninteresting_ref, &revs); 785add_pending_sha1(&revs,"HEAD",new->object.oid.hash, UNINTERESTING); 786 787 refs = revs.pending; 788 revs.leak_pending =1; 789 790if(prepare_revision_walk(&revs)) 791die(_("internal error in revision walk")); 792if(!(old->object.flags & UNINTERESTING)) 793suggest_reattach(old, &revs); 794else 795describe_detached_head(_("Previous HEAD position was"), old); 796 797clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS); 798free(refs.objects); 799} 800 801static intswitch_branches(const struct checkout_opts *opts, 802struct branch_info *new) 803{ 804int ret =0; 805struct branch_info old; 806void*path_to_free; 807unsigned char rev[20]; 808int flag, writeout_error =0; 809memset(&old,0,sizeof(old)); 810 old.path = path_to_free =resolve_refdup("HEAD",0, rev, &flag); 811 old.commit =lookup_commit_reference_gently(rev,1); 812if(!(flag & REF_ISSYMREF)) 813 old.path = NULL; 814 815if(old.path) 816skip_prefix(old.path,"refs/heads/", &old.name); 817 818if(!new->name) { 819new->name ="HEAD"; 820new->commit = old.commit; 821if(!new->commit) 822die(_("You are on a branch yet to be born")); 823parse_commit_or_die(new->commit); 824} 825 826 ret =merge_working_tree(opts, &old,new, &writeout_error); 827if(ret) { 828free(path_to_free); 829return ret; 830} 831 832if(!opts->quiet && !old.path && old.commit &&new->commit != old.commit) 833orphaned_commit_warning(old.commit,new->commit); 834 835update_refs_for_switch(opts, &old,new); 836 837 ret =post_checkout_hook(old.commit,new->commit,1); 838free(path_to_free); 839return ret || writeout_error; 840} 841 842static intgit_checkout_config(const char*var,const char*value,void*cb) 843{ 844if(!strcmp(var,"diff.ignoresubmodules")) { 845struct checkout_opts *opts = cb; 846handle_ignore_submodules_arg(&opts->diff_options, value); 847return0; 848} 849 850if(starts_with(var,"submodule.")) 851returnparse_submodule_config_option(var, value); 852 853returngit_xmerge_config(var, value, NULL); 854} 855 856struct tracking_name_data { 857/* const */char*src_ref; 858char*dst_ref; 859unsigned char*dst_sha1; 860int unique; 861}; 862 863static intcheck_tracking_name(struct remote *remote,void*cb_data) 864{ 865struct tracking_name_data *cb = cb_data; 866struct refspec query; 867memset(&query,0,sizeof(struct refspec)); 868 query.src = cb->src_ref; 869if(remote_find_tracking(remote, &query) || 870get_sha1(query.dst, cb->dst_sha1)) { 871free(query.dst); 872return0; 873} 874if(cb->dst_ref) { 875free(query.dst); 876 cb->unique =0; 877return0; 878} 879 cb->dst_ref = query.dst; 880return0; 881} 882 883static const char*unique_tracking_name(const char*name,unsigned char*sha1) 884{ 885struct tracking_name_data cb_data = { NULL, NULL, NULL,1}; 886char src_ref[PATH_MAX]; 887snprintf(src_ref, PATH_MAX,"refs/heads/%s", name); 888 cb_data.src_ref = src_ref; 889 cb_data.dst_sha1 = sha1; 890for_each_remote(check_tracking_name, &cb_data); 891if(cb_data.unique) 892return cb_data.dst_ref; 893free(cb_data.dst_ref); 894return NULL; 895} 896 897static intparse_branchname_arg(int argc,const char**argv, 898int dwim_new_local_branch_ok, 899struct branch_info *new, 900struct checkout_opts *opts, 901unsigned char rev[20]) 902{ 903struct tree **source_tree = &opts->source_tree; 904const char**new_branch = &opts->new_branch; 905int argcount =0; 906unsigned char branch_rev[20]; 907const char*arg; 908int dash_dash_pos; 909int has_dash_dash =0; 910int i; 911 912/* 913 * case 1: git checkout <ref> -- [<paths>] 914 * 915 * <ref> must be a valid tree, everything after the '--' must be 916 * a path. 917 * 918 * case 2: git checkout -- [<paths>] 919 * 920 * everything after the '--' must be paths. 921 * 922 * case 3: git checkout <something> [--] 923 * 924 * (a) If <something> is a commit, that is to 925 * switch to the branch or detach HEAD at it. As a special case, 926 * if <something> is A...B (missing A or B means HEAD but you can 927 * omit at most one side), and if there is a unique merge base 928 * between A and B, A...B names that merge base. 929 * 930 * (b) If <something> is _not_ a commit, either "--" is present 931 * or <something> is not a path, no -t or -b was given, and 932 * and there is a tracking branch whose name is <something> 933 * in one and only one remote, then this is a short-hand to 934 * fork local <something> from that remote-tracking branch. 935 * 936 * (c) Otherwise, if "--" is present, treat it like case (1). 937 * 938 * (d) Otherwise : 939 * - if it's a reference, treat it like case (1) 940 * - else if it's a path, treat it like case (2) 941 * - else: fail. 942 * 943 * case 4: git checkout <something> <paths> 944 * 945 * The first argument must not be ambiguous. 946 * - If it's *only* a reference, treat it like case (1). 947 * - If it's only a path, treat it like case (2). 948 * - else: fail. 949 * 950 */ 951if(!argc) 952return0; 953 954 arg = argv[0]; 955 dash_dash_pos = -1; 956for(i =0; i < argc; i++) { 957if(!strcmp(argv[i],"--")) { 958 dash_dash_pos = i; 959break; 960} 961} 962if(dash_dash_pos ==0) 963return1;/* case (2) */ 964else if(dash_dash_pos ==1) 965 has_dash_dash =1;/* case (3) or (1) */ 966else if(dash_dash_pos >=2) 967die(_("only one reference expected,%dgiven."), dash_dash_pos); 968 969if(!strcmp(arg,"-")) 970 arg ="@{-1}"; 971 972if(get_sha1_mb(arg, rev)) { 973/* 974 * Either case (3) or (4), with <something> not being 975 * a commit, or an attempt to use case (1) with an 976 * invalid ref. 977 * 978 * It's likely an error, but we need to find out if 979 * we should auto-create the branch, case (3).(b). 980 */ 981int recover_with_dwim = dwim_new_local_branch_ok; 982 983if(!has_dash_dash && 984(check_filename(NULL, arg) || !no_wildcard(arg))) 985 recover_with_dwim =0; 986/* 987 * Accept "git checkout foo" and "git checkout foo --" 988 * as candidates for dwim. 989 */ 990if(!(argc ==1&& !has_dash_dash) && 991!(argc ==2&& has_dash_dash)) 992 recover_with_dwim =0; 993 994if(recover_with_dwim) { 995const char*remote =unique_tracking_name(arg, rev); 996if(remote) { 997*new_branch = arg; 998 arg = remote; 999/* DWIMmed to create local branch, case (3).(b) */1000}else{1001 recover_with_dwim =0;1002}1003}10041005if(!recover_with_dwim) {1006if(has_dash_dash)1007die(_("invalid reference:%s"), arg);1008return argcount;1009}1010}10111012/* we can't end up being in (2) anymore, eat the argument */1013 argcount++;1014 argv++;1015 argc--;10161017new->name = arg;1018setup_branch_path(new);10191020if(!check_refname_format(new->path,0) &&1021!read_ref(new->path, branch_rev))1022hashcpy(rev, branch_rev);1023else1024new->path = NULL;/* not an existing branch */10251026new->commit =lookup_commit_reference_gently(rev,1);1027if(!new->commit) {1028/* not a commit */1029*source_tree =parse_tree_indirect(rev);1030}else{1031parse_commit_or_die(new->commit);1032*source_tree =new->commit->tree;1033}10341035if(!*source_tree)/* case (1): want a tree */1036die(_("reference is not a tree:%s"), arg);1037if(!has_dash_dash) {/* case (3).(d) -> (1) */1038/*1039 * Do not complain the most common case1040 * git checkout branch1041 * even if there happen to be a file called 'branch';1042 * it would be extremely annoying.1043 */1044if(argc)1045verify_non_filename(NULL, arg);1046}else{1047 argcount++;1048 argv++;1049 argc--;1050}10511052return argcount;1053}10541055static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1056{1057int status;1058struct strbuf branch_ref = STRBUF_INIT;10591060if(!opts->new_branch)1061die(_("You are on a branch yet to be born"));1062strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1063 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1064strbuf_release(&branch_ref);1065if(!opts->quiet)1066fprintf(stderr,_("Switched to a new branch '%s'\n"),1067 opts->new_branch);1068return status;1069}10701071static intcheckout_branch(struct checkout_opts *opts,1072struct branch_info *new)1073{1074if(opts->pathspec.nr)1075die(_("paths cannot be used with switching branches"));10761077if(opts->patch_mode)1078die(_("'%s' cannot be used with switching branches"),1079"--patch");10801081if(opts->writeout_stage)1082die(_("'%s' cannot be used with switching branches"),1083"--ours/--theirs");10841085if(opts->force && opts->merge)1086die(_("'%s' cannot be used with '%s'"),"-f","-m");10871088if(opts->force_detach && opts->new_branch)1089die(_("'%s' cannot be used with '%s'"),1090"--detach","-b/-B/--orphan");10911092if(opts->new_orphan_branch) {1093if(opts->track != BRANCH_TRACK_UNSPECIFIED)1094die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1095}else if(opts->force_detach) {1096if(opts->track != BRANCH_TRACK_UNSPECIFIED)1097die(_("'%s' cannot be used with '%s'"),"--detach","-t");1098}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1099 opts->track = git_branch_track;11001101if(new->name && !new->commit)1102die(_("Cannot switch branch to a non-commit '%s'"),1103new->name);11041105if(new->path && !opts->force_detach && !opts->new_branch &&1106!opts->ignore_other_worktrees) {1107unsigned char sha1[20];1108int flag;1109char*head_ref =resolve_refdup("HEAD",0, sha1, &flag);1110if(head_ref &&1111(!(flag & REF_ISSYMREF) ||strcmp(head_ref,new->path)))1112die_if_checked_out(new->path,1);1113free(head_ref);1114}11151116if(!new->commit && opts->new_branch) {1117unsigned char rev[20];1118int flag;11191120if(!read_ref_full("HEAD",0, rev, &flag) &&1121(flag & REF_ISSYMREF) &&is_null_sha1(rev))1122returnswitch_unborn_to_new_branch(opts);1123}1124returnswitch_branches(opts,new);1125}11261127intcmd_checkout(int argc,const char**argv,const char*prefix)1128{1129struct checkout_opts opts;1130struct branch_info new;1131char*conflict_style = NULL;1132int dwim_new_local_branch =1;1133struct option options[] = {1134OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1135OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1136N_("create and checkout a new branch")),1137OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1138N_("create/reset and checkout a branch")),1139OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1140OPT_BOOL(0,"detach", &opts.force_detach,N_("detach the HEAD at named commit")),1141OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1142 BRANCH_TRACK_EXPLICIT),1143OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1144OPT_SET_INT('2',"ours", &opts.writeout_stage,N_("checkout our version for unmerged files"),11452),1146OPT_SET_INT('3',"theirs", &opts.writeout_stage,N_("checkout their version for unmerged files"),11473),1148OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)")),1149OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1150OPT_BOOL(0,"overwrite-ignore", &opts.overwrite_ignore,N_("update ignored files (default)")),1151OPT_STRING(0,"conflict", &conflict_style,N_("style"),1152N_("conflict style (merge or diff3)")),1153OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1154OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1155N_("do not limit pathspecs to sparse entries only")),1156OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1157N_("second guess 'git checkout <no-such-branch>'")),1158OPT_BOOL(0,"ignore-other-worktrees", &opts.ignore_other_worktrees,1159N_("do not check if another worktree is holding the given ref")),1160OPT_BOOL(0,"progress", &opts.show_progress,N_("force progress reporting")),1161OPT_END(),1162};11631164memset(&opts,0,sizeof(opts));1165memset(&new,0,sizeof(new));1166 opts.overwrite_ignore =1;1167 opts.prefix = prefix;1168 opts.show_progress = -1;11691170gitmodules_config();1171git_config(git_checkout_config, &opts);11721173 opts.track = BRANCH_TRACK_UNSPECIFIED;11741175 argc =parse_options(argc, argv, prefix, options, checkout_usage,1176 PARSE_OPT_KEEP_DASHDASH);11771178if(opts.show_progress <0) {1179if(opts.quiet)1180 opts.show_progress =0;1181else1182 opts.show_progress =isatty(2);1183}11841185if(conflict_style) {1186 opts.merge =1;/* implied */1187git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1188}11891190if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1191die(_("-b, -B and --orphan are mutually exclusive"));11921193/*1194 * From here on, new_branch will contain the branch to be checked out,1195 * and new_branch_force and new_orphan_branch will tell us which one of1196 * -b/-B/--orphan is being used.1197 */1198if(opts.new_branch_force)1199 opts.new_branch = opts.new_branch_force;12001201if(opts.new_orphan_branch)1202 opts.new_branch = opts.new_orphan_branch;12031204/* --track without -b/-B/--orphan should DWIM */1205if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1206const char*argv0 = argv[0];1207if(!argc || !strcmp(argv0,"--"))1208die(_("--track needs a branch name"));1209skip_prefix(argv0,"refs/", &argv0);1210skip_prefix(argv0,"remotes/", &argv0);1211 argv0 =strchr(argv0,'/');1212if(!argv0 || !argv0[1])1213die(_("Missing branch name; try -b"));1214 opts.new_branch = argv0 +1;1215}12161217/*1218 * Extract branch name from command line arguments, so1219 * all that is left is pathspecs.1220 *1221 * Handle1222 *1223 * 1) git checkout <tree> -- [<paths>]1224 * 2) git checkout -- [<paths>]1225 * 3) git checkout <something> [<paths>]1226 *1227 * including "last branch" syntax and DWIM-ery for names of1228 * remote branches, erroring out for invalid or ambiguous cases.1229 */1230if(argc) {1231unsigned char rev[20];1232int dwim_ok =1233!opts.patch_mode &&1234 dwim_new_local_branch &&1235 opts.track == BRANCH_TRACK_UNSPECIFIED &&1236!opts.new_branch;1237int n =parse_branchname_arg(argc, argv, dwim_ok,1238&new, &opts, rev);1239 argv += n;1240 argc -= n;1241}12421243if(argc) {1244parse_pathspec(&opts.pathspec,0,1245 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1246 prefix, argv);12471248if(!opts.pathspec.nr)1249die(_("invalid path specification"));12501251/*1252 * Try to give more helpful suggestion.1253 * new_branch && argc > 1 will be caught later.1254 */1255if(opts.new_branch && argc ==1)1256die(_("Cannot update paths and switch to branch '%s' at the same time.\n"1257"Did you intend to checkout '%s' which can not be resolved as commit?"),1258 opts.new_branch, argv[0]);12591260if(opts.force_detach)1261die(_("git checkout: --detach does not take a path argument '%s'"),1262 argv[0]);12631264if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1265die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1266"checking out of the index."));1267}12681269if(opts.new_branch) {1270struct strbuf buf = STRBUF_INIT;12711272 opts.branch_exists =1273validate_new_branchname(opts.new_branch, &buf,1274!!opts.new_branch_force,1275!!opts.new_branch_force);12761277strbuf_release(&buf);1278}12791280if(opts.patch_mode || opts.pathspec.nr)1281returncheckout_paths(&opts,new.name);1282else1283returncheckout_branch(&opts, &new);1284}