1#include"cache.h" 2#include"argv-array.h" 3#include"repository.h" 4#include"config.h" 5#include"dir.h" 6#include"tree.h" 7#include"tree-walk.h" 8#include"cache-tree.h" 9#include"unpack-trees.h" 10#include"progress.h" 11#include"refs.h" 12#include"attr.h" 13#include"split-index.h" 14#include"dir.h" 15#include"submodule.h" 16#include"submodule-config.h" 17#include"fsmonitor.h" 18#include"object-store.h" 19#include"fetch-object.h" 20 21/* 22 * Error messages expected by scripts out of plumbing commands such as 23 * read-tree. Non-scripted Porcelain is not required to use these messages 24 * and in fact are encouraged to reword them to better suit their particular 25 * situation better. See how "git checkout" and "git merge" replaces 26 * them using setup_unpack_trees_porcelain(), for example. 27 */ 28static const char*unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { 29/* ERROR_WOULD_OVERWRITE */ 30"Entry '%s' would be overwritten by merge. Cannot merge.", 31 32/* ERROR_NOT_UPTODATE_FILE */ 33"Entry '%s' not uptodate. Cannot merge.", 34 35/* ERROR_NOT_UPTODATE_DIR */ 36"Updating '%s' would lose untracked files in it", 37 38/* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */ 39"Untracked working tree file '%s' would be overwritten by merge.", 40 41/* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */ 42"Untracked working tree file '%s' would be removed by merge.", 43 44/* ERROR_BIND_OVERLAP */ 45"Entry '%s' overlaps with '%s'. Cannot bind.", 46 47/* ERROR_SPARSE_NOT_UPTODATE_FILE */ 48"Entry '%s' not uptodate. Cannot update sparse checkout.", 49 50/* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ 51"Working tree file '%s' would be overwritten by sparse checkout update.", 52 53/* ERROR_WOULD_LOSE_ORPHANED_REMOVED */ 54"Working tree file '%s' would be removed by sparse checkout update.", 55 56/* ERROR_WOULD_LOSE_SUBMODULE */ 57"Submodule '%s' cannot checkout new HEAD.", 58}; 59 60#define ERRORMSG(o,type) \ 61 ( ((o) && (o)->msgs[(type)]) \ 62 ? ((o)->msgs[(type)]) \ 63 : (unpack_plumbing_errors[(type)]) ) 64 65static const char*super_prefixed(const char*path) 66{ 67/* 68 * It is necessary and sufficient to have two static buffers 69 * here, as the return value of this function is fed to 70 * error() using the unpack_*_errors[] templates we see above. 71 */ 72static struct strbuf buf[2] = {STRBUF_INIT, STRBUF_INIT}; 73static int super_prefix_len = -1; 74static unsigned idx =ARRAY_SIZE(buf) -1; 75 76if(super_prefix_len <0) { 77const char*super_prefix =get_super_prefix(); 78if(!super_prefix) { 79 super_prefix_len =0; 80}else{ 81int i; 82for(i =0; i <ARRAY_SIZE(buf); i++) 83strbuf_addstr(&buf[i], super_prefix); 84 super_prefix_len = buf[0].len; 85} 86} 87 88if(!super_prefix_len) 89return path; 90 91if(++idx >=ARRAY_SIZE(buf)) 92 idx =0; 93 94strbuf_setlen(&buf[idx], super_prefix_len); 95strbuf_addstr(&buf[idx], path); 96 97return buf[idx].buf; 98} 99 100voidsetup_unpack_trees_porcelain(struct unpack_trees_options *opts, 101const char*cmd) 102{ 103int i; 104const char**msgs = opts->msgs; 105const char*msg; 106 107argv_array_init(&opts->msgs_to_free); 108 109if(!strcmp(cmd,"checkout")) 110 msg = advice_commit_before_merge 111?_("Your local changes to the following files would be overwritten by checkout:\n%%s" 112"Please commit your changes or stash them before you switch branches.") 113:_("Your local changes to the following files would be overwritten by checkout:\n%%s"); 114else if(!strcmp(cmd,"merge")) 115 msg = advice_commit_before_merge 116?_("Your local changes to the following files would be overwritten by merge:\n%%s" 117"Please commit your changes or stash them before you merge.") 118:_("Your local changes to the following files would be overwritten by merge:\n%%s"); 119else 120 msg = advice_commit_before_merge 121?_("Your local changes to the following files would be overwritten by%s:\n%%s" 122"Please commit your changes or stash them before you%s.") 123:_("Your local changes to the following files would be overwritten by%s:\n%%s"); 124 msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = 125argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); 126 127 msgs[ERROR_NOT_UPTODATE_DIR] = 128_("Updating the following directories would lose untracked files in them:\n%s"); 129 130if(!strcmp(cmd,"checkout")) 131 msg = advice_commit_before_merge 132?_("The following untracked working tree files would be removed by checkout:\n%%s" 133"Please move or remove them before you switch branches.") 134:_("The following untracked working tree files would be removed by checkout:\n%%s"); 135else if(!strcmp(cmd,"merge")) 136 msg = advice_commit_before_merge 137?_("The following untracked working tree files would be removed by merge:\n%%s" 138"Please move or remove them before you merge.") 139:_("The following untracked working tree files would be removed by merge:\n%%s"); 140else 141 msg = advice_commit_before_merge 142?_("The following untracked working tree files would be removed by%s:\n%%s" 143"Please move or remove them before you%s.") 144:_("The following untracked working tree files would be removed by%s:\n%%s"); 145 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = 146argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); 147 148if(!strcmp(cmd,"checkout")) 149 msg = advice_commit_before_merge 150?_("The following untracked working tree files would be overwritten by checkout:\n%%s" 151"Please move or remove them before you switch branches.") 152:_("The following untracked working tree files would be overwritten by checkout:\n%%s"); 153else if(!strcmp(cmd,"merge")) 154 msg = advice_commit_before_merge 155?_("The following untracked working tree files would be overwritten by merge:\n%%s" 156"Please move or remove them before you merge.") 157:_("The following untracked working tree files would be overwritten by merge:\n%%s"); 158else 159 msg = advice_commit_before_merge 160?_("The following untracked working tree files would be overwritten by%s:\n%%s" 161"Please move or remove them before you%s.") 162:_("The following untracked working tree files would be overwritten by%s:\n%%s"); 163 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = 164argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); 165 166/* 167 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we 168 * cannot easily display it as a list. 169 */ 170 msgs[ERROR_BIND_OVERLAP] =_("Entry '%s' overlaps with '%s'. Cannot bind."); 171 172 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = 173_("Cannot update sparse checkout: the following entries are not up to date:\n%s"); 174 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = 175_("The following working tree files would be overwritten by sparse checkout update:\n%s"); 176 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = 177_("The following working tree files would be removed by sparse checkout update:\n%s"); 178 msgs[ERROR_WOULD_LOSE_SUBMODULE] = 179_("Cannot update submodule:\n%s"); 180 181 opts->show_all_errors =1; 182/* rejected paths may not have a static buffer */ 183for(i =0; i <ARRAY_SIZE(opts->unpack_rejects); i++) 184 opts->unpack_rejects[i].strdup_strings =1; 185} 186 187voidclear_unpack_trees_porcelain(struct unpack_trees_options *opts) 188{ 189argv_array_clear(&opts->msgs_to_free); 190memset(opts->msgs,0,sizeof(opts->msgs)); 191} 192 193static intdo_add_entry(struct unpack_trees_options *o,struct cache_entry *ce, 194unsigned int set,unsigned int clear) 195{ 196 clear |= CE_HASHED; 197 198if(set & CE_REMOVE) 199 set |= CE_WT_REMOVE; 200 201 ce->ce_flags = (ce->ce_flags & ~clear) | set; 202returnadd_index_entry(&o->result, ce, 203 ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); 204} 205 206static voidadd_entry(struct unpack_trees_options *o, 207const struct cache_entry *ce, 208unsigned int set,unsigned int clear) 209{ 210do_add_entry(o,dup_cache_entry(ce, &o->result), set, clear); 211} 212 213/* 214 * add error messages on path <path> 215 * corresponding to the type <e> with the message <msg> 216 * indicating if it should be display in porcelain or not 217 */ 218static intadd_rejected_path(struct unpack_trees_options *o, 219enum unpack_trees_error_types e, 220const char*path) 221{ 222if(o->quiet) 223return-1; 224 225if(!o->show_all_errors) 226returnerror(ERRORMSG(o, e),super_prefixed(path)); 227 228/* 229 * Otherwise, insert in a list for future display by 230 * display_error_msgs() 231 */ 232string_list_append(&o->unpack_rejects[e], path); 233return-1; 234} 235 236/* 237 * display all the error messages stored in a nice way 238 */ 239static voiddisplay_error_msgs(struct unpack_trees_options *o) 240{ 241int e, i; 242int something_displayed =0; 243for(e =0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { 244struct string_list *rejects = &o->unpack_rejects[e]; 245if(rejects->nr >0) { 246struct strbuf path = STRBUF_INIT; 247 something_displayed =1; 248for(i =0; i < rejects->nr; i++) 249strbuf_addf(&path,"\t%s\n", rejects->items[i].string); 250error(ERRORMSG(o, e),super_prefixed(path.buf)); 251strbuf_release(&path); 252} 253string_list_clear(rejects,0); 254} 255if(something_displayed) 256fprintf(stderr,_("Aborting\n")); 257} 258 259static intcheck_submodule_move_head(const struct cache_entry *ce, 260const char*old_id, 261const char*new_id, 262struct unpack_trees_options *o) 263{ 264unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN; 265const struct submodule *sub =submodule_from_ce(ce); 266 267if(!sub) 268return0; 269 270if(o->reset) 271 flags |= SUBMODULE_MOVE_HEAD_FORCE; 272 273if(submodule_move_head(ce->name, old_id, new_id, flags)) 274returnadd_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name); 275return0; 276} 277 278/* 279 * Preform the loading of the repository's gitmodules file. This function is 280 * used by 'check_update()' to perform loading of the gitmodules file in two 281 * differnt situations: 282 * (1) before removing entries from the working tree if the gitmodules file has 283 * been marked for removal. This situation is specified by 'state' == NULL. 284 * (2) before checking out entries to the working tree if the gitmodules file 285 * has been marked for update. This situation is specified by 'state' != NULL. 286 */ 287static voidload_gitmodules_file(struct index_state *index, 288struct checkout *state) 289{ 290int pos =index_name_pos(index, GITMODULES_FILE,strlen(GITMODULES_FILE)); 291 292if(pos >=0) { 293struct cache_entry *ce = index->cache[pos]; 294if(!state && ce->ce_flags & CE_WT_REMOVE) { 295repo_read_gitmodules(the_repository); 296}else if(state && (ce->ce_flags & CE_UPDATE)) { 297submodule_free(the_repository); 298checkout_entry(ce, state, NULL, NULL); 299repo_read_gitmodules(the_repository); 300} 301} 302} 303 304static struct progress *get_progress(struct unpack_trees_options *o) 305{ 306unsigned cnt =0, total =0; 307struct index_state *index = &o->result; 308 309if(!o->update || !o->verbose_update) 310return NULL; 311 312for(; cnt < index->cache_nr; cnt++) { 313const struct cache_entry *ce = index->cache[cnt]; 314if(ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE)) 315 total++; 316} 317 318returnstart_delayed_progress(_("Checking out files"), total); 319} 320 321static voidsetup_collided_checkout_detection(struct checkout *state, 322struct index_state *index) 323{ 324int i; 325 326 state->clone =1; 327for(i =0; i < index->cache_nr; i++) 328 index->cache[i]->ce_flags &= ~CE_MATCHED; 329} 330 331static voidreport_collided_checkout(struct index_state *index) 332{ 333struct string_list list = STRING_LIST_INIT_NODUP; 334int i; 335 336for(i =0; i < index->cache_nr; i++) { 337struct cache_entry *ce = index->cache[i]; 338 339if(!(ce->ce_flags & CE_MATCHED)) 340continue; 341 342string_list_append(&list, ce->name); 343 ce->ce_flags &= ~CE_MATCHED; 344} 345 346 list.cmp = fspathcmp; 347string_list_sort(&list); 348 349if(list.nr) { 350warning(_("the following paths have collided (e.g. case-sensitive paths\n" 351"on a case-insensitive filesystem) and only one from the same\n" 352"colliding group is in the working tree:\n")); 353 354for(i =0; i < list.nr; i++) 355fprintf(stderr," '%s'\n", list.items[i].string); 356} 357 358string_list_clear(&list,0); 359} 360 361static intcheck_updates(struct unpack_trees_options *o) 362{ 363unsigned cnt =0; 364int errs =0; 365struct progress *progress; 366struct index_state *index = &o->result; 367struct checkout state = CHECKOUT_INIT; 368int i; 369 370trace_performance_enter(); 371 state.force =1; 372 state.quiet =1; 373 state.refresh_cache =1; 374 state.istate = index; 375 376if(o->clone) 377setup_collided_checkout_detection(&state, index); 378 379 progress =get_progress(o); 380 381if(o->update) 382git_attr_set_direction(GIT_ATTR_CHECKOUT); 383 384if(should_update_submodules() && o->update && !o->dry_run) 385load_gitmodules_file(index, NULL); 386 387for(i =0; i < index->cache_nr; i++) { 388const struct cache_entry *ce = index->cache[i]; 389 390if(ce->ce_flags & CE_WT_REMOVE) { 391display_progress(progress, ++cnt); 392if(o->update && !o->dry_run) 393unlink_entry(ce); 394} 395} 396remove_marked_cache_entries(index,0); 397remove_scheduled_dirs(); 398 399if(should_update_submodules() && o->update && !o->dry_run) 400load_gitmodules_file(index, &state); 401 402enable_delayed_checkout(&state); 403if(repository_format_partial_clone && o->update && !o->dry_run) { 404/* 405 * Prefetch the objects that are to be checked out in the loop 406 * below. 407 */ 408struct oid_array to_fetch = OID_ARRAY_INIT; 409int fetch_if_missing_store = fetch_if_missing; 410 fetch_if_missing =0; 411for(i =0; i < index->cache_nr; i++) { 412struct cache_entry *ce = index->cache[i]; 413if((ce->ce_flags & CE_UPDATE) && 414!S_ISGITLINK(ce->ce_mode)) { 415if(!has_object_file(&ce->oid)) 416oid_array_append(&to_fetch, &ce->oid); 417} 418} 419if(to_fetch.nr) 420fetch_objects(repository_format_partial_clone, 421 to_fetch.oid, to_fetch.nr); 422 fetch_if_missing = fetch_if_missing_store; 423oid_array_clear(&to_fetch); 424} 425for(i =0; i < index->cache_nr; i++) { 426struct cache_entry *ce = index->cache[i]; 427 428if(ce->ce_flags & CE_UPDATE) { 429if(ce->ce_flags & CE_WT_REMOVE) 430BUG("both update and delete flags are set on%s", 431 ce->name); 432display_progress(progress, ++cnt); 433 ce->ce_flags &= ~CE_UPDATE; 434if(o->update && !o->dry_run) { 435 errs |=checkout_entry(ce, &state, NULL, NULL); 436} 437} 438} 439stop_progress(&progress); 440 errs |=finish_delayed_checkout(&state, NULL); 441if(o->update) 442git_attr_set_direction(GIT_ATTR_CHECKIN); 443 444if(o->clone) 445report_collided_checkout(index); 446 447trace_performance_leave("check_updates"); 448return errs !=0; 449} 450 451static intverify_uptodate_sparse(const struct cache_entry *ce, 452struct unpack_trees_options *o); 453static intverify_absent_sparse(const struct cache_entry *ce, 454enum unpack_trees_error_types, 455struct unpack_trees_options *o); 456 457static intapply_sparse_checkout(struct index_state *istate, 458struct cache_entry *ce, 459struct unpack_trees_options *o) 460{ 461int was_skip_worktree =ce_skip_worktree(ce); 462 463if(ce->ce_flags & CE_NEW_SKIP_WORKTREE) 464 ce->ce_flags |= CE_SKIP_WORKTREE; 465else 466 ce->ce_flags &= ~CE_SKIP_WORKTREE; 467if(was_skip_worktree !=ce_skip_worktree(ce)) { 468 ce->ce_flags |= CE_UPDATE_IN_BASE; 469mark_fsmonitor_invalid(istate, ce); 470 istate->cache_changed |= CE_ENTRY_CHANGED; 471} 472 473/* 474 * if (!was_skip_worktree && !ce_skip_worktree()) { 475 * This is perfectly normal. Move on; 476 * } 477 */ 478 479/* 480 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout 481 * area as a result of ce_skip_worktree() shortcuts in 482 * verify_absent() and verify_uptodate(). 483 * Make sure they don't modify worktree if they are already 484 * outside checkout area 485 */ 486if(was_skip_worktree &&ce_skip_worktree(ce)) { 487 ce->ce_flags &= ~CE_UPDATE; 488 489/* 490 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also 491 * on to get that file removed from both index and worktree. 492 * If that file is already outside worktree area, don't 493 * bother remove it. 494 */ 495if(ce->ce_flags & CE_REMOVE) 496 ce->ce_flags &= ~CE_WT_REMOVE; 497} 498 499if(!was_skip_worktree &&ce_skip_worktree(ce)) { 500/* 501 * If CE_UPDATE is set, verify_uptodate() must be called already 502 * also stat info may have lost after merged_entry() so calling 503 * verify_uptodate() again may fail 504 */ 505if(!(ce->ce_flags & CE_UPDATE) &&verify_uptodate_sparse(ce, o)) 506return-1; 507 ce->ce_flags |= CE_WT_REMOVE; 508 ce->ce_flags &= ~CE_UPDATE; 509} 510if(was_skip_worktree && !ce_skip_worktree(ce)) { 511if(verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) 512return-1; 513 ce->ce_flags |= CE_UPDATE; 514} 515return0; 516} 517 518staticinlineintcall_unpack_fn(const struct cache_entry *const*src, 519struct unpack_trees_options *o) 520{ 521int ret = o->fn(src, o); 522if(ret >0) 523 ret =0; 524return ret; 525} 526 527static voidmark_ce_used(struct cache_entry *ce,struct unpack_trees_options *o) 528{ 529 ce->ce_flags |= CE_UNPACKED; 530 531if(o->cache_bottom < o->src_index->cache_nr && 532 o->src_index->cache[o->cache_bottom] == ce) { 533int bottom = o->cache_bottom; 534while(bottom < o->src_index->cache_nr && 535 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) 536 bottom++; 537 o->cache_bottom = bottom; 538} 539} 540 541static voidmark_all_ce_unused(struct index_state *index) 542{ 543int i; 544for(i =0; i < index->cache_nr; i++) 545 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE); 546} 547 548static intlocate_in_src_index(const struct cache_entry *ce, 549struct unpack_trees_options *o) 550{ 551struct index_state *index = o->src_index; 552int len =ce_namelen(ce); 553int pos =index_name_pos(index, ce->name, len); 554if(pos <0) 555 pos = -1- pos; 556return pos; 557} 558 559/* 560 * We call unpack_index_entry() with an unmerged cache entry 561 * only in diff-index, and it wants a single callback. Skip 562 * the other unmerged entry with the same name. 563 */ 564static voidmark_ce_used_same_name(struct cache_entry *ce, 565struct unpack_trees_options *o) 566{ 567struct index_state *index = o->src_index; 568int len =ce_namelen(ce); 569int pos; 570 571for(pos =locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { 572struct cache_entry *next = index->cache[pos]; 573if(len !=ce_namelen(next) || 574memcmp(ce->name, next->name, len)) 575break; 576mark_ce_used(next, o); 577} 578} 579 580static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) 581{ 582const struct index_state *index = o->src_index; 583int pos = o->cache_bottom; 584 585while(pos < index->cache_nr) { 586struct cache_entry *ce = index->cache[pos]; 587if(!(ce->ce_flags & CE_UNPACKED)) 588return ce; 589 pos++; 590} 591return NULL; 592} 593 594static voidadd_same_unmerged(const struct cache_entry *ce, 595struct unpack_trees_options *o) 596{ 597struct index_state *index = o->src_index; 598int len =ce_namelen(ce); 599int pos =index_name_pos(index, ce->name, len); 600 601if(0<= pos) 602die("programming error in a caller of mark_ce_used_same_name"); 603for(pos = -pos -1; pos < index->cache_nr; pos++) { 604struct cache_entry *next = index->cache[pos]; 605if(len !=ce_namelen(next) || 606memcmp(ce->name, next->name, len)) 607break; 608add_entry(o, next,0,0); 609mark_ce_used(next, o); 610} 611} 612 613static intunpack_index_entry(struct cache_entry *ce, 614struct unpack_trees_options *o) 615{ 616const struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, }; 617int ret; 618 619 src[0] = ce; 620 621mark_ce_used(ce, o); 622if(ce_stage(ce)) { 623if(o->skip_unmerged) { 624add_entry(o, ce,0,0); 625return0; 626} 627} 628 ret =call_unpack_fn(src, o); 629if(ce_stage(ce)) 630mark_ce_used_same_name(ce, o); 631return ret; 632} 633 634static intfind_cache_pos(struct traverse_info *,const struct name_entry *); 635 636static voidrestore_cache_bottom(struct traverse_info *info,int bottom) 637{ 638struct unpack_trees_options *o = info->data; 639 640if(o->diff_index_cached) 641return; 642 o->cache_bottom = bottom; 643} 644 645static intswitch_cache_bottom(struct traverse_info *info) 646{ 647struct unpack_trees_options *o = info->data; 648int ret, pos; 649 650if(o->diff_index_cached) 651return0; 652 ret = o->cache_bottom; 653 pos =find_cache_pos(info->prev, &info->name); 654 655if(pos < -1) 656 o->cache_bottom = -2- pos; 657else if(pos <0) 658 o->cache_bottom = o->src_index->cache_nr; 659return ret; 660} 661 662staticinlineintare_same_oid(struct name_entry *name_j,struct name_entry *name_k) 663{ 664return!is_null_oid(&name_j->oid) && !is_null_oid(&name_k->oid) &&oideq(&name_j->oid, &name_k->oid); 665} 666 667static intall_trees_same_as_cache_tree(int n,unsigned long dirmask, 668struct name_entry *names, 669struct traverse_info *info) 670{ 671struct unpack_trees_options *o = info->data; 672int i; 673 674if(!o->merge || dirmask != ((1<< n) -1)) 675return0; 676 677for(i =1; i < n; i++) 678if(!are_same_oid(names, names + i)) 679return0; 680 681returncache_tree_matches_traversal(o->src_index->cache_tree, names, info); 682} 683 684static intindex_pos_by_traverse_info(struct name_entry *names, 685struct traverse_info *info) 686{ 687struct unpack_trees_options *o = info->data; 688int len =traverse_path_len(info, names); 689char*name =xmalloc(len +1/* slash */+1/* NUL */); 690int pos; 691 692make_traverse_path(name, info, names); 693 name[len++] ='/'; 694 name[len] ='\0'; 695 pos =index_name_pos(o->src_index, name, len); 696if(pos >=0) 697BUG("This is a directory and should not exist in index"); 698 pos = -pos -1; 699if(!starts_with(o->src_index->cache[pos]->name, name) || 700(pos >0&&starts_with(o->src_index->cache[pos-1]->name, name))) 701BUG("pos must point at the first entry in this directory"); 702free(name); 703return pos; 704} 705 706/* 707 * Fast path if we detect that all trees are the same as cache-tree at this 708 * path. We'll walk these trees in an iterative loop using cache-tree/index 709 * instead of ODB since we already know what these trees contain. 710 */ 711static inttraverse_by_cache_tree(int pos,int nr_entries,int nr_names, 712struct traverse_info *info) 713{ 714struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, }; 715struct unpack_trees_options *o = info->data; 716struct cache_entry *tree_ce = NULL; 717int ce_len =0; 718int i, d; 719 720if(!o->merge) 721BUG("We need cache-tree to do this optimization"); 722 723/* 724 * Do what unpack_callback() and unpack_nondirectories() normally 725 * do. But we walk all paths in an iterative loop instead. 726 * 727 * D/F conflicts and higher stage entries are not a concern 728 * because cache-tree would be invalidated and we would never 729 * get here in the first place. 730 */ 731for(i =0; i < nr_entries; i++) { 732int new_ce_len, len, rc; 733 734 src[0] = o->src_index->cache[pos + i]; 735 736 len =ce_namelen(src[0]); 737 new_ce_len =cache_entry_size(len); 738 739if(new_ce_len > ce_len) { 740 new_ce_len <<=1; 741 tree_ce =xrealloc(tree_ce, new_ce_len); 742memset(tree_ce,0, new_ce_len); 743 ce_len = new_ce_len; 744 745 tree_ce->ce_flags =create_ce_flags(0); 746 747for(d =1; d <= nr_names; d++) 748 src[d] = tree_ce; 749} 750 751 tree_ce->ce_mode = src[0]->ce_mode; 752 tree_ce->ce_namelen = len; 753oidcpy(&tree_ce->oid, &src[0]->oid); 754memcpy(tree_ce->name, src[0]->name, len +1); 755 756 rc =call_unpack_fn((const struct cache_entry *const*)src, o); 757if(rc <0) { 758free(tree_ce); 759return rc; 760} 761 762mark_ce_used(src[0], o); 763} 764free(tree_ce); 765if(o->debug_unpack) 766printf("Unpacked%dentries from%sto%susing cache-tree\n", 767 nr_entries, 768 o->src_index->cache[pos]->name, 769 o->src_index->cache[pos + nr_entries -1]->name); 770return0; 771} 772 773static inttraverse_trees_recursive(int n,unsigned long dirmask, 774unsigned long df_conflicts, 775struct name_entry *names, 776struct traverse_info *info) 777{ 778struct unpack_trees_options *o = info->data; 779int i, ret, bottom; 780int nr_buf =0; 781struct tree_desc t[MAX_UNPACK_TREES]; 782void*buf[MAX_UNPACK_TREES]; 783struct traverse_info newinfo; 784struct name_entry *p; 785int nr_entries; 786 787 nr_entries =all_trees_same_as_cache_tree(n, dirmask, names, info); 788if(nr_entries >0) { 789int pos =index_pos_by_traverse_info(names, info); 790 791if(!o->merge || df_conflicts) 792BUG("Wrong condition to get here buddy"); 793 794/* 795 * All entries up to 'pos' must have been processed 796 * (i.e. marked CE_UNPACKED) at this point. But to be safe, 797 * save and restore cache_bottom anyway to not miss 798 * unprocessed entries before 'pos'. 799 */ 800 bottom = o->cache_bottom; 801 ret =traverse_by_cache_tree(pos, nr_entries, n, info); 802 o->cache_bottom = bottom; 803return ret; 804} 805 806 p = names; 807while(!p->mode) 808 p++; 809 810 newinfo = *info; 811 newinfo.prev = info; 812 newinfo.pathspec = info->pathspec; 813 newinfo.name = *p; 814 newinfo.pathlen +=tree_entry_len(p) +1; 815 newinfo.df_conflicts |= df_conflicts; 816 817/* 818 * Fetch the tree from the ODB for each peer directory in the 819 * n commits. 820 * 821 * For 2- and 3-way traversals, we try to avoid hitting the 822 * ODB twice for the same OID. This should yield a nice speed 823 * up in checkouts and merges when the commits are similar. 824 * 825 * We don't bother doing the full O(n^2) search for larger n, 826 * because wider traversals don't happen that often and we 827 * avoid the search setup. 828 * 829 * When 2 peer OIDs are the same, we just copy the tree 830 * descriptor data. This implicitly borrows the buffer 831 * data from the earlier cell. 832 */ 833for(i =0; i < n; i++, dirmask >>=1) { 834if(i >0&&are_same_oid(&names[i], &names[i -1])) 835 t[i] = t[i -1]; 836else if(i >1&&are_same_oid(&names[i], &names[i -2])) 837 t[i] = t[i -2]; 838else{ 839const struct object_id *oid = NULL; 840if(dirmask &1) 841 oid = &names[i].oid; 842 buf[nr_buf++] =fill_tree_descriptor(t + i, oid); 843} 844} 845 846 bottom =switch_cache_bottom(&newinfo); 847 ret =traverse_trees(o->src_index, n, t, &newinfo); 848restore_cache_bottom(&newinfo, bottom); 849 850for(i =0; i < nr_buf; i++) 851free(buf[i]); 852 853return ret; 854} 855 856/* 857 * Compare the traverse-path to the cache entry without actually 858 * having to generate the textual representation of the traverse 859 * path. 860 * 861 * NOTE! This *only* compares up to the size of the traverse path 862 * itself - the caller needs to do the final check for the cache 863 * entry having more data at the end! 864 */ 865static intdo_compare_entry_piecewise(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 866{ 867int len, pathlen, ce_len; 868const char*ce_name; 869 870if(info->prev) { 871int cmp =do_compare_entry_piecewise(ce, info->prev, 872&info->name); 873if(cmp) 874return cmp; 875} 876 pathlen = info->pathlen; 877 ce_len =ce_namelen(ce); 878 879/* If ce_len < pathlen then we must have previously hit "name == directory" entry */ 880if(ce_len < pathlen) 881return-1; 882 883 ce_len -= pathlen; 884 ce_name = ce->name + pathlen; 885 886 len =tree_entry_len(n); 887returndf_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 888} 889 890static intdo_compare_entry(const struct cache_entry *ce, 891const struct traverse_info *info, 892const struct name_entry *n) 893{ 894int len, pathlen, ce_len; 895const char*ce_name; 896int cmp; 897 898/* 899 * If we have not precomputed the traverse path, it is quicker 900 * to avoid doing so. But if we have precomputed it, 901 * it is quicker to use the precomputed version. 902 */ 903if(!info->traverse_path) 904returndo_compare_entry_piecewise(ce, info, n); 905 906 cmp =strncmp(ce->name, info->traverse_path, info->pathlen); 907if(cmp) 908return cmp; 909 910 pathlen = info->pathlen; 911 ce_len =ce_namelen(ce); 912 913if(ce_len < pathlen) 914return-1; 915 916 ce_len -= pathlen; 917 ce_name = ce->name + pathlen; 918 919 len =tree_entry_len(n); 920returndf_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 921} 922 923static intcompare_entry(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 924{ 925int cmp =do_compare_entry(ce, info, n); 926if(cmp) 927return cmp; 928 929/* 930 * Even if the beginning compared identically, the ce should 931 * compare as bigger than a directory leading up to it! 932 */ 933returnce_namelen(ce) >traverse_path_len(info, n); 934} 935 936static intce_in_traverse_path(const struct cache_entry *ce, 937const struct traverse_info *info) 938{ 939if(!info->prev) 940return1; 941if(do_compare_entry(ce, info->prev, &info->name)) 942return0; 943/* 944 * If ce (blob) is the same name as the path (which is a tree 945 * we will be descending into), it won't be inside it. 946 */ 947return(info->pathlen <ce_namelen(ce)); 948} 949 950static struct cache_entry *create_ce_entry(const struct traverse_info *info, 951const struct name_entry *n, 952int stage, 953struct index_state *istate, 954int is_transient) 955{ 956int len =traverse_path_len(info, n); 957struct cache_entry *ce = 958 is_transient ? 959make_empty_transient_cache_entry(len) : 960make_empty_cache_entry(istate, len); 961 962 ce->ce_mode =create_ce_mode(n->mode); 963 ce->ce_flags =create_ce_flags(stage); 964 ce->ce_namelen = len; 965oidcpy(&ce->oid, &n->oid); 966make_traverse_path(ce->name, info, n); 967 968return ce; 969} 970 971/* 972 * Note that traverse_by_cache_tree() duplicates some logic in this function 973 * without actually calling it. If you change the logic here you may need to 974 * check and change there as well. 975 */ 976static intunpack_nondirectories(int n,unsigned long mask, 977unsigned long dirmask, 978struct cache_entry **src, 979const struct name_entry *names, 980const struct traverse_info *info) 981{ 982int i; 983struct unpack_trees_options *o = info->data; 984unsigned long conflicts = info->df_conflicts | dirmask; 985 986/* Do we have *only* directories? Nothing to do */ 987if(mask == dirmask && !src[0]) 988return0; 989 990/* 991 * Ok, we've filled in up to any potential index entry in src[0], 992 * now do the rest. 993 */ 994for(i =0; i < n; i++) { 995int stage; 996unsigned int bit =1ul<< i; 997if(conflicts & bit) { 998 src[i + o->merge] = o->df_conflict_entry; 999continue;1000}1001if(!(mask & bit))1002continue;1003if(!o->merge)1004 stage =0;1005else if(i +1< o->head_idx)1006 stage =1;1007else if(i +1> o->head_idx)1008 stage =3;1009else1010 stage =2;10111012/*1013 * If the merge bit is set, then the cache entries are1014 * discarded in the following block. In this case,1015 * construct "transient" cache_entries, as they are1016 * not stored in the index. otherwise construct the1017 * cache entry from the index aware logic.1018 */1019 src[i + o->merge] =create_ce_entry(info, names + i, stage, &o->result, o->merge);1020}10211022if(o->merge) {1023int rc =call_unpack_fn((const struct cache_entry *const*)src,1024 o);1025for(i =0; i < n; i++) {1026struct cache_entry *ce = src[i + o->merge];1027if(ce != o->df_conflict_entry)1028discard_cache_entry(ce);1029}1030return rc;1031}10321033for(i =0; i < n; i++)1034if(src[i] && src[i] != o->df_conflict_entry)1035if(do_add_entry(o, src[i],0,0))1036return-1;10371038return0;1039}10401041static intunpack_failed(struct unpack_trees_options *o,const char*message)1042{1043discard_index(&o->result);1044if(!o->quiet && !o->exiting_early) {1045if(message)1046returnerror("%s", message);1047return-1;1048}1049return-1;1050}10511052/*1053 * The tree traversal is looking at name p. If we have a matching entry,1054 * return it. If name p is a directory in the index, do not return1055 * anything, as we will want to match it when the traversal descends into1056 * the directory.1057 */1058static intfind_cache_pos(struct traverse_info *info,1059const struct name_entry *p)1060{1061int pos;1062struct unpack_trees_options *o = info->data;1063struct index_state *index = o->src_index;1064int pfxlen = info->pathlen;1065int p_len =tree_entry_len(p);10661067for(pos = o->cache_bottom; pos < index->cache_nr; pos++) {1068const struct cache_entry *ce = index->cache[pos];1069const char*ce_name, *ce_slash;1070int cmp, ce_len;10711072if(ce->ce_flags & CE_UNPACKED) {1073/*1074 * cache_bottom entry is already unpacked, so1075 * we can never match it; don't check it1076 * again.1077 */1078if(pos == o->cache_bottom)1079++o->cache_bottom;1080continue;1081}1082if(!ce_in_traverse_path(ce, info)) {1083/*1084 * Check if we can skip future cache checks1085 * (because we're already past all possible1086 * entries in the traverse path).1087 */1088if(info->traverse_path) {1089if(strncmp(ce->name, info->traverse_path,1090 info->pathlen) >0)1091break;1092}1093continue;1094}1095 ce_name = ce->name + pfxlen;1096 ce_slash =strchr(ce_name,'/');1097if(ce_slash)1098 ce_len = ce_slash - ce_name;1099else1100 ce_len =ce_namelen(ce) - pfxlen;1101 cmp =name_compare(p->path, p_len, ce_name, ce_len);1102/*1103 * Exact match; if we have a directory we need to1104 * delay returning it.1105 */1106if(!cmp)1107return ce_slash ? -2- pos : pos;1108if(0< cmp)1109continue;/* keep looking */1110/*1111 * ce_name sorts after p->path; could it be that we1112 * have files under p->path directory in the index?1113 * E.g. ce_name == "t-i", and p->path == "t"; we may1114 * have "t/a" in the index.1115 */1116if(p_len < ce_len && !memcmp(ce_name, p->path, p_len) &&1117 ce_name[p_len] <'/')1118continue;/* keep looking */1119break;1120}1121return-1;1122}11231124static struct cache_entry *find_cache_entry(struct traverse_info *info,1125const struct name_entry *p)1126{1127int pos =find_cache_pos(info, p);1128struct unpack_trees_options *o = info->data;11291130if(0<= pos)1131return o->src_index->cache[pos];1132else1133return NULL;1134}11351136static voiddebug_path(struct traverse_info *info)1137{1138if(info->prev) {1139debug_path(info->prev);1140if(*info->prev->name.path)1141putchar('/');1142}1143printf("%s", info->name.path);1144}11451146static voiddebug_name_entry(int i,struct name_entry *n)1147{1148printf("ent#%d %06o%s\n", i,1149 n->path ? n->mode :0,1150 n->path ? n->path :"(missing)");1151}11521153static voiddebug_unpack_callback(int n,1154unsigned long mask,1155unsigned long dirmask,1156struct name_entry *names,1157struct traverse_info *info)1158{1159int i;1160printf("* unpack mask%lu, dirmask%lu, cnt%d",1161 mask, dirmask, n);1162debug_path(info);1163putchar('\n');1164for(i =0; i < n; i++)1165debug_name_entry(i, names + i);1166}11671168/*1169 * Note that traverse_by_cache_tree() duplicates some logic in this function1170 * without actually calling it. If you change the logic here you may need to1171 * check and change there as well.1172 */1173static intunpack_callback(int n,unsigned long mask,unsigned long dirmask,struct name_entry *names,struct traverse_info *info)1174{1175struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, };1176struct unpack_trees_options *o = info->data;1177const struct name_entry *p = names;11781179/* Find first entry with a real name (we could use "mask" too) */1180while(!p->mode)1181 p++;11821183if(o->debug_unpack)1184debug_unpack_callback(n, mask, dirmask, names, info);11851186/* Are we supposed to look at the index too? */1187if(o->merge) {1188while(1) {1189int cmp;1190struct cache_entry *ce;11911192if(o->diff_index_cached)1193 ce =next_cache_entry(o);1194else1195 ce =find_cache_entry(info, p);11961197if(!ce)1198break;1199 cmp =compare_entry(ce, info, p);1200if(cmp <0) {1201if(unpack_index_entry(ce, o) <0)1202returnunpack_failed(o, NULL);1203continue;1204}1205if(!cmp) {1206if(ce_stage(ce)) {1207/*1208 * If we skip unmerged index1209 * entries, we'll skip this1210 * entry *and* the tree1211 * entries associated with it!1212 */1213if(o->skip_unmerged) {1214add_same_unmerged(ce, o);1215return mask;1216}1217}1218 src[0] = ce;1219}1220break;1221}1222}12231224if(unpack_nondirectories(n, mask, dirmask, src, names, info) <0)1225return-1;12261227if(o->merge && src[0]) {1228if(ce_stage(src[0]))1229mark_ce_used_same_name(src[0], o);1230else1231mark_ce_used(src[0], o);1232}12331234/* Now handle any directories.. */1235if(dirmask) {1236/* special case: "diff-index --cached" looking at a tree */1237if(o->diff_index_cached &&1238 n ==1&& dirmask ==1&&S_ISDIR(names->mode)) {1239int matches;1240 matches =cache_tree_matches_traversal(o->src_index->cache_tree,1241 names, info);1242/*1243 * Everything under the name matches; skip the1244 * entire hierarchy. diff_index_cached codepath1245 * special cases D/F conflicts in such a way that1246 * it does not do any look-ahead, so this is safe.1247 */1248if(matches) {1249 o->cache_bottom += matches;1250return mask;1251}1252}12531254if(traverse_trees_recursive(n, dirmask, mask & ~dirmask,1255 names, info) <0)1256return-1;1257return mask;1258}12591260return mask;1261}12621263static intclear_ce_flags_1(struct index_state *istate,1264struct cache_entry **cache,int nr,1265struct strbuf *prefix,1266int select_mask,int clear_mask,1267struct exclude_list *el,int defval);12681269/* Whole directory matching */1270static intclear_ce_flags_dir(struct index_state *istate,1271struct cache_entry **cache,int nr,1272struct strbuf *prefix,1273char*basename,1274int select_mask,int clear_mask,1275struct exclude_list *el,int defval)1276{1277struct cache_entry **cache_end;1278int dtype = DT_DIR;1279int ret =is_excluded_from_list(prefix->buf, prefix->len,1280 basename, &dtype, el, istate);1281int rc;12821283strbuf_addch(prefix,'/');12841285/* If undecided, use matching result of parent dir in defval */1286if(ret <0)1287 ret = defval;12881289for(cache_end = cache; cache_end != cache + nr; cache_end++) {1290struct cache_entry *ce = *cache_end;1291if(strncmp(ce->name, prefix->buf, prefix->len))1292break;1293}12941295/*1296 * TODO: check el, if there are no patterns that may conflict1297 * with ret (iow, we know in advance the incl/excl1298 * decision for the entire directory), clear flag here without1299 * calling clear_ce_flags_1(). That function will call1300 * the expensive is_excluded_from_list() on every entry.1301 */1302 rc =clear_ce_flags_1(istate, cache, cache_end - cache,1303 prefix,1304 select_mask, clear_mask,1305 el, ret);1306strbuf_setlen(prefix, prefix->len -1);1307return rc;1308}13091310/*1311 * Traverse the index, find every entry that matches according to1312 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the1313 * number of traversed entries.1314 *1315 * If select_mask is non-zero, only entries whose ce_flags has on of1316 * those bits enabled are traversed.1317 *1318 * cache : pointer to an index entry1319 * prefix_len : an offset to its path1320 *1321 * The current path ("prefix") including the trailing '/' is1322 * cache[0]->name[0..(prefix_len-1)]1323 * Top level path has prefix_len zero.1324 */1325static intclear_ce_flags_1(struct index_state *istate,1326struct cache_entry **cache,int nr,1327struct strbuf *prefix,1328int select_mask,int clear_mask,1329struct exclude_list *el,int defval)1330{1331struct cache_entry **cache_end = cache + nr;13321333/*1334 * Process all entries that have the given prefix and meet1335 * select_mask condition1336 */1337while(cache != cache_end) {1338struct cache_entry *ce = *cache;1339const char*name, *slash;1340int len, dtype, ret;13411342if(select_mask && !(ce->ce_flags & select_mask)) {1343 cache++;1344continue;1345}13461347if(prefix->len &&strncmp(ce->name, prefix->buf, prefix->len))1348break;13491350 name = ce->name + prefix->len;1351 slash =strchr(name,'/');13521353/* If it's a directory, try whole directory match first */1354if(slash) {1355int processed;13561357 len = slash - name;1358strbuf_add(prefix, name, len);13591360 processed =clear_ce_flags_dir(istate, cache, cache_end - cache,1361 prefix,1362 prefix->buf + prefix->len - len,1363 select_mask, clear_mask,1364 el, defval);13651366/* clear_c_f_dir eats a whole dir already? */1367if(processed) {1368 cache += processed;1369strbuf_setlen(prefix, prefix->len - len);1370continue;1371}13721373strbuf_addch(prefix,'/');1374 cache +=clear_ce_flags_1(istate, cache, cache_end - cache,1375 prefix,1376 select_mask, clear_mask, el, defval);1377strbuf_setlen(prefix, prefix->len - len -1);1378continue;1379}13801381/* Non-directory */1382 dtype =ce_to_dtype(ce);1383 ret =is_excluded_from_list(ce->name,ce_namelen(ce),1384 name, &dtype, el, istate);1385if(ret <0)1386 ret = defval;1387if(ret >0)1388 ce->ce_flags &= ~clear_mask;1389 cache++;1390}1391return nr - (cache_end - cache);1392}13931394static intclear_ce_flags(struct index_state *istate,1395int select_mask,int clear_mask,1396struct exclude_list *el)1397{1398static struct strbuf prefix = STRBUF_INIT;13991400strbuf_reset(&prefix);14011402returnclear_ce_flags_1(istate,1403 istate->cache,1404 istate->cache_nr,1405&prefix,1406 select_mask, clear_mask,1407 el,0);1408}14091410/*1411 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout1412 */1413static voidmark_new_skip_worktree(struct exclude_list *el,1414struct index_state *istate,1415int select_flag,int skip_wt_flag)1416{1417int i;14181419/*1420 * 1. Pretend the narrowest worktree: only unmerged entries1421 * are checked out1422 */1423for(i =0; i < istate->cache_nr; i++) {1424struct cache_entry *ce = istate->cache[i];14251426if(select_flag && !(ce->ce_flags & select_flag))1427continue;14281429if(!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED))1430 ce->ce_flags |= skip_wt_flag;1431else1432 ce->ce_flags &= ~skip_wt_flag;1433}14341435/*1436 * 2. Widen worktree according to sparse-checkout file.1437 * Matched entries will have skip_wt_flag cleared (i.e. "in")1438 */1439clear_ce_flags(istate, select_flag, skip_wt_flag, el);1440}14411442static intverify_absent(const struct cache_entry *,1443enum unpack_trees_error_types,1444struct unpack_trees_options *);1445/*1446 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the1447 * resulting index, -2 on failure to reflect the changes to the work tree.1448 *1449 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally1450 */1451intunpack_trees(unsigned len,struct tree_desc *t,struct unpack_trees_options *o)1452{1453int i, ret;1454static struct cache_entry *dfc;1455struct exclude_list el;14561457if(len > MAX_UNPACK_TREES)1458die("unpack_trees takes at most%dtrees", MAX_UNPACK_TREES);14591460trace_performance_enter();1461memset(&el,0,sizeof(el));1462if(!core_apply_sparse_checkout || !o->update)1463 o->skip_sparse_checkout =1;1464if(!o->skip_sparse_checkout) {1465char*sparse =git_pathdup("info/sparse-checkout");1466if(add_excludes_from_file_to_list(sparse,"",0, &el, NULL) <0)1467 o->skip_sparse_checkout =1;1468else1469 o->el = ⪙1470free(sparse);1471}14721473memset(&o->result,0,sizeof(o->result));1474 o->result.initialized =1;1475 o->result.timestamp.sec = o->src_index->timestamp.sec;1476 o->result.timestamp.nsec = o->src_index->timestamp.nsec;1477 o->result.version = o->src_index->version;1478if(!o->src_index->split_index) {1479 o->result.split_index = NULL;1480}else if(o->src_index == o->dst_index) {1481/*1482 * o->dst_index (and thus o->src_index) will be discarded1483 * and overwritten with o->result at the end of this function,1484 * so just use src_index's split_index to avoid having to1485 * create a new one.1486 */1487 o->result.split_index = o->src_index->split_index;1488 o->result.split_index->refcount++;1489}else{1490 o->result.split_index =init_split_index(&o->result);1491}1492oidcpy(&o->result.oid, &o->src_index->oid);1493 o->merge_size = len;1494mark_all_ce_unused(o->src_index);14951496/*1497 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries1498 */1499if(!o->skip_sparse_checkout)1500mark_new_skip_worktree(o->el, o->src_index,0, CE_NEW_SKIP_WORKTREE);15011502if(!dfc)1503 dfc =xcalloc(1,cache_entry_size(0));1504 o->df_conflict_entry = dfc;15051506if(len) {1507const char*prefix = o->prefix ? o->prefix :"";1508struct traverse_info info;15091510setup_traverse_info(&info, prefix);1511 info.fn = unpack_callback;1512 info.data = o;1513 info.show_all_errors = o->show_all_errors;1514 info.pathspec = o->pathspec;15151516if(o->prefix) {1517/*1518 * Unpack existing index entries that sort before the1519 * prefix the tree is spliced into. Note that o->merge1520 * is always true in this case.1521 */1522while(1) {1523struct cache_entry *ce =next_cache_entry(o);1524if(!ce)1525break;1526if(ce_in_traverse_path(ce, &info))1527break;1528if(unpack_index_entry(ce, o) <0)1529goto return_failed;1530}1531}15321533trace_performance_enter();1534 ret =traverse_trees(o->src_index, len, t, &info);1535trace_performance_leave("traverse_trees");1536if(ret <0)1537goto return_failed;1538}15391540/* Any left-over entries in the index? */1541if(o->merge) {1542while(1) {1543struct cache_entry *ce =next_cache_entry(o);1544if(!ce)1545break;1546if(unpack_index_entry(ce, o) <0)1547goto return_failed;1548}1549}1550mark_all_ce_unused(o->src_index);15511552if(o->trivial_merges_only && o->nontrivial_merge) {1553 ret =unpack_failed(o,"Merge requires file-level merging");1554goto done;1555}15561557if(!o->skip_sparse_checkout) {1558int empty_worktree =1;15591560/*1561 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #11562 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE1563 * so apply_sparse_checkout() won't attempt to remove it from worktree1564 */1565mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);15661567 ret =0;1568for(i =0; i < o->result.cache_nr; i++) {1569struct cache_entry *ce = o->result.cache[i];15701571/*1572 * Entries marked with CE_ADDED in merged_entry() do not have1573 * verify_absent() check (the check is effectively disabled1574 * because CE_NEW_SKIP_WORKTREE is set unconditionally).1575 *1576 * Do the real check now because we have had1577 * correct CE_NEW_SKIP_WORKTREE1578 */1579if(ce->ce_flags & CE_ADDED &&1580verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1581if(!o->show_all_errors)1582goto return_failed;1583 ret = -1;1584}15851586if(apply_sparse_checkout(&o->result, ce, o)) {1587if(!o->show_all_errors)1588goto return_failed;1589 ret = -1;1590}1591if(!ce_skip_worktree(ce))1592 empty_worktree =0;15931594}1595if(ret <0)1596goto return_failed;1597/*1598 * Sparse checkout is meant to narrow down checkout area1599 * but it does not make sense to narrow down to empty working1600 * tree. This is usually a mistake in sparse checkout rules.1601 * Do not allow users to do that.1602 */1603if(o->result.cache_nr && empty_worktree) {1604 ret =unpack_failed(o,"Sparse checkout leaves no entry on working directory");1605goto done;1606}1607}16081609 ret =check_updates(o) ? (-2) :0;1610if(o->dst_index) {1611move_index_extensions(&o->result, o->src_index);1612if(!ret) {1613if(git_env_bool("GIT_TEST_CHECK_CACHE_TREE",0))1614cache_tree_verify(the_repository, &o->result);1615if(!o->result.cache_tree)1616 o->result.cache_tree =cache_tree();1617if(!cache_tree_fully_valid(o->result.cache_tree))1618cache_tree_update(&o->result,1619 WRITE_TREE_SILENT |1620 WRITE_TREE_REPAIR);1621}16221623 o->result.updated_workdir =1;1624discard_index(o->dst_index);1625*o->dst_index = o->result;1626}else{1627discard_index(&o->result);1628}1629 o->src_index = NULL;16301631done:1632trace_performance_leave("unpack_trees");1633clear_exclude_list(&el);1634return ret;16351636return_failed:1637if(o->show_all_errors)1638display_error_msgs(o);1639mark_all_ce_unused(o->src_index);1640 ret =unpack_failed(o, NULL);1641if(o->exiting_early)1642 ret =0;1643goto done;1644}16451646/* Here come the merge functions */16471648static intreject_merge(const struct cache_entry *ce,1649struct unpack_trees_options *o)1650{1651returnadd_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);1652}16531654static intsame(const struct cache_entry *a,const struct cache_entry *b)1655{1656if(!!a != !!b)1657return0;1658if(!a && !b)1659return1;1660if((a->ce_flags | b->ce_flags) & CE_CONFLICTED)1661return0;1662return a->ce_mode == b->ce_mode &&1663oideq(&a->oid, &b->oid);1664}166516661667/*1668 * When a CE gets turned into an unmerged entry, we1669 * want it to be up-to-date1670 */1671static intverify_uptodate_1(const struct cache_entry *ce,1672struct unpack_trees_options *o,1673enum unpack_trees_error_types error_type)1674{1675struct stat st;16761677if(o->index_only)1678return0;16791680/*1681 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again1682 * if this entry is truly up-to-date because this file may be1683 * overwritten.1684 */1685if((ce->ce_flags & CE_VALID) ||ce_skip_worktree(ce))1686;/* keep checking */1687else if(o->reset ||ce_uptodate(ce))1688return0;16891690if(!lstat(ce->name, &st)) {1691int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;1692unsigned changed =ie_match_stat(o->src_index, ce, &st, flags);16931694if(submodule_from_ce(ce)) {1695int r =check_submodule_move_head(ce,1696"HEAD",oid_to_hex(&ce->oid), o);1697if(r)1698returnadd_rejected_path(o, error_type, ce->name);1699return0;1700}17011702if(!changed)1703return0;1704/*1705 * Historic default policy was to allow submodule to be out1706 * of sync wrt the superproject index. If the submodule was1707 * not considered interesting above, we don't care here.1708 */1709if(S_ISGITLINK(ce->ce_mode))1710return0;17111712 errno =0;1713}1714if(errno == ENOENT)1715return0;1716returnadd_rejected_path(o, error_type, ce->name);1717}17181719intverify_uptodate(const struct cache_entry *ce,1720struct unpack_trees_options *o)1721{1722if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1723return0;1724returnverify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);1725}17261727static intverify_uptodate_sparse(const struct cache_entry *ce,1728struct unpack_trees_options *o)1729{1730returnverify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);1731}17321733/*1734 * TODO: We should actually invalidate o->result, not src_index [1].1735 * But since cache tree and untracked cache both are not copied to1736 * o->result until unpacking is complete, we invalidate them on1737 * src_index instead with the assumption that they will be copied to1738 * dst_index at the end.1739 *1740 * [1] src_index->cache_tree is also used in unpack_callback() so if1741 * we invalidate o->result, we need to update it to use1742 * o->result.cache_tree as well.1743 */1744static voidinvalidate_ce_path(const struct cache_entry *ce,1745struct unpack_trees_options *o)1746{1747if(!ce)1748return;1749cache_tree_invalidate_path(o->src_index, ce->name);1750untracked_cache_invalidate_path(o->src_index, ce->name,1);1751}17521753/*1754 * Check that checking out ce->sha1 in subdir ce->name is not1755 * going to overwrite any working files.1756 *1757 * Currently, git does not checkout subprojects during a superproject1758 * checkout, so it is not going to overwrite anything.1759 */1760static intverify_clean_submodule(const char*old_sha1,1761const struct cache_entry *ce,1762struct unpack_trees_options *o)1763{1764if(!submodule_from_ce(ce))1765return0;17661767returncheck_submodule_move_head(ce, old_sha1,1768oid_to_hex(&ce->oid), o);1769}17701771static intverify_clean_subdirectory(const struct cache_entry *ce,1772struct unpack_trees_options *o)1773{1774/*1775 * we are about to extract "ce->name"; we would not want to lose1776 * anything in the existing directory there.1777 */1778int namelen;1779int i;1780struct dir_struct d;1781char*pathbuf;1782int cnt =0;17831784if(S_ISGITLINK(ce->ce_mode)) {1785struct object_id oid;1786int sub_head =resolve_gitlink_ref(ce->name,"HEAD", &oid);1787/*1788 * If we are not going to update the submodule, then1789 * we don't care.1790 */1791if(!sub_head &&oideq(&oid, &ce->oid))1792return0;1793returnverify_clean_submodule(sub_head ? NULL :oid_to_hex(&oid),1794 ce, o);1795}17961797/*1798 * First let's make sure we do not have a local modification1799 * in that directory.1800 */1801 namelen =ce_namelen(ce);1802for(i =locate_in_src_index(ce, o);1803 i < o->src_index->cache_nr;1804 i++) {1805struct cache_entry *ce2 = o->src_index->cache[i];1806int len =ce_namelen(ce2);1807if(len < namelen ||1808strncmp(ce->name, ce2->name, namelen) ||1809 ce2->name[namelen] !='/')1810break;1811/*1812 * ce2->name is an entry in the subdirectory to be1813 * removed.1814 */1815if(!ce_stage(ce2)) {1816if(verify_uptodate(ce2, o))1817return-1;1818add_entry(o, ce2, CE_REMOVE,0);1819invalidate_ce_path(ce, o);1820mark_ce_used(ce2, o);1821}1822 cnt++;1823}18241825/*1826 * Then we need to make sure that we do not lose a locally1827 * present file that is not ignored.1828 */1829 pathbuf =xstrfmt("%.*s/", namelen, ce->name);18301831memset(&d,0,sizeof(d));1832if(o->dir)1833 d.exclude_per_dir = o->dir->exclude_per_dir;1834 i =read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);1835if(i)1836returnadd_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);1837free(pathbuf);1838return cnt;1839}18401841/*1842 * This gets called when there was no index entry for the tree entry 'dst',1843 * but we found a file in the working tree that 'lstat()' said was fine,1844 * and we're on a case-insensitive filesystem.1845 *1846 * See if we can find a case-insensitive match in the index that also1847 * matches the stat information, and assume it's that other file!1848 */1849static inticase_exists(struct unpack_trees_options *o,const char*name,int len,struct stat *st)1850{1851const struct cache_entry *src;18521853 src =index_file_exists(o->src_index, name, len,1);1854return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);1855}18561857static intcheck_ok_to_remove(const char*name,int len,int dtype,1858const struct cache_entry *ce,struct stat *st,1859enum unpack_trees_error_types error_type,1860struct unpack_trees_options *o)1861{1862const struct cache_entry *result;18631864/*1865 * It may be that the 'lstat()' succeeded even though1866 * target 'ce' was absent, because there is an old1867 * entry that is different only in case..1868 *1869 * Ignore that lstat() if it matches.1870 */1871if(ignore_case &&icase_exists(o, name, len, st))1872return0;18731874if(o->dir &&1875is_excluded(o->dir, o->src_index, name, &dtype))1876/*1877 * ce->name is explicitly excluded, so it is Ok to1878 * overwrite it.1879 */1880return0;1881if(S_ISDIR(st->st_mode)) {1882/*1883 * We are checking out path "foo" and1884 * found "foo/." in the working tree.1885 * This is tricky -- if we have modified1886 * files that are in "foo/" we would lose1887 * them.1888 */1889if(verify_clean_subdirectory(ce, o) <0)1890return-1;1891return0;1892}18931894/*1895 * The previous round may already have decided to1896 * delete this path, which is in a subdirectory that1897 * is being replaced with a blob.1898 */1899 result =index_file_exists(&o->result, name, len,0);1900if(result) {1901if(result->ce_flags & CE_REMOVE)1902return0;1903}19041905returnadd_rejected_path(o, error_type, name);1906}19071908/*1909 * We do not want to remove or overwrite a working tree file that1910 * is not tracked, unless it is ignored.1911 */1912static intverify_absent_1(const struct cache_entry *ce,1913enum unpack_trees_error_types error_type,1914struct unpack_trees_options *o)1915{1916int len;1917struct stat st;19181919if(o->index_only || o->reset || !o->update)1920return0;19211922 len =check_leading_path(ce->name,ce_namelen(ce));1923if(!len)1924return0;1925else if(len >0) {1926char*path;1927int ret;19281929 path =xmemdupz(ce->name, len);1930if(lstat(path, &st))1931 ret =error_errno("cannot stat '%s'", path);1932else{1933if(submodule_from_ce(ce))1934 ret =check_submodule_move_head(ce,1935oid_to_hex(&ce->oid),1936 NULL, o);1937else1938 ret =check_ok_to_remove(path, len, DT_UNKNOWN, NULL,1939&st, error_type, o);1940}1941free(path);1942return ret;1943}else if(lstat(ce->name, &st)) {1944if(errno != ENOENT)1945returnerror_errno("cannot stat '%s'", ce->name);1946return0;1947}else{1948if(submodule_from_ce(ce))1949returncheck_submodule_move_head(ce,oid_to_hex(&ce->oid),1950 NULL, o);19511952returncheck_ok_to_remove(ce->name,ce_namelen(ce),1953ce_to_dtype(ce), ce, &st,1954 error_type, o);1955}1956}19571958static intverify_absent(const struct cache_entry *ce,1959enum unpack_trees_error_types error_type,1960struct unpack_trees_options *o)1961{1962if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1963return0;1964returnverify_absent_1(ce, error_type, o);1965}19661967static intverify_absent_sparse(const struct cache_entry *ce,1968enum unpack_trees_error_types error_type,1969struct unpack_trees_options *o)1970{1971enum unpack_trees_error_types orphaned_error = error_type;1972if(orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)1973 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;19741975returnverify_absent_1(ce, orphaned_error, o);1976}19771978static intmerged_entry(const struct cache_entry *ce,1979const struct cache_entry *old,1980struct unpack_trees_options *o)1981{1982int update = CE_UPDATE;1983struct cache_entry *merge =dup_cache_entry(ce, &o->result);19841985if(!old) {1986/*1987 * New index entries. In sparse checkout, the following1988 * verify_absent() will be delayed until after1989 * traverse_trees() finishes in unpack_trees(), then:1990 *1991 * - CE_NEW_SKIP_WORKTREE will be computed correctly1992 * - verify_absent() be called again, this time with1993 * correct CE_NEW_SKIP_WORKTREE1994 *1995 * verify_absent() call here does nothing in sparse1996 * checkout (i.e. o->skip_sparse_checkout == 0)1997 */1998 update |= CE_ADDED;1999 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;20002001if(verify_absent(merge,2002 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {2003discard_cache_entry(merge);2004return-1;2005}2006invalidate_ce_path(merge, o);20072008if(submodule_from_ce(ce)) {2009int ret =check_submodule_move_head(ce, NULL,2010oid_to_hex(&ce->oid),2011 o);2012if(ret)2013return ret;2014}20152016}else if(!(old->ce_flags & CE_CONFLICTED)) {2017/*2018 * See if we can re-use the old CE directly?2019 * That way we get the uptodate stat info.2020 *2021 * This also removes the UPDATE flag on a match; otherwise2022 * we will end up overwriting local changes in the work tree.2023 */2024if(same(old, merge)) {2025copy_cache_entry(merge, old);2026 update =0;2027}else{2028if(verify_uptodate(old, o)) {2029discard_cache_entry(merge);2030return-1;2031}2032/* Migrate old flags over */2033 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);2034invalidate_ce_path(old, o);2035}20362037if(submodule_from_ce(ce)) {2038int ret =check_submodule_move_head(ce,oid_to_hex(&old->oid),2039oid_to_hex(&ce->oid),2040 o);2041if(ret)2042return ret;2043}2044}else{2045/*2046 * Previously unmerged entry left as an existence2047 * marker by read_index_unmerged();2048 */2049invalidate_ce_path(old, o);2050}20512052do_add_entry(o, merge, update, CE_STAGEMASK);2053return1;2054}20552056static intdeleted_entry(const struct cache_entry *ce,2057const struct cache_entry *old,2058struct unpack_trees_options *o)2059{2060/* Did it exist in the index? */2061if(!old) {2062if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))2063return-1;2064return0;2065}2066if(!(old->ce_flags & CE_CONFLICTED) &&verify_uptodate(old, o))2067return-1;2068add_entry(o, ce, CE_REMOVE,0);2069invalidate_ce_path(ce, o);2070return1;2071}20722073static intkeep_entry(const struct cache_entry *ce,2074struct unpack_trees_options *o)2075{2076add_entry(o, ce,0,0);2077if(ce_stage(ce))2078invalidate_ce_path(ce, o);2079return1;2080}20812082#if DBRT_DEBUG2083static voidshow_stage_entry(FILE*o,2084const char*label,const struct cache_entry *ce)2085{2086if(!ce)2087fprintf(o,"%s(missing)\n", label);2088else2089fprintf(o,"%s%06o%s %d\t%s\n",2090 label,2091 ce->ce_mode,2092oid_to_hex(&ce->oid),2093ce_stage(ce),2094 ce->name);2095}2096#endif20972098intthreeway_merge(const struct cache_entry *const*stages,2099struct unpack_trees_options *o)2100{2101const struct cache_entry *index;2102const struct cache_entry *head;2103const struct cache_entry *remote = stages[o->head_idx +1];2104int count;2105int head_match =0;2106int remote_match =0;21072108int df_conflict_head =0;2109int df_conflict_remote =0;21102111int any_anc_missing =0;2112int no_anc_exists =1;2113int i;21142115for(i =1; i < o->head_idx; i++) {2116if(!stages[i] || stages[i] == o->df_conflict_entry)2117 any_anc_missing =1;2118else2119 no_anc_exists =0;2120}21212122 index = stages[0];2123 head = stages[o->head_idx];21242125if(head == o->df_conflict_entry) {2126 df_conflict_head =1;2127 head = NULL;2128}21292130if(remote == o->df_conflict_entry) {2131 df_conflict_remote =1;2132 remote = NULL;2133}21342135/*2136 * First, if there's a #16 situation, note that to prevent #132137 * and #14.2138 */2139if(!same(remote, head)) {2140for(i =1; i < o->head_idx; i++) {2141if(same(stages[i], head)) {2142 head_match = i;2143}2144if(same(stages[i], remote)) {2145 remote_match = i;2146}2147}2148}21492150/*2151 * We start with cases where the index is allowed to match2152 * something other than the head: #14(ALT) and #2ALT, where it2153 * is permitted to match the result instead.2154 */2155/* #14, #14ALT, #2ALT */2156if(remote && !df_conflict_head && head_match && !remote_match) {2157if(index && !same(index, remote) && !same(index, head))2158returnreject_merge(index, o);2159returnmerged_entry(remote, index, o);2160}2161/*2162 * If we have an entry in the index cache, then we want to2163 * make sure that it matches head.2164 */2165if(index && !same(index, head))2166returnreject_merge(index, o);21672168if(head) {2169/* #5ALT, #15 */2170if(same(head, remote))2171returnmerged_entry(head, index, o);2172/* #13, #3ALT */2173if(!df_conflict_remote && remote_match && !head_match)2174returnmerged_entry(head, index, o);2175}21762177/* #1 */2178if(!head && !remote && any_anc_missing)2179return0;21802181/*2182 * Under the "aggressive" rule, we resolve mostly trivial2183 * cases that we historically had git-merge-one-file resolve.2184 */2185if(o->aggressive) {2186int head_deleted = !head;2187int remote_deleted = !remote;2188const struct cache_entry *ce = NULL;21892190if(index)2191 ce = index;2192else if(head)2193 ce = head;2194else if(remote)2195 ce = remote;2196else{2197for(i =1; i < o->head_idx; i++) {2198if(stages[i] && stages[i] != o->df_conflict_entry) {2199 ce = stages[i];2200break;2201}2202}2203}22042205/*2206 * Deleted in both.2207 * Deleted in one and unchanged in the other.2208 */2209if((head_deleted && remote_deleted) ||2210(head_deleted && remote && remote_match) ||2211(remote_deleted && head && head_match)) {2212if(index)2213returndeleted_entry(index, index, o);2214if(ce && !head_deleted) {2215if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))2216return-1;2217}2218return0;2219}2220/*2221 * Added in both, identically.2222 */2223if(no_anc_exists && head && remote &&same(head, remote))2224returnmerged_entry(head, index, o);22252226}22272228/* Below are "no merge" cases, which require that the index be2229 * up-to-date to avoid the files getting overwritten with2230 * conflict resolution files.2231 */2232if(index) {2233if(verify_uptodate(index, o))2234return-1;2235}22362237 o->nontrivial_merge =1;22382239/* #2, #3, #4, #6, #7, #9, #10, #11. */2240 count =0;2241if(!head_match || !remote_match) {2242for(i =1; i < o->head_idx; i++) {2243if(stages[i] && stages[i] != o->df_conflict_entry) {2244keep_entry(stages[i], o);2245 count++;2246break;2247}2248}2249}2250#if DBRT_DEBUG2251else{2252fprintf(stderr,"read-tree: warning #16 detected\n");2253show_stage_entry(stderr,"head ", stages[head_match]);2254show_stage_entry(stderr,"remote ", stages[remote_match]);2255}2256#endif2257if(head) { count +=keep_entry(head, o); }2258if(remote) { count +=keep_entry(remote, o); }2259return count;2260}22612262/*2263 * Two-way merge.2264 *2265 * The rule is to "carry forward" what is in the index without losing2266 * information across a "fast-forward", favoring a successful merge2267 * over a merge failure when it makes sense. For details of the2268 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.2269 *2270 */2271inttwoway_merge(const struct cache_entry *const*src,2272struct unpack_trees_options *o)2273{2274const struct cache_entry *current = src[0];2275const struct cache_entry *oldtree = src[1];2276const struct cache_entry *newtree = src[2];22772278if(o->merge_size !=2)2279returnerror("Cannot do a twoway merge of%dtrees",2280 o->merge_size);22812282if(oldtree == o->df_conflict_entry)2283 oldtree = NULL;2284if(newtree == o->df_conflict_entry)2285 newtree = NULL;22862287if(current) {2288if(current->ce_flags & CE_CONFLICTED) {2289if(same(oldtree, newtree) || o->reset) {2290if(!newtree)2291returndeleted_entry(current, current, o);2292else2293returnmerged_entry(newtree, current, o);2294}2295returnreject_merge(current, o);2296}else if((!oldtree && !newtree) ||/* 4 and 5 */2297(!oldtree && newtree &&2298same(current, newtree)) ||/* 6 and 7 */2299(oldtree && newtree &&2300same(oldtree, newtree)) ||/* 14 and 15 */2301(oldtree && newtree &&2302!same(oldtree, newtree) &&/* 18 and 19 */2303same(current, newtree))) {2304returnkeep_entry(current, o);2305}else if(oldtree && !newtree &&same(current, oldtree)) {2306/* 10 or 11 */2307returndeleted_entry(oldtree, current, o);2308}else if(oldtree && newtree &&2309same(current, oldtree) && !same(current, newtree)) {2310/* 20 or 21 */2311returnmerged_entry(newtree, current, o);2312}else2313returnreject_merge(current, o);2314}2315else if(newtree) {2316if(oldtree && !o->initial_checkout) {2317/*2318 * deletion of the path was staged;2319 */2320if(same(oldtree, newtree))2321return1;2322returnreject_merge(oldtree, o);2323}2324returnmerged_entry(newtree, current, o);2325}2326returndeleted_entry(oldtree, current, o);2327}23282329/*2330 * Bind merge.2331 *2332 * Keep the index entries at stage0, collapse stage1 but make sure2333 * stage0 does not have anything there.2334 */2335intbind_merge(const struct cache_entry *const*src,2336struct unpack_trees_options *o)2337{2338const struct cache_entry *old = src[0];2339const struct cache_entry *a = src[1];23402341if(o->merge_size !=1)2342returnerror("Cannot do a bind merge of%dtrees",2343 o->merge_size);2344if(a && old)2345return o->quiet ? -1:2346error(ERRORMSG(o, ERROR_BIND_OVERLAP),2347super_prefixed(a->name),2348super_prefixed(old->name));2349if(!a)2350returnkeep_entry(old, o);2351else2352returnmerged_entry(a, NULL, o);2353}23542355/*2356 * One-way merge.2357 *2358 * The rule is:2359 * - take the stat information from stage0, take the data from stage12360 */2361intoneway_merge(const struct cache_entry *const*src,2362struct unpack_trees_options *o)2363{2364const struct cache_entry *old = src[0];2365const struct cache_entry *a = src[1];23662367if(o->merge_size !=1)2368returnerror("Cannot do a oneway merge of%dtrees",2369 o->merge_size);23702371if(!a || a == o->df_conflict_entry)2372returndeleted_entry(old, old, o);23732374if(old &&same(old, a)) {2375int update =0;2376if(o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {2377struct stat st;2378if(lstat(old->name, &st) ||2379ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))2380 update |= CE_UPDATE;2381}2382if(o->update &&S_ISGITLINK(old->ce_mode) &&2383should_update_submodules() && !verify_uptodate(old, o))2384 update |= CE_UPDATE;2385add_entry(o, old, update, CE_STAGEMASK);2386return0;2387}2388returnmerged_entry(a, old, o);2389}