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