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.h" 22#include"argv-array.h" 23#include"sigchain.h" 24 25static const char*const checkout_usage[] = { 26N_("git checkout [options] <branch>"), 27N_("git checkout [options] [<branch>] -- <file>..."), 28 NULL, 29}; 30 31struct checkout_opts { 32int patch_mode; 33int quiet; 34int merge; 35int force; 36int force_detach; 37int writeout_stage; 38int overwrite_ignore; 39int ignore_skipworktree; 40int ignore_other_worktrees; 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 54const char*new_worktree; 55const char**saved_argv; 56int new_worktree_mode; 57}; 58 59static intpost_checkout_hook(struct commit *old,struct commit *new, 60int changed) 61{ 62returnrun_hook_le(NULL,"post-checkout", 63sha1_to_hex(old ? old->object.sha1 : null_sha1), 64sha1_to_hex(new?new->object.sha1 : null_sha1), 65 changed ?"1":"0", NULL); 66/* "new" can be NULL when checking out from the index before 67 a commit exists. */ 68 69} 70 71static intupdate_some(const unsigned char*sha1,const char*base,int baselen, 72const char*pathname,unsigned mode,int stage,void*context) 73{ 74int len; 75struct cache_entry *ce; 76 77if(S_ISDIR(mode)) 78return READ_TREE_RECURSIVE; 79 80 len = baselen +strlen(pathname); 81 ce =xcalloc(1,cache_entry_size(len)); 82hashcpy(ce->sha1, sha1); 83memcpy(ce->name, base, baselen); 84memcpy(ce->name + baselen, pathname, len - baselen); 85 ce->ce_flags =create_ce_flags(0) | CE_UPDATE; 86 ce->ce_namelen = len; 87 ce->ce_mode =create_ce_mode(mode); 88add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); 89return0; 90} 91 92static intread_tree_some(struct tree *tree,const struct pathspec *pathspec) 93{ 94read_tree_recursive(tree,"",0,0, pathspec, update_some, NULL); 95 96/* update the index with the given tree's info 97 * for all args, expanding wildcards, and exit 98 * with any non-zero return code. 99 */ 100return0; 101} 102 103static intskip_same_name(const struct cache_entry *ce,int pos) 104{ 105while(++pos < active_nr && 106!strcmp(active_cache[pos]->name, ce->name)) 107;/* skip */ 108return pos; 109} 110 111static intcheck_stage(int stage,const struct cache_entry *ce,int pos) 112{ 113while(pos < active_nr && 114!strcmp(active_cache[pos]->name, ce->name)) { 115if(ce_stage(active_cache[pos]) == stage) 116return0; 117 pos++; 118} 119if(stage ==2) 120returnerror(_("path '%s' does not have our version"), ce->name); 121else 122returnerror(_("path '%s' does not have their version"), ce->name); 123} 124 125static intcheck_stages(unsigned stages,const struct cache_entry *ce,int pos) 126{ 127unsigned seen =0; 128const char*name = ce->name; 129 130while(pos < active_nr) { 131 ce = active_cache[pos]; 132if(strcmp(name, ce->name)) 133break; 134 seen |= (1<<ce_stage(ce)); 135 pos++; 136} 137if((stages & seen) != stages) 138returnerror(_("path '%s' does not have all necessary versions"), 139 name); 140return0; 141} 142 143static intcheckout_stage(int stage,struct cache_entry *ce,int pos, 144struct checkout *state) 145{ 146while(pos < active_nr && 147!strcmp(active_cache[pos]->name, ce->name)) { 148if(ce_stage(active_cache[pos]) == stage) 149returncheckout_entry(active_cache[pos], state, NULL); 150 pos++; 151} 152if(stage ==2) 153returnerror(_("path '%s' does not have our version"), ce->name); 154else 155returnerror(_("path '%s' does not have their version"), ce->name); 156} 157 158static intcheckout_merged(int pos,struct checkout *state) 159{ 160struct cache_entry *ce = active_cache[pos]; 161const char*path = ce->name; 162 mmfile_t ancestor, ours, theirs; 163int status; 164unsigned char sha1[20]; 165 mmbuffer_t result_buf; 166unsigned char threeway[3][20]; 167unsigned mode =0; 168 169memset(threeway,0,sizeof(threeway)); 170while(pos < active_nr) { 171int stage; 172 stage =ce_stage(ce); 173if(!stage ||strcmp(path, ce->name)) 174break; 175hashcpy(threeway[stage -1], ce->sha1); 176if(stage ==2) 177 mode =create_ce_mode(ce->ce_mode); 178 pos++; 179 ce = active_cache[pos]; 180} 181if(is_null_sha1(threeway[1]) ||is_null_sha1(threeway[2])) 182returnerror(_("path '%s' does not have necessary versions"), path); 183 184read_mmblob(&ancestor, threeway[0]); 185read_mmblob(&ours, threeway[1]); 186read_mmblob(&theirs, threeway[2]); 187 188/* 189 * NEEDSWORK: re-create conflicts from merges with 190 * merge.renormalize set, too 191 */ 192 status =ll_merge(&result_buf, path, &ancestor,"base", 193&ours,"ours", &theirs,"theirs", NULL); 194free(ancestor.ptr); 195free(ours.ptr); 196free(theirs.ptr); 197if(status <0|| !result_buf.ptr) { 198free(result_buf.ptr); 199returnerror(_("path '%s': cannot merge"), path); 200} 201 202/* 203 * NEEDSWORK: 204 * There is absolutely no reason to write this as a blob object 205 * and create a phony cache entry just to leak. This hack is 206 * primarily to get to the write_entry() machinery that massages 207 * the contents to work-tree format and writes out which only 208 * allows it for a cache entry. The code in write_entry() needs 209 * to be refactored to allow us to feed a <buffer, size, mode> 210 * instead of a cache entry. Such a refactoring would help 211 * merge_recursive as well (it also writes the merge result to the 212 * object database even when it may contain conflicts). 213 */ 214if(write_sha1_file(result_buf.ptr, result_buf.size, 215 blob_type, sha1)) 216die(_("Unable to add merge result for '%s'"), path); 217 ce =make_cache_entry(mode, sha1, path,2,0); 218if(!ce) 219die(_("make_cache_entry failed for path '%s'"), path); 220 status =checkout_entry(ce, state, NULL); 221return status; 222} 223 224static intcheckout_paths(const struct checkout_opts *opts, 225const char*revision) 226{ 227int pos; 228struct checkout state; 229static char*ps_matched; 230unsigned char rev[20]; 231int flag; 232struct commit *head; 233int errs =0; 234struct lock_file *lock_file; 235 236if(opts->track != BRANCH_TRACK_UNSPECIFIED) 237die(_("'%s' cannot be used with updating paths"),"--track"); 238 239if(opts->new_branch_log) 240die(_("'%s' cannot be used with updating paths"),"-l"); 241 242if(opts->force && opts->patch_mode) 243die(_("'%s' cannot be used with updating paths"),"-f"); 244 245if(opts->force_detach) 246die(_("'%s' cannot be used with updating paths"),"--detach"); 247 248if(opts->merge && opts->patch_mode) 249die(_("'%s' cannot be used with%s"),"--merge","--patch"); 250 251if(opts->force && opts->merge) 252die(_("'%s' cannot be used with%s"),"-f","-m"); 253 254if(opts->new_branch) 255die(_("Cannot update paths and switch to branch '%s' at the same time."), 256 opts->new_branch); 257 258if(opts->new_worktree) 259die(_("'%s' cannot be used with updating paths"),"--to"); 260 261if(opts->patch_mode) 262returnrun_add_interactive(revision,"--patch=checkout", 263&opts->pathspec); 264 265 lock_file =xcalloc(1,sizeof(struct lock_file)); 266 267hold_locked_index(lock_file,1); 268if(read_cache_preload(&opts->pathspec) <0) 269returnerror(_("corrupt index file")); 270 271if(opts->source_tree) 272read_tree_some(opts->source_tree, &opts->pathspec); 273 274 ps_matched =xcalloc(1, opts->pathspec.nr); 275 276/* 277 * Make sure all pathspecs participated in locating the paths 278 * to be checked out. 279 */ 280for(pos =0; pos < active_nr; pos++) { 281struct cache_entry *ce = active_cache[pos]; 282 ce->ce_flags &= ~CE_MATCHED; 283if(!opts->ignore_skipworktree &&ce_skip_worktree(ce)) 284continue; 285if(opts->source_tree && !(ce->ce_flags & CE_UPDATE)) 286/* 287 * "git checkout tree-ish -- path", but this entry 288 * is in the original index; it will not be checked 289 * out to the working tree and it does not matter 290 * if pathspec matched this entry. We will not do 291 * anything to this entry at all. 292 */ 293continue; 294/* 295 * Either this entry came from the tree-ish we are 296 * checking the paths out of, or we are checking out 297 * of the index. 298 * 299 * If it comes from the tree-ish, we already know it 300 * matches the pathspec and could just stamp 301 * CE_MATCHED to it from update_some(). But we still 302 * need ps_matched and read_tree_recursive (and 303 * eventually tree_entry_interesting) cannot fill 304 * ps_matched yet. Once it can, we can avoid calling 305 * match_pathspec() for _all_ entries when 306 * opts->source_tree != NULL. 307 */ 308if(ce_path_match(ce, &opts->pathspec, ps_matched)) 309 ce->ce_flags |= CE_MATCHED; 310} 311 312if(report_path_error(ps_matched, &opts->pathspec, opts->prefix)) { 313free(ps_matched); 314return1; 315} 316free(ps_matched); 317 318/* "checkout -m path" to recreate conflicted state */ 319if(opts->merge) 320unmerge_marked_index(&the_index); 321 322/* Any unmerged paths? */ 323for(pos =0; pos < active_nr; pos++) { 324const struct cache_entry *ce = active_cache[pos]; 325if(ce->ce_flags & CE_MATCHED) { 326if(!ce_stage(ce)) 327continue; 328if(opts->force) { 329warning(_("path '%s' is unmerged"), ce->name); 330}else if(opts->writeout_stage) { 331 errs |=check_stage(opts->writeout_stage, ce, pos); 332}else if(opts->merge) { 333 errs |=check_stages((1<<2) | (1<<3), ce, pos); 334}else{ 335 errs =1; 336error(_("path '%s' is unmerged"), ce->name); 337} 338 pos =skip_same_name(ce, pos) -1; 339} 340} 341if(errs) 342return1; 343 344/* Now we are committed to check them out */ 345memset(&state,0,sizeof(state)); 346 state.force =1; 347 state.refresh_cache =1; 348 state.istate = &the_index; 349for(pos =0; pos < active_nr; pos++) { 350struct cache_entry *ce = active_cache[pos]; 351if(ce->ce_flags & CE_MATCHED) { 352if(!ce_stage(ce)) { 353 errs |=checkout_entry(ce, &state, NULL); 354continue; 355} 356if(opts->writeout_stage) 357 errs |=checkout_stage(opts->writeout_stage, ce, pos, &state); 358else if(opts->merge) 359 errs |=checkout_merged(pos, &state); 360 pos =skip_same_name(ce, pos) -1; 361} 362} 363 364if(write_locked_index(&the_index, lock_file, COMMIT_LOCK)) 365die(_("unable to write new index file")); 366 367read_ref_full("HEAD",0, rev, &flag); 368 head =lookup_commit_reference_gently(rev,1); 369 370 errs |=post_checkout_hook(head, head,0); 371return errs; 372} 373 374static voidshow_local_changes(struct object *head, 375const struct diff_options *opts) 376{ 377struct rev_info rev; 378/* I think we want full paths, even if we're in a subdirectory. */ 379init_revisions(&rev, NULL); 380 rev.diffopt.flags = opts->flags; 381 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; 382diff_setup_done(&rev.diffopt); 383add_pending_object(&rev, head, NULL); 384run_diff_index(&rev,0); 385} 386 387static voiddescribe_detached_head(const char*msg,struct commit *commit) 388{ 389struct strbuf sb = STRBUF_INIT; 390if(!parse_commit(commit)) 391pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); 392fprintf(stderr,"%s %s...%s\n", msg, 393find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), sb.buf); 394strbuf_release(&sb); 395} 396 397static intreset_tree(struct tree *tree,const struct checkout_opts *o, 398int worktree,int*writeout_error) 399{ 400struct unpack_trees_options opts; 401struct tree_desc tree_desc; 402 403memset(&opts,0,sizeof(opts)); 404 opts.head_idx = -1; 405 opts.update = worktree; 406 opts.skip_unmerged = !worktree; 407 opts.reset =1; 408 opts.merge =1; 409 opts.fn = oneway_merge; 410 opts.verbose_update = !o->quiet &&isatty(2); 411 opts.src_index = &the_index; 412 opts.dst_index = &the_index; 413parse_tree(tree); 414init_tree_desc(&tree_desc, tree->buffer, tree->size); 415switch(unpack_trees(1, &tree_desc, &opts)) { 416case-2: 417*writeout_error =1; 418/* 419 * We return 0 nevertheless, as the index is all right 420 * and more importantly we have made best efforts to 421 * update paths in the work tree, and we cannot revert 422 * them. 423 */ 424case0: 425return0; 426default: 427return128; 428} 429} 430 431struct branch_info { 432const char*name;/* The short name used */ 433const char*path;/* The full name of a real branch */ 434struct commit *commit;/* The named commit */ 435/* 436 * if not null the branch is detached because it's already 437 * checked out in this checkout 438 */ 439char*checkout; 440}; 441 442static voidsetup_branch_path(struct branch_info *branch) 443{ 444struct strbuf buf = STRBUF_INIT; 445 446strbuf_branchname(&buf, branch->name); 447if(strcmp(buf.buf, branch->name)) 448 branch->name =xstrdup(buf.buf); 449strbuf_splice(&buf,0,0,"refs/heads/",11); 450 branch->path =strbuf_detach(&buf, NULL); 451} 452 453static intmerge_working_tree(const struct checkout_opts *opts, 454struct branch_info *old, 455struct branch_info *new, 456int*writeout_error) 457{ 458int ret; 459struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file)); 460 461hold_locked_index(lock_file,1); 462if(read_cache_preload(NULL) <0) 463returnerror(_("corrupt index file")); 464 465resolve_undo_clear(); 466if(opts->force) { 467 ret =reset_tree(new->commit->tree, opts,1, writeout_error); 468if(ret) 469return ret; 470}else{ 471struct tree_desc trees[2]; 472struct tree *tree; 473struct unpack_trees_options topts; 474 475memset(&topts,0,sizeof(topts)); 476 topts.head_idx = -1; 477 topts.src_index = &the_index; 478 topts.dst_index = &the_index; 479 480setup_unpack_trees_porcelain(&topts,"checkout"); 481 482refresh_cache(REFRESH_QUIET); 483 484if(unmerged_cache()) { 485error(_("you need to resolve your current index first")); 486return1; 487} 488 489/* 2-way merge to the new branch */ 490 topts.initial_checkout =is_cache_unborn(); 491 topts.update =1; 492 topts.merge =1; 493 topts.gently = opts->merge && old->commit; 494 topts.verbose_update = !opts->quiet &&isatty(2); 495 topts.fn = twoway_merge; 496if(opts->overwrite_ignore) { 497 topts.dir =xcalloc(1,sizeof(*topts.dir)); 498 topts.dir->flags |= DIR_SHOW_IGNORED; 499setup_standard_excludes(topts.dir); 500} 501 tree =parse_tree_indirect(old->commit && !opts->new_worktree_mode ? 502 old->commit->object.sha1 : 503 EMPTY_TREE_SHA1_BIN); 504init_tree_desc(&trees[0], tree->buffer, tree->size); 505 tree =parse_tree_indirect(new->commit->object.sha1); 506init_tree_desc(&trees[1], tree->buffer, tree->size); 507 508 ret =unpack_trees(2, trees, &topts); 509if(ret == -1) { 510/* 511 * Unpack couldn't do a trivial merge; either 512 * give up or do a real merge, depending on 513 * whether the merge flag was used. 514 */ 515struct tree *result; 516struct tree *work; 517struct merge_options o; 518if(!opts->merge) 519return1; 520 521/* 522 * Without old->commit, the below is the same as 523 * the two-tree unpack we already tried and failed. 524 */ 525if(!old->commit) 526return1; 527 528/* Do more real merge */ 529 530/* 531 * We update the index fully, then write the 532 * tree from the index, then merge the new 533 * branch with the current tree, with the old 534 * branch as the base. Then we reset the index 535 * (but not the working tree) to the new 536 * branch, leaving the working tree as the 537 * merged version, but skipping unmerged 538 * entries in the index. 539 */ 540 541add_files_to_cache(NULL, NULL,0); 542/* 543 * NEEDSWORK: carrying over local changes 544 * when branches have different end-of-line 545 * normalization (or clean+smudge rules) is 546 * a pain; plumb in an option to set 547 * o.renormalize? 548 */ 549init_merge_options(&o); 550 o.verbosity =0; 551 work =write_tree_from_memory(&o); 552 553 ret =reset_tree(new->commit->tree, opts,1, 554 writeout_error); 555if(ret) 556return ret; 557 o.ancestor = old->name; 558 o.branch1 =new->name; 559 o.branch2 ="local"; 560merge_trees(&o,new->commit->tree, work, 561 old->commit->tree, &result); 562 ret =reset_tree(new->commit->tree, opts,0, 563 writeout_error); 564if(ret) 565return ret; 566} 567} 568 569if(!active_cache_tree) 570 active_cache_tree =cache_tree(); 571 572if(!cache_tree_fully_valid(active_cache_tree)) 573cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); 574 575if(write_locked_index(&the_index, lock_file, COMMIT_LOCK)) 576die(_("unable to write new index file")); 577 578if(!opts->force && !opts->quiet) 579show_local_changes(&new->commit->object, &opts->diff_options); 580 581return0; 582} 583 584static voidreport_tracking(struct branch_info *new) 585{ 586struct strbuf sb = STRBUF_INIT; 587struct branch *branch =branch_get(new->name); 588 589if(!format_tracking_info(branch, &sb)) 590return; 591fputs(sb.buf, stdout); 592strbuf_release(&sb); 593} 594 595static voidupdate_refs_for_switch(const struct checkout_opts *opts, 596struct branch_info *old, 597struct branch_info *new) 598{ 599struct strbuf msg = STRBUF_INIT; 600const char*old_desc, *reflog_msg; 601if(opts->new_branch) { 602if(opts->new_orphan_branch) { 603if(opts->new_branch_log && !log_all_ref_updates) { 604int temp; 605struct strbuf log_file = STRBUF_INIT; 606int ret; 607const char*ref_name; 608 609 ref_name =mkpath("refs/heads/%s", opts->new_orphan_branch); 610 temp = log_all_ref_updates; 611 log_all_ref_updates =1; 612 ret =log_ref_setup(ref_name, &log_file); 613 log_all_ref_updates = temp; 614strbuf_release(&log_file); 615if(ret) { 616fprintf(stderr,_("Can not do reflog for '%s'\n"), 617 opts->new_orphan_branch); 618return; 619} 620} 621} 622else 623create_branch(old->name, opts->new_branch,new->name, 624 opts->new_branch_force ?1:0, 625 opts->new_branch_log, 626 opts->new_branch_force ?1:0, 627 opts->quiet, 628 opts->track); 629new->name = opts->new_branch; 630setup_branch_path(new); 631} 632 633 old_desc = old->name; 634if(!old_desc && old->commit) 635 old_desc =sha1_to_hex(old->commit->object.sha1); 636 637 reflog_msg =getenv("GIT_REFLOG_ACTION"); 638if(!reflog_msg) 639strbuf_addf(&msg,"checkout: moving from%sto%s", 640 old_desc ? old_desc :"(invalid)",new->name); 641else 642strbuf_insert(&msg,0, reflog_msg,strlen(reflog_msg)); 643 644if(!strcmp(new->name,"HEAD") && !new->path && !opts->force_detach) { 645/* Nothing to do. */ 646}else if(opts->force_detach || !new->path) {/* No longer on any branch. */ 647update_ref(msg.buf,"HEAD",new->commit->object.sha1, NULL, 648 REF_NODEREF, UPDATE_REFS_DIE_ON_ERR); 649if(!opts->quiet) { 650if(old->path && advice_detached_head) 651detach_advice(new->name); 652describe_detached_head(_("HEAD is now at"),new->commit); 653} 654}else if(new->path) {/* Switch branches. */ 655create_symref("HEAD",new->path, msg.buf); 656if(!opts->quiet) { 657if(old->path && !strcmp(new->path, old->path)) { 658if(opts->new_branch_force) 659fprintf(stderr,_("Reset branch '%s'\n"), 660new->name); 661else 662fprintf(stderr,_("Already on '%s'\n"), 663new->name); 664}else if(opts->new_branch) { 665if(opts->branch_exists) 666fprintf(stderr,_("Switched to and reset branch '%s'\n"),new->name); 667else 668fprintf(stderr,_("Switched to a new branch '%s'\n"),new->name); 669}else{ 670fprintf(stderr,_("Switched to branch '%s'\n"), 671new->name); 672} 673} 674if(old->path && old->name) { 675if(!ref_exists(old->path) &&reflog_exists(old->path)) 676delete_reflog(old->path); 677} 678} 679remove_branch_state(); 680strbuf_release(&msg); 681if(!opts->quiet && 682(new->path || (!opts->force_detach && !strcmp(new->name,"HEAD")))) 683report_tracking(new); 684} 685 686static intadd_pending_uninteresting_ref(const char*refname, 687const unsigned char*sha1, 688int flags,void*cb_data) 689{ 690add_pending_sha1(cb_data, refname, sha1, UNINTERESTING); 691return0; 692} 693 694static voiddescribe_one_orphan(struct strbuf *sb,struct commit *commit) 695{ 696strbuf_addstr(sb," "); 697strbuf_addstr(sb, 698find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); 699strbuf_addch(sb,' '); 700if(!parse_commit(commit)) 701pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); 702strbuf_addch(sb,'\n'); 703} 704 705#define ORPHAN_CUTOFF 4 706static voidsuggest_reattach(struct commit *commit,struct rev_info *revs) 707{ 708struct commit *c, *last = NULL; 709struct strbuf sb = STRBUF_INIT; 710int lost =0; 711while((c =get_revision(revs)) != NULL) { 712if(lost < ORPHAN_CUTOFF) 713describe_one_orphan(&sb, c); 714 last = c; 715 lost++; 716} 717if(ORPHAN_CUTOFF < lost) { 718int more = lost - ORPHAN_CUTOFF; 719if(more ==1) 720describe_one_orphan(&sb, last); 721else 722strbuf_addf(&sb,_(" ... and%dmore.\n"), more); 723} 724 725fprintf(stderr, 726Q_( 727/* The singular version */ 728"Warning: you are leaving%dcommit behind, " 729"not connected to\n" 730"any of your branches:\n\n" 731"%s\n", 732/* The plural version */ 733"Warning: you are leaving%dcommits behind, " 734"not connected to\n" 735"any of your branches:\n\n" 736"%s\n", 737/* Give ngettext() the count */ 738 lost), 739 lost, 740 sb.buf); 741strbuf_release(&sb); 742 743if(advice_detached_head) 744fprintf(stderr, 745_( 746"If you want to keep them by creating a new branch, " 747"this may be a good time\nto do so with:\n\n" 748" git branch new_branch_name%s\n\n"), 749find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); 750} 751 752/* 753 * We are about to leave commit that was at the tip of a detached 754 * HEAD. If it is not reachable from any ref, this is the last chance 755 * for the user to do so without resorting to reflog. 756 */ 757static voidorphaned_commit_warning(struct commit *old,struct commit *new) 758{ 759struct rev_info revs; 760struct object *object = &old->object; 761struct object_array refs; 762 763init_revisions(&revs, NULL); 764setup_revisions(0, NULL, &revs, NULL); 765 766 object->flags &= ~UNINTERESTING; 767add_pending_object(&revs, object,sha1_to_hex(object->sha1)); 768 769for_each_ref(add_pending_uninteresting_ref, &revs); 770add_pending_sha1(&revs,"HEAD",new->object.sha1, UNINTERESTING); 771 772 refs = revs.pending; 773 revs.leak_pending =1; 774 775if(prepare_revision_walk(&revs)) 776die(_("internal error in revision walk")); 777if(!(old->object.flags & UNINTERESTING)) 778suggest_reattach(old, &revs); 779else 780describe_detached_head(_("Previous HEAD position was"), old); 781 782clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS); 783free(refs.objects); 784} 785 786static intswitch_branches(const struct checkout_opts *opts, 787struct branch_info *new) 788{ 789int ret =0; 790struct branch_info old; 791void*path_to_free; 792unsigned char rev[20]; 793int flag, writeout_error =0; 794memset(&old,0,sizeof(old)); 795 old.path = path_to_free =resolve_refdup("HEAD",0, rev, &flag); 796 old.commit =lookup_commit_reference_gently(rev,1); 797if(!(flag & REF_ISSYMREF)) 798 old.path = NULL; 799 800if(old.path) 801skip_prefix(old.path,"refs/heads/", &old.name); 802 803if(!new->name) { 804new->name ="HEAD"; 805new->commit = old.commit; 806if(!new->commit) 807die(_("You are on a branch yet to be born")); 808parse_commit_or_die(new->commit); 809} 810 811 ret =merge_working_tree(opts, &old,new, &writeout_error); 812if(ret) { 813free(path_to_free); 814return ret; 815} 816 817if(!opts->quiet && !old.path && old.commit && 818new->commit != old.commit && !opts->new_worktree_mode) 819orphaned_commit_warning(old.commit,new->commit); 820 821update_refs_for_switch(opts, &old,new); 822 823 ret =post_checkout_hook(old.commit,new->commit,1); 824free(path_to_free); 825return ret || writeout_error; 826} 827 828static char*junk_work_tree; 829static char*junk_git_dir; 830static int is_junk; 831static pid_t junk_pid; 832 833static voidremove_junk(void) 834{ 835struct strbuf sb = STRBUF_INIT; 836if(!is_junk ||getpid() != junk_pid) 837return; 838if(junk_git_dir) { 839strbuf_addstr(&sb, junk_git_dir); 840remove_dir_recursively(&sb,0); 841strbuf_reset(&sb); 842} 843if(junk_work_tree) { 844strbuf_addstr(&sb, junk_work_tree); 845remove_dir_recursively(&sb,0); 846} 847strbuf_release(&sb); 848} 849 850static voidremove_junk_on_signal(int signo) 851{ 852remove_junk(); 853sigchain_pop(signo); 854raise(signo); 855} 856 857static intprepare_linked_checkout(const struct checkout_opts *opts, 858struct branch_info *new) 859{ 860struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT; 861struct strbuf sb = STRBUF_INIT; 862const char*path = opts->new_worktree, *name; 863struct stat st; 864struct child_process cp; 865int counter =0, len, ret; 866unsigned char rev[20]; 867 868if(!new->commit) 869die(_("no branch specified")); 870if(file_exists(path) && !is_empty_dir(path)) 871die(_("'%s' already exists"), path); 872 873 len =strlen(path); 874while(len &&is_dir_sep(path[len -1])) 875 len--; 876 877for(name = path + len -1; name > path; name--) 878if(is_dir_sep(*name)) { 879 name++; 880break; 881} 882strbuf_addstr(&sb_repo, 883git_path("worktrees/%.*s", (int)(path + len - name), name)); 884 len = sb_repo.len; 885if(safe_create_leading_directories_const(sb_repo.buf)) 886die_errno(_("could not create leading directories of '%s'"), 887 sb_repo.buf); 888while(!stat(sb_repo.buf, &st)) { 889 counter++; 890strbuf_setlen(&sb_repo, len); 891strbuf_addf(&sb_repo,"%d", counter); 892} 893 name =strrchr(sb_repo.buf,'/') +1; 894 895 junk_pid =getpid(); 896atexit(remove_junk); 897sigchain_push_common(remove_junk_on_signal); 898 899if(mkdir(sb_repo.buf,0777)) 900die_errno(_("could not create directory of '%s'"), sb_repo.buf); 901 junk_git_dir =xstrdup(sb_repo.buf); 902 is_junk =1; 903 904/* 905 * lock the incomplete repo so prune won't delete it, unlock 906 * after the preparation is over. 907 */ 908strbuf_addf(&sb,"%s/locked", sb_repo.buf); 909write_file(sb.buf,1,"initializing\n"); 910 911strbuf_addf(&sb_git,"%s/.git", path); 912if(safe_create_leading_directories_const(sb_git.buf)) 913die_errno(_("could not create leading directories of '%s'"), 914 sb_git.buf); 915 junk_work_tree =xstrdup(path); 916 917strbuf_reset(&sb); 918strbuf_addf(&sb,"%s/gitdir", sb_repo.buf); 919write_file(sb.buf,1,"%s\n",real_path(sb_git.buf)); 920write_file(sb_git.buf,1,"gitdir:%s/worktrees/%s\n", 921real_path(get_git_common_dir()), name); 922/* 923 * This is to keep resolve_ref() happy. We need a valid HEAD 924 * or is_git_directory() will reject the directory. Moreover, HEAD 925 * in the new worktree must resolve to the same value as HEAD in 926 * the current tree since the command invoked to populate the new 927 * worktree will be handed the branch/ref specified by the user. 928 * For instance, if the user asks for the new worktree to be based 929 * at HEAD~5, then the resolved HEAD~5 in the new worktree must 930 * match the resolved HEAD~5 in the current tree in order to match 931 * the user's expectation. 932 */ 933if(!resolve_ref_unsafe("HEAD",0, rev, NULL)) 934die(_("unable to resolve HEAD")); 935strbuf_reset(&sb); 936strbuf_addf(&sb,"%s/HEAD", sb_repo.buf); 937write_file(sb.buf,1,"%s\n",sha1_to_hex(rev)); 938strbuf_reset(&sb); 939strbuf_addf(&sb,"%s/commondir", sb_repo.buf); 940write_file(sb.buf,1,"../..\n"); 941 942if(!opts->quiet) 943fprintf_ln(stderr,_("Enter%s(identifier%s)"), path, name); 944 945setenv("GIT_CHECKOUT_NEW_WORKTREE","1",1); 946setenv(GIT_DIR_ENVIRONMENT, sb_git.buf,1); 947setenv(GIT_WORK_TREE_ENVIRONMENT, path,1); 948memset(&cp,0,sizeof(cp)); 949 cp.git_cmd =1; 950 cp.argv = opts->saved_argv; 951 ret =run_command(&cp); 952if(!ret) { 953 is_junk =0; 954free(junk_work_tree); 955free(junk_git_dir); 956 junk_work_tree = NULL; 957 junk_git_dir = NULL; 958} 959strbuf_reset(&sb); 960strbuf_addf(&sb,"%s/locked", sb_repo.buf); 961unlink_or_warn(sb.buf); 962strbuf_release(&sb); 963strbuf_release(&sb_repo); 964strbuf_release(&sb_git); 965return ret; 966} 967 968static intgit_checkout_config(const char*var,const char*value,void*cb) 969{ 970if(!strcmp(var,"diff.ignoresubmodules")) { 971struct checkout_opts *opts = cb; 972handle_ignore_submodules_arg(&opts->diff_options, value); 973return0; 974} 975 976if(starts_with(var,"submodule.")) 977returnparse_submodule_config_option(var, value); 978 979returngit_xmerge_config(var, value, NULL); 980} 981 982struct tracking_name_data { 983/* const */char*src_ref; 984char*dst_ref; 985unsigned char*dst_sha1; 986int unique; 987}; 988 989static intcheck_tracking_name(struct remote *remote,void*cb_data) 990{ 991struct tracking_name_data *cb = cb_data; 992struct refspec query; 993memset(&query,0,sizeof(struct refspec)); 994 query.src = cb->src_ref; 995if(remote_find_tracking(remote, &query) || 996get_sha1(query.dst, cb->dst_sha1)) { 997free(query.dst); 998return0; 999}1000if(cb->dst_ref) {1001free(query.dst);1002 cb->unique =0;1003return0;1004}1005 cb->dst_ref = query.dst;1006return0;1007}10081009static const char*unique_tracking_name(const char*name,unsigned char*sha1)1010{1011struct tracking_name_data cb_data = { NULL, NULL, NULL,1};1012char src_ref[PATH_MAX];1013snprintf(src_ref, PATH_MAX,"refs/heads/%s", name);1014 cb_data.src_ref = src_ref;1015 cb_data.dst_sha1 = sha1;1016for_each_remote(check_tracking_name, &cb_data);1017if(cb_data.unique)1018return cb_data.dst_ref;1019free(cb_data.dst_ref);1020return NULL;1021}10221023static voidcheck_linked_checkout(struct branch_info *new,const char*id)1024{1025struct strbuf sb = STRBUF_INIT;1026struct strbuf path = STRBUF_INIT;1027struct strbuf gitdir = STRBUF_INIT;1028const char*start, *end;10291030if(id)1031strbuf_addf(&path,"%s/worktrees/%s/HEAD",get_git_common_dir(), id);1032else1033strbuf_addf(&path,"%s/HEAD",get_git_common_dir());10341035if(strbuf_read_file(&sb, path.buf,0) <0||1036!skip_prefix(sb.buf,"ref:", &start))1037goto done;1038while(isspace(*start))1039 start++;1040 end = start;1041while(*end && !isspace(*end))1042 end++;1043if(strncmp(start,new->path, end - start) ||new->path[end - start] !='\0')1044goto done;1045if(id) {1046strbuf_reset(&path);1047strbuf_addf(&path,"%s/worktrees/%s/gitdir",get_git_common_dir(), id);1048if(strbuf_read_file(&gitdir, path.buf,0) <=0)1049goto done;1050strbuf_rtrim(&gitdir);1051}else1052strbuf_addstr(&gitdir,get_git_common_dir());1053die(_("'%s' is already checked out at '%s'"),new->name, gitdir.buf);1054done:1055strbuf_release(&path);1056strbuf_release(&sb);1057strbuf_release(&gitdir);1058}10591060static voidcheck_linked_checkouts(struct branch_info *new)1061{1062struct strbuf path = STRBUF_INIT;1063DIR*dir;1064struct dirent *d;10651066strbuf_addf(&path,"%s/worktrees",get_git_common_dir());1067if((dir =opendir(path.buf)) == NULL) {1068strbuf_release(&path);1069return;1070}10711072/*1073 * $GIT_COMMON_DIR/HEAD is practically outside1074 * $GIT_DIR so resolve_ref_unsafe() won't work (it1075 * uses git_path). Parse the ref ourselves.1076 */1077check_linked_checkout(new, NULL);10781079while((d =readdir(dir)) != NULL) {1080if(!strcmp(d->d_name,".") || !strcmp(d->d_name,".."))1081continue;1082check_linked_checkout(new, d->d_name);1083}1084strbuf_release(&path);1085closedir(dir);1086}10871088static intparse_branchname_arg(int argc,const char**argv,1089int dwim_new_local_branch_ok,1090struct branch_info *new,1091struct checkout_opts *opts,1092unsigned char rev[20])1093{1094struct tree **source_tree = &opts->source_tree;1095const char**new_branch = &opts->new_branch;1096int argcount =0;1097unsigned char branch_rev[20];1098const char*arg;1099int dash_dash_pos;1100int has_dash_dash =0;1101int i;11021103/*1104 * case 1: git checkout <ref> -- [<paths>]1105 *1106 * <ref> must be a valid tree, everything after the '--' must be1107 * a path.1108 *1109 * case 2: git checkout -- [<paths>]1110 *1111 * everything after the '--' must be paths.1112 *1113 * case 3: git checkout <something> [--]1114 *1115 * (a) If <something> is a commit, that is to1116 * switch to the branch or detach HEAD at it. As a special case,1117 * if <something> is A...B (missing A or B means HEAD but you can1118 * omit at most one side), and if there is a unique merge base1119 * between A and B, A...B names that merge base.1120 *1121 * (b) If <something> is _not_ a commit, either "--" is present1122 * or <something> is not a path, no -t or -b was given, and1123 * and there is a tracking branch whose name is <something>1124 * in one and only one remote, then this is a short-hand to1125 * fork local <something> from that remote-tracking branch.1126 *1127 * (c) Otherwise, if "--" is present, treat it like case (1).1128 *1129 * (d) Otherwise :1130 * - if it's a reference, treat it like case (1)1131 * - else if it's a path, treat it like case (2)1132 * - else: fail.1133 *1134 * case 4: git checkout <something> <paths>1135 *1136 * The first argument must not be ambiguous.1137 * - If it's *only* a reference, treat it like case (1).1138 * - If it's only a path, treat it like case (2).1139 * - else: fail.1140 *1141 */1142if(!argc)1143return0;11441145 arg = argv[0];1146 dash_dash_pos = -1;1147for(i =0; i < argc; i++) {1148if(!strcmp(argv[i],"--")) {1149 dash_dash_pos = i;1150break;1151}1152}1153if(dash_dash_pos ==0)1154return1;/* case (2) */1155else if(dash_dash_pos ==1)1156 has_dash_dash =1;/* case (3) or (1) */1157else if(dash_dash_pos >=2)1158die(_("only one reference expected,%dgiven."), dash_dash_pos);11591160if(!strcmp(arg,"-"))1161 arg ="@{-1}";11621163if(get_sha1_mb(arg, rev)) {1164/*1165 * Either case (3) or (4), with <something> not being1166 * a commit, or an attempt to use case (1) with an1167 * invalid ref.1168 *1169 * It's likely an error, but we need to find out if1170 * we should auto-create the branch, case (3).(b).1171 */1172int recover_with_dwim = dwim_new_local_branch_ok;11731174if(check_filename(NULL, arg) && !has_dash_dash)1175 recover_with_dwim =0;1176/*1177 * Accept "git checkout foo" and "git checkout foo --"1178 * as candidates for dwim.1179 */1180if(!(argc ==1&& !has_dash_dash) &&1181!(argc ==2&& has_dash_dash))1182 recover_with_dwim =0;11831184if(recover_with_dwim) {1185const char*remote =unique_tracking_name(arg, rev);1186if(remote) {1187*new_branch = arg;1188 arg = remote;1189/* DWIMmed to create local branch, case (3).(b) */1190}else{1191 recover_with_dwim =0;1192}1193}11941195if(!recover_with_dwim) {1196if(has_dash_dash)1197die(_("invalid reference:%s"), arg);1198return argcount;1199}1200}12011202/* we can't end up being in (2) anymore, eat the argument */1203 argcount++;1204 argv++;1205 argc--;12061207new->name = arg;1208setup_branch_path(new);12091210if(!check_refname_format(new->path,0) &&1211!read_ref(new->path, branch_rev))1212hashcpy(rev, branch_rev);1213else1214new->path = NULL;/* not an existing branch */12151216new->commit =lookup_commit_reference_gently(rev,1);1217if(!new->commit) {1218/* not a commit */1219*source_tree =parse_tree_indirect(rev);1220}else{1221parse_commit_or_die(new->commit);1222*source_tree =new->commit->tree;1223}12241225if(!*source_tree)/* case (1): want a tree */1226die(_("reference is not a tree:%s"), arg);1227if(!has_dash_dash) {/* case (3).(d) -> (1) */1228/*1229 * Do not complain the most common case1230 * git checkout branch1231 * even if there happen to be a file called 'branch';1232 * it would be extremely annoying.1233 */1234if(argc)1235verify_non_filename(NULL, arg);1236}else{1237 argcount++;1238 argv++;1239 argc--;1240}12411242return argcount;1243}12441245static intswitch_unborn_to_new_branch(const struct checkout_opts *opts)1246{1247int status;1248struct strbuf branch_ref = STRBUF_INIT;12491250if(!opts->new_branch)1251die(_("You are on a branch yet to be born"));1252strbuf_addf(&branch_ref,"refs/heads/%s", opts->new_branch);1253 status =create_symref("HEAD", branch_ref.buf,"checkout -b");1254strbuf_release(&branch_ref);1255if(!opts->quiet)1256fprintf(stderr,_("Switched to a new branch '%s'\n"),1257 opts->new_branch);1258return status;1259}12601261static intcheckout_branch(struct checkout_opts *opts,1262struct branch_info *new)1263{1264if(opts->pathspec.nr)1265die(_("paths cannot be used with switching branches"));12661267if(opts->patch_mode)1268die(_("'%s' cannot be used with switching branches"),1269"--patch");12701271if(opts->writeout_stage)1272die(_("'%s' cannot be used with switching branches"),1273"--ours/--theirs");12741275if(opts->force && opts->merge)1276die(_("'%s' cannot be used with '%s'"),"-f","-m");12771278if(opts->force_detach && opts->new_branch)1279die(_("'%s' cannot be used with '%s'"),1280"--detach","-b/-B/--orphan");12811282if(opts->new_orphan_branch) {1283if(opts->track != BRANCH_TRACK_UNSPECIFIED)1284die(_("'%s' cannot be used with '%s'"),"--orphan","-t");1285}else if(opts->force_detach) {1286if(opts->track != BRANCH_TRACK_UNSPECIFIED)1287die(_("'%s' cannot be used with '%s'"),"--detach","-t");1288}else if(opts->track == BRANCH_TRACK_UNSPECIFIED)1289 opts->track = git_branch_track;12901291if(new->name && !new->commit)1292die(_("Cannot switch branch to a non-commit '%s'"),1293new->name);12941295if(new->path && !opts->force_detach && !opts->new_branch) {1296unsigned char sha1[20];1297int flag;1298char*head_ref =resolve_refdup("HEAD",0, sha1, &flag);1299if(head_ref &&1300(!(flag & REF_ISSYMREF) ||strcmp(head_ref,new->path)) &&1301!opts->ignore_other_worktrees)1302check_linked_checkouts(new);1303free(head_ref);1304}13051306if(opts->new_worktree)1307returnprepare_linked_checkout(opts,new);13081309if(!new->commit && opts->new_branch) {1310unsigned char rev[20];1311int flag;13121313if(!read_ref_full("HEAD",0, rev, &flag) &&1314(flag & REF_ISSYMREF) &&is_null_sha1(rev))1315returnswitch_unborn_to_new_branch(opts);1316}1317returnswitch_branches(opts,new);1318}13191320intcmd_checkout(int argc,const char**argv,const char*prefix)1321{1322struct checkout_opts opts;1323struct branch_info new;1324char*conflict_style = NULL;1325int dwim_new_local_branch =1;1326struct option options[] = {1327OPT__QUIET(&opts.quiet,N_("suppress progress reporting")),1328OPT_STRING('b', NULL, &opts.new_branch,N_("branch"),1329N_("create and checkout a new branch")),1330OPT_STRING('B', NULL, &opts.new_branch_force,N_("branch"),1331N_("create/reset and checkout a branch")),1332OPT_BOOL('l', NULL, &opts.new_branch_log,N_("create reflog for new branch")),1333OPT_BOOL(0,"detach", &opts.force_detach,N_("detach the HEAD at named commit")),1334OPT_SET_INT('t',"track", &opts.track,N_("set upstream info for new branch"),1335 BRANCH_TRACK_EXPLICIT),1336OPT_STRING(0,"orphan", &opts.new_orphan_branch,N_("new-branch"),N_("new unparented branch")),1337OPT_SET_INT('2',"ours", &opts.writeout_stage,N_("checkout our version for unmerged files"),13382),1339OPT_SET_INT('3',"theirs", &opts.writeout_stage,N_("checkout their version for unmerged files"),13403),1341OPT__FORCE(&opts.force,N_("force checkout (throw away local modifications)")),1342OPT_BOOL('m',"merge", &opts.merge,N_("perform a 3-way merge with the new branch")),1343OPT_BOOL(0,"overwrite-ignore", &opts.overwrite_ignore,N_("update ignored files (default)")),1344OPT_STRING(0,"conflict", &conflict_style,N_("style"),1345N_("conflict style (merge or diff3)")),1346OPT_BOOL('p',"patch", &opts.patch_mode,N_("select hunks interactively")),1347OPT_BOOL(0,"ignore-skip-worktree-bits", &opts.ignore_skipworktree,1348N_("do not limit pathspecs to sparse entries only")),1349OPT_HIDDEN_BOOL(0,"guess", &dwim_new_local_branch,1350N_("second guess 'git checkout no-such-branch'")),1351OPT_FILENAME(0,"to", &opts.new_worktree,1352N_("check a branch out in a separate working directory")),1353OPT_BOOL(0,"ignore-other-worktrees", &opts.ignore_other_worktrees,1354N_("do not check if another worktree is holding the given ref")),1355OPT_END(),1356};13571358memset(&opts,0,sizeof(opts));1359memset(&new,0,sizeof(new));1360 opts.overwrite_ignore =1;1361 opts.prefix = prefix;13621363 opts.saved_argv =xmalloc(sizeof(const char*) * (argc +2));1364memcpy(opts.saved_argv, argv,sizeof(const char*) * (argc +1));13651366gitmodules_config();1367git_config(git_checkout_config, &opts);13681369 opts.track = BRANCH_TRACK_UNSPECIFIED;13701371 argc =parse_options(argc, argv, prefix, options, checkout_usage,1372 PARSE_OPT_KEEP_DASHDASH);13731374/* recursive execution from checkout_new_worktree() */1375 opts.new_worktree_mode =getenv("GIT_CHECKOUT_NEW_WORKTREE") != NULL;1376if(opts.new_worktree_mode)1377 opts.new_worktree = NULL;13781379if(!opts.new_worktree)1380setup_work_tree();13811382if(conflict_style) {1383 opts.merge =1;/* implied */1384git_xmerge_config("merge.conflictstyle", conflict_style, NULL);1385}13861387if((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) >1)1388die(_("-b, -B and --orphan are mutually exclusive"));13891390/*1391 * From here on, new_branch will contain the branch to be checked out,1392 * and new_branch_force and new_orphan_branch will tell us which one of1393 * -b/-B/--orphan is being used.1394 */1395if(opts.new_branch_force)1396 opts.new_branch = opts.new_branch_force;13971398if(opts.new_orphan_branch)1399 opts.new_branch = opts.new_orphan_branch;14001401/* --track without -b/-B/--orphan should DWIM */1402if(opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {1403const char*argv0 = argv[0];1404if(!argc || !strcmp(argv0,"--"))1405die(_("--track needs a branch name"));1406skip_prefix(argv0,"refs/", &argv0);1407skip_prefix(argv0,"remotes/", &argv0);1408 argv0 =strchr(argv0,'/');1409if(!argv0 || !argv0[1])1410die(_("Missing branch name; try -b"));1411 opts.new_branch = argv0 +1;1412}14131414/*1415 * Extract branch name from command line arguments, so1416 * all that is left is pathspecs.1417 *1418 * Handle1419 *1420 * 1) git checkout <tree> -- [<paths>]1421 * 2) git checkout -- [<paths>]1422 * 3) git checkout <something> [<paths>]1423 *1424 * including "last branch" syntax and DWIM-ery for names of1425 * remote branches, erroring out for invalid or ambiguous cases.1426 */1427if(argc) {1428unsigned char rev[20];1429int dwim_ok =1430!opts.patch_mode &&1431 dwim_new_local_branch &&1432 opts.track == BRANCH_TRACK_UNSPECIFIED &&1433!opts.new_branch;1434int n =parse_branchname_arg(argc, argv, dwim_ok,1435&new, &opts, rev);1436 argv += n;1437 argc -= n;1438}14391440if(argc) {1441parse_pathspec(&opts.pathspec,0,1442 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN :0,1443 prefix, argv);14441445if(!opts.pathspec.nr)1446die(_("invalid path specification"));14471448/*1449 * Try to give more helpful suggestion.1450 * new_branch && argc > 1 will be caught later.1451 */1452if(opts.new_branch && argc ==1)1453die(_("Cannot update paths and switch to branch '%s' at the same time.\n"1454"Did you intend to checkout '%s' which can not be resolved as commit?"),1455 opts.new_branch, argv[0]);14561457if(opts.force_detach)1458die(_("git checkout: --detach does not take a path argument '%s'"),1459 argv[0]);14601461if(1< !!opts.writeout_stage + !!opts.force + !!opts.merge)1462die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"1463"checking out of the index."));1464}14651466if(opts.new_branch) {1467struct strbuf buf = STRBUF_INIT;14681469 opts.branch_exists =1470validate_new_branchname(opts.new_branch, &buf,1471!!opts.new_branch_force,1472!!opts.new_branch_force);14731474strbuf_release(&buf);1475}14761477if(opts.patch_mode || opts.pathspec.nr)1478returncheckout_paths(&opts,new.name);1479else1480returncheckout_branch(&opts, &new);1481}