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"promisor-remote.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(_("Updating 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(has_promisor_remote() && 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; 409for(i =0; i < index->cache_nr; i++) { 410struct cache_entry *ce = index->cache[i]; 411 412if(!(ce->ce_flags & CE_UPDATE) || 413S_ISGITLINK(ce->ce_mode)) 414continue; 415if(!oid_object_info_extended(the_repository, &ce->oid, 416 NULL, 417 OBJECT_INFO_FOR_PREFETCH)) 418continue; 419oid_array_append(&to_fetch, &ce->oid); 420} 421if(to_fetch.nr) 422promisor_remote_get_direct(the_repository, 423 to_fetch.oid, to_fetch.nr); 424oid_array_clear(&to_fetch); 425} 426for(i =0; i < index->cache_nr; i++) { 427struct cache_entry *ce = index->cache[i]; 428 429if(ce->ce_flags & CE_UPDATE) { 430if(ce->ce_flags & CE_WT_REMOVE) 431BUG("both update and delete flags are set on%s", 432 ce->name); 433display_progress(progress, ++cnt); 434 ce->ce_flags &= ~CE_UPDATE; 435if(o->update && !o->dry_run) { 436 errs |=checkout_entry(ce, &state, NULL, NULL); 437} 438} 439} 440stop_progress(&progress); 441 errs |=finish_delayed_checkout(&state, NULL); 442if(o->update) 443git_attr_set_direction(GIT_ATTR_CHECKIN); 444 445if(o->clone) 446report_collided_checkout(index); 447 448trace_performance_leave("check_updates"); 449return errs !=0; 450} 451 452static intverify_uptodate_sparse(const struct cache_entry *ce, 453struct unpack_trees_options *o); 454static intverify_absent_sparse(const struct cache_entry *ce, 455enum unpack_trees_error_types, 456struct unpack_trees_options *o); 457 458static intapply_sparse_checkout(struct index_state *istate, 459struct cache_entry *ce, 460struct unpack_trees_options *o) 461{ 462int was_skip_worktree =ce_skip_worktree(ce); 463 464if(ce->ce_flags & CE_NEW_SKIP_WORKTREE) 465 ce->ce_flags |= CE_SKIP_WORKTREE; 466else 467 ce->ce_flags &= ~CE_SKIP_WORKTREE; 468if(was_skip_worktree !=ce_skip_worktree(ce)) { 469 ce->ce_flags |= CE_UPDATE_IN_BASE; 470mark_fsmonitor_invalid(istate, ce); 471 istate->cache_changed |= CE_ENTRY_CHANGED; 472} 473 474/* 475 * if (!was_skip_worktree && !ce_skip_worktree()) { 476 * This is perfectly normal. Move on; 477 * } 478 */ 479 480/* 481 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout 482 * area as a result of ce_skip_worktree() shortcuts in 483 * verify_absent() and verify_uptodate(). 484 * Make sure they don't modify worktree if they are already 485 * outside checkout area 486 */ 487if(was_skip_worktree &&ce_skip_worktree(ce)) { 488 ce->ce_flags &= ~CE_UPDATE; 489 490/* 491 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also 492 * on to get that file removed from both index and worktree. 493 * If that file is already outside worktree area, don't 494 * bother remove it. 495 */ 496if(ce->ce_flags & CE_REMOVE) 497 ce->ce_flags &= ~CE_WT_REMOVE; 498} 499 500if(!was_skip_worktree &&ce_skip_worktree(ce)) { 501/* 502 * If CE_UPDATE is set, verify_uptodate() must be called already 503 * also stat info may have lost after merged_entry() so calling 504 * verify_uptodate() again may fail 505 */ 506if(!(ce->ce_flags & CE_UPDATE) &&verify_uptodate_sparse(ce, o)) 507return-1; 508 ce->ce_flags |= CE_WT_REMOVE; 509 ce->ce_flags &= ~CE_UPDATE; 510} 511if(was_skip_worktree && !ce_skip_worktree(ce)) { 512if(verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) 513return-1; 514 ce->ce_flags |= CE_UPDATE; 515} 516return0; 517} 518 519staticinlineintcall_unpack_fn(const struct cache_entry *const*src, 520struct unpack_trees_options *o) 521{ 522int ret = o->fn(src, o); 523if(ret >0) 524 ret =0; 525return ret; 526} 527 528static voidmark_ce_used(struct cache_entry *ce,struct unpack_trees_options *o) 529{ 530 ce->ce_flags |= CE_UNPACKED; 531 532if(o->cache_bottom < o->src_index->cache_nr && 533 o->src_index->cache[o->cache_bottom] == ce) { 534int bottom = o->cache_bottom; 535while(bottom < o->src_index->cache_nr && 536 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) 537 bottom++; 538 o->cache_bottom = bottom; 539} 540} 541 542static voidmark_all_ce_unused(struct index_state *index) 543{ 544int i; 545for(i =0; i < index->cache_nr; i++) 546 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE); 547} 548 549static intlocate_in_src_index(const struct cache_entry *ce, 550struct unpack_trees_options *o) 551{ 552struct index_state *index = o->src_index; 553int len =ce_namelen(ce); 554int pos =index_name_pos(index, ce->name, len); 555if(pos <0) 556 pos = -1- pos; 557return pos; 558} 559 560/* 561 * We call unpack_index_entry() with an unmerged cache entry 562 * only in diff-index, and it wants a single callback. Skip 563 * the other unmerged entry with the same name. 564 */ 565static voidmark_ce_used_same_name(struct cache_entry *ce, 566struct unpack_trees_options *o) 567{ 568struct index_state *index = o->src_index; 569int len =ce_namelen(ce); 570int pos; 571 572for(pos =locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { 573struct cache_entry *next = index->cache[pos]; 574if(len !=ce_namelen(next) || 575memcmp(ce->name, next->name, len)) 576break; 577mark_ce_used(next, o); 578} 579} 580 581static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) 582{ 583const struct index_state *index = o->src_index; 584int pos = o->cache_bottom; 585 586while(pos < index->cache_nr) { 587struct cache_entry *ce = index->cache[pos]; 588if(!(ce->ce_flags & CE_UNPACKED)) 589return ce; 590 pos++; 591} 592return NULL; 593} 594 595static voidadd_same_unmerged(const struct cache_entry *ce, 596struct unpack_trees_options *o) 597{ 598struct index_state *index = o->src_index; 599int len =ce_namelen(ce); 600int pos =index_name_pos(index, ce->name, len); 601 602if(0<= pos) 603die("programming error in a caller of mark_ce_used_same_name"); 604for(pos = -pos -1; pos < index->cache_nr; pos++) { 605struct cache_entry *next = index->cache[pos]; 606if(len !=ce_namelen(next) || 607memcmp(ce->name, next->name, len)) 608break; 609add_entry(o, next,0,0); 610mark_ce_used(next, o); 611} 612} 613 614static intunpack_index_entry(struct cache_entry *ce, 615struct unpack_trees_options *o) 616{ 617const struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, }; 618int ret; 619 620 src[0] = ce; 621 622mark_ce_used(ce, o); 623if(ce_stage(ce)) { 624if(o->skip_unmerged) { 625add_entry(o, ce,0,0); 626return0; 627} 628} 629 ret =call_unpack_fn(src, o); 630if(ce_stage(ce)) 631mark_ce_used_same_name(ce, o); 632return ret; 633} 634 635static intfind_cache_pos(struct traverse_info *,const char*p,size_t len); 636 637static voidrestore_cache_bottom(struct traverse_info *info,int bottom) 638{ 639struct unpack_trees_options *o = info->data; 640 641if(o->diff_index_cached) 642return; 643 o->cache_bottom = bottom; 644} 645 646static intswitch_cache_bottom(struct traverse_info *info) 647{ 648struct unpack_trees_options *o = info->data; 649int ret, pos; 650 651if(o->diff_index_cached) 652return0; 653 ret = o->cache_bottom; 654 pos =find_cache_pos(info->prev, info->name, info->namelen); 655 656if(pos < -1) 657 o->cache_bottom = -2- pos; 658else if(pos <0) 659 o->cache_bottom = o->src_index->cache_nr; 660return ret; 661} 662 663staticinlineintare_same_oid(struct name_entry *name_j,struct name_entry *name_k) 664{ 665return!is_null_oid(&name_j->oid) && !is_null_oid(&name_k->oid) &&oideq(&name_j->oid, &name_k->oid); 666} 667 668static intall_trees_same_as_cache_tree(int n,unsigned long dirmask, 669struct name_entry *names, 670struct traverse_info *info) 671{ 672struct unpack_trees_options *o = info->data; 673int i; 674 675if(!o->merge || dirmask != ((1<< n) -1)) 676return0; 677 678for(i =1; i < n; i++) 679if(!are_same_oid(names, names + i)) 680return0; 681 682returncache_tree_matches_traversal(o->src_index->cache_tree, names, info); 683} 684 685static intindex_pos_by_traverse_info(struct name_entry *names, 686struct traverse_info *info) 687{ 688struct unpack_trees_options *o = info->data; 689struct strbuf name = STRBUF_INIT; 690int pos; 691 692strbuf_make_traverse_path(&name, info, names->path, names->pathlen); 693strbuf_addch(&name,'/'); 694 pos =index_name_pos(o->src_index, name.buf, name.len); 695if(pos >=0) 696BUG("This is a directory and should not exist in index"); 697 pos = -pos -1; 698if(!starts_with(o->src_index->cache[pos]->name, name.buf) || 699(pos >0&&starts_with(o->src_index->cache[pos-1]->name, name.buf))) 700BUG("pos must point at the first entry in this directory"); 701strbuf_release(&name); 702return pos; 703} 704 705/* 706 * Fast path if we detect that all trees are the same as cache-tree at this 707 * path. We'll walk these trees in an iterative loop using cache-tree/index 708 * instead of ODB since we already know what these trees contain. 709 */ 710static inttraverse_by_cache_tree(int pos,int nr_entries,int nr_names, 711struct traverse_info *info) 712{ 713struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, }; 714struct unpack_trees_options *o = info->data; 715struct cache_entry *tree_ce = NULL; 716int ce_len =0; 717int i, d; 718 719if(!o->merge) 720BUG("We need cache-tree to do this optimization"); 721 722/* 723 * Do what unpack_callback() and unpack_nondirectories() normally 724 * do. But we walk all paths in an iterative loop instead. 725 * 726 * D/F conflicts and higher stage entries are not a concern 727 * because cache-tree would be invalidated and we would never 728 * get here in the first place. 729 */ 730for(i =0; i < nr_entries; i++) { 731int new_ce_len, len, rc; 732 733 src[0] = o->src_index->cache[pos + i]; 734 735 len =ce_namelen(src[0]); 736 new_ce_len =cache_entry_size(len); 737 738if(new_ce_len > ce_len) { 739 new_ce_len <<=1; 740 tree_ce =xrealloc(tree_ce, new_ce_len); 741memset(tree_ce,0, new_ce_len); 742 ce_len = new_ce_len; 743 744 tree_ce->ce_flags =create_ce_flags(0); 745 746for(d =1; d <= nr_names; d++) 747 src[d] = tree_ce; 748} 749 750 tree_ce->ce_mode = src[0]->ce_mode; 751 tree_ce->ce_namelen = len; 752oidcpy(&tree_ce->oid, &src[0]->oid); 753memcpy(tree_ce->name, src[0]->name, len +1); 754 755 rc =call_unpack_fn((const struct cache_entry *const*)src, o); 756if(rc <0) { 757free(tree_ce); 758return rc; 759} 760 761mark_ce_used(src[0], o); 762} 763free(tree_ce); 764if(o->debug_unpack) 765printf("Unpacked%dentries from%sto%susing cache-tree\n", 766 nr_entries, 767 o->src_index->cache[pos]->name, 768 o->src_index->cache[pos + nr_entries -1]->name); 769return0; 770} 771 772static inttraverse_trees_recursive(int n,unsigned long dirmask, 773unsigned long df_conflicts, 774struct name_entry *names, 775struct traverse_info *info) 776{ 777struct unpack_trees_options *o = info->data; 778int i, ret, bottom; 779int nr_buf =0; 780struct tree_desc t[MAX_UNPACK_TREES]; 781void*buf[MAX_UNPACK_TREES]; 782struct traverse_info newinfo; 783struct name_entry *p; 784int nr_entries; 785 786 nr_entries =all_trees_same_as_cache_tree(n, dirmask, names, info); 787if(nr_entries >0) { 788int pos =index_pos_by_traverse_info(names, info); 789 790if(!o->merge || df_conflicts) 791BUG("Wrong condition to get here buddy"); 792 793/* 794 * All entries up to 'pos' must have been processed 795 * (i.e. marked CE_UNPACKED) at this point. But to be safe, 796 * save and restore cache_bottom anyway to not miss 797 * unprocessed entries before 'pos'. 798 */ 799 bottom = o->cache_bottom; 800 ret =traverse_by_cache_tree(pos, nr_entries, n, info); 801 o->cache_bottom = bottom; 802return ret; 803} 804 805 p = names; 806while(!p->mode) 807 p++; 808 809 newinfo = *info; 810 newinfo.prev = info; 811 newinfo.pathspec = info->pathspec; 812 newinfo.name = p->path; 813 newinfo.namelen = p->pathlen; 814 newinfo.mode = p->mode; 815 newinfo.pathlen =st_add3(newinfo.pathlen,tree_entry_len(p),1); 816 newinfo.df_conflicts |= df_conflicts; 817 818/* 819 * Fetch the tree from the ODB for each peer directory in the 820 * n commits. 821 * 822 * For 2- and 3-way traversals, we try to avoid hitting the 823 * ODB twice for the same OID. This should yield a nice speed 824 * up in checkouts and merges when the commits are similar. 825 * 826 * We don't bother doing the full O(n^2) search for larger n, 827 * because wider traversals don't happen that often and we 828 * avoid the search setup. 829 * 830 * When 2 peer OIDs are the same, we just copy the tree 831 * descriptor data. This implicitly borrows the buffer 832 * data from the earlier cell. 833 */ 834for(i =0; i < n; i++, dirmask >>=1) { 835if(i >0&&are_same_oid(&names[i], &names[i -1])) 836 t[i] = t[i -1]; 837else if(i >1&&are_same_oid(&names[i], &names[i -2])) 838 t[i] = t[i -2]; 839else{ 840const struct object_id *oid = NULL; 841if(dirmask &1) 842 oid = &names[i].oid; 843 buf[nr_buf++] =fill_tree_descriptor(the_repository, t + i, oid); 844} 845} 846 847 bottom =switch_cache_bottom(&newinfo); 848 ret =traverse_trees(o->src_index, n, t, &newinfo); 849restore_cache_bottom(&newinfo, bottom); 850 851for(i =0; i < nr_buf; i++) 852free(buf[i]); 853 854return ret; 855} 856 857/* 858 * Compare the traverse-path to the cache entry without actually 859 * having to generate the textual representation of the traverse 860 * path. 861 * 862 * NOTE! This *only* compares up to the size of the traverse path 863 * itself - the caller needs to do the final check for the cache 864 * entry having more data at the end! 865 */ 866static intdo_compare_entry_piecewise(const struct cache_entry *ce, 867const struct traverse_info *info, 868const char*name,size_t namelen, 869unsigned mode) 870{ 871int pathlen, ce_len; 872const char*ce_name; 873 874if(info->prev) { 875int cmp =do_compare_entry_piecewise(ce, info->prev, 876 info->name, info->namelen, 877 info->mode); 878if(cmp) 879return cmp; 880} 881 pathlen = info->pathlen; 882 ce_len =ce_namelen(ce); 883 884/* If ce_len < pathlen then we must have previously hit "name == directory" entry */ 885if(ce_len < pathlen) 886return-1; 887 888 ce_len -= pathlen; 889 ce_name = ce->name + pathlen; 890 891returndf_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode); 892} 893 894static intdo_compare_entry(const struct cache_entry *ce, 895const struct traverse_info *info, 896const char*name,size_t namelen, 897unsigned mode) 898{ 899int pathlen, ce_len; 900const char*ce_name; 901int cmp; 902 903/* 904 * If we have not precomputed the traverse path, it is quicker 905 * to avoid doing so. But if we have precomputed it, 906 * it is quicker to use the precomputed version. 907 */ 908if(!info->traverse_path) 909returndo_compare_entry_piecewise(ce, info, name, namelen, mode); 910 911 cmp =strncmp(ce->name, info->traverse_path, info->pathlen); 912if(cmp) 913return cmp; 914 915 pathlen = info->pathlen; 916 ce_len =ce_namelen(ce); 917 918if(ce_len < pathlen) 919return-1; 920 921 ce_len -= pathlen; 922 ce_name = ce->name + pathlen; 923 924returndf_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode); 925} 926 927static intcompare_entry(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 928{ 929int cmp =do_compare_entry(ce, info, n->path, n->pathlen, n->mode); 930if(cmp) 931return cmp; 932 933/* 934 * Even if the beginning compared identically, the ce should 935 * compare as bigger than a directory leading up to it! 936 */ 937returnce_namelen(ce) >traverse_path_len(info,tree_entry_len(n)); 938} 939 940static intce_in_traverse_path(const struct cache_entry *ce, 941const struct traverse_info *info) 942{ 943if(!info->prev) 944return1; 945if(do_compare_entry(ce, info->prev, 946 info->name, info->namelen, info->mode)) 947return0; 948/* 949 * If ce (blob) is the same name as the path (which is a tree 950 * we will be descending into), it won't be inside it. 951 */ 952return(info->pathlen <ce_namelen(ce)); 953} 954 955static struct cache_entry *create_ce_entry(const struct traverse_info *info, 956const struct name_entry *n, 957int stage, 958struct index_state *istate, 959int is_transient) 960{ 961size_t len =traverse_path_len(info,tree_entry_len(n)); 962struct cache_entry *ce = 963 is_transient ? 964make_empty_transient_cache_entry(len) : 965make_empty_cache_entry(istate, len); 966 967 ce->ce_mode =create_ce_mode(n->mode); 968 ce->ce_flags =create_ce_flags(stage); 969 ce->ce_namelen = len; 970oidcpy(&ce->oid, &n->oid); 971/* len+1 because the cache_entry allocates space for NUL */ 972make_traverse_path(ce->name, len +1, info, n->path, n->pathlen); 973 974return ce; 975} 976 977/* 978 * Note that traverse_by_cache_tree() duplicates some logic in this function 979 * without actually calling it. If you change the logic here you may need to 980 * check and change there as well. 981 */ 982static intunpack_nondirectories(int n,unsigned long mask, 983unsigned long dirmask, 984struct cache_entry **src, 985const struct name_entry *names, 986const struct traverse_info *info) 987{ 988int i; 989struct unpack_trees_options *o = info->data; 990unsigned long conflicts = info->df_conflicts | dirmask; 991 992/* Do we have *only* directories? Nothing to do */ 993if(mask == dirmask && !src[0]) 994return0; 995 996/* 997 * Ok, we've filled in up to any potential index entry in src[0], 998 * now do the rest. 999 */1000for(i =0; i < n; i++) {1001int stage;1002unsigned int bit =1ul<< i;1003if(conflicts & bit) {1004 src[i + o->merge] = o->df_conflict_entry;1005continue;1006}1007if(!(mask & bit))1008continue;1009if(!o->merge)1010 stage =0;1011else if(i +1< o->head_idx)1012 stage =1;1013else if(i +1> o->head_idx)1014 stage =3;1015else1016 stage =2;10171018/*1019 * If the merge bit is set, then the cache entries are1020 * discarded in the following block. In this case,1021 * construct "transient" cache_entries, as they are1022 * not stored in the index. otherwise construct the1023 * cache entry from the index aware logic.1024 */1025 src[i + o->merge] =create_ce_entry(info, names + i, stage, &o->result, o->merge);1026}10271028if(o->merge) {1029int rc =call_unpack_fn((const struct cache_entry *const*)src,1030 o);1031for(i =0; i < n; i++) {1032struct cache_entry *ce = src[i + o->merge];1033if(ce != o->df_conflict_entry)1034discard_cache_entry(ce);1035}1036return rc;1037}10381039for(i =0; i < n; i++)1040if(src[i] && src[i] != o->df_conflict_entry)1041if(do_add_entry(o, src[i],0,0))1042return-1;10431044return0;1045}10461047static intunpack_failed(struct unpack_trees_options *o,const char*message)1048{1049discard_index(&o->result);1050if(!o->quiet && !o->exiting_early) {1051if(message)1052returnerror("%s", message);1053return-1;1054}1055return-1;1056}10571058/*1059 * The tree traversal is looking at name p. If we have a matching entry,1060 * return it. If name p is a directory in the index, do not return1061 * anything, as we will want to match it when the traversal descends into1062 * the directory.1063 */1064static intfind_cache_pos(struct traverse_info *info,1065const char*p,size_t p_len)1066{1067int pos;1068struct unpack_trees_options *o = info->data;1069struct index_state *index = o->src_index;1070int pfxlen = info->pathlen;10711072for(pos = o->cache_bottom; pos < index->cache_nr; pos++) {1073const struct cache_entry *ce = index->cache[pos];1074const char*ce_name, *ce_slash;1075int cmp, ce_len;10761077if(ce->ce_flags & CE_UNPACKED) {1078/*1079 * cache_bottom entry is already unpacked, so1080 * we can never match it; don't check it1081 * again.1082 */1083if(pos == o->cache_bottom)1084++o->cache_bottom;1085continue;1086}1087if(!ce_in_traverse_path(ce, info)) {1088/*1089 * Check if we can skip future cache checks1090 * (because we're already past all possible1091 * entries in the traverse path).1092 */1093if(info->traverse_path) {1094if(strncmp(ce->name, info->traverse_path,1095 info->pathlen) >0)1096break;1097}1098continue;1099}1100 ce_name = ce->name + pfxlen;1101 ce_slash =strchr(ce_name,'/');1102if(ce_slash)1103 ce_len = ce_slash - ce_name;1104else1105 ce_len =ce_namelen(ce) - pfxlen;1106 cmp =name_compare(p, p_len, ce_name, ce_len);1107/*1108 * Exact match; if we have a directory we need to1109 * delay returning it.1110 */1111if(!cmp)1112return ce_slash ? -2- pos : pos;1113if(0< cmp)1114continue;/* keep looking */1115/*1116 * ce_name sorts after p->path; could it be that we1117 * have files under p->path directory in the index?1118 * E.g. ce_name == "t-i", and p->path == "t"; we may1119 * have "t/a" in the index.1120 */1121if(p_len < ce_len && !memcmp(ce_name, p, p_len) &&1122 ce_name[p_len] <'/')1123continue;/* keep looking */1124break;1125}1126return-1;1127}11281129static struct cache_entry *find_cache_entry(struct traverse_info *info,1130const struct name_entry *p)1131{1132int pos =find_cache_pos(info, p->path, p->pathlen);1133struct unpack_trees_options *o = info->data;11341135if(0<= pos)1136return o->src_index->cache[pos];1137else1138return NULL;1139}11401141static voiddebug_path(struct traverse_info *info)1142{1143if(info->prev) {1144debug_path(info->prev);1145if(*info->prev->name)1146putchar('/');1147}1148printf("%s", info->name);1149}11501151static voiddebug_name_entry(int i,struct name_entry *n)1152{1153printf("ent#%d %06o%s\n", i,1154 n->path ? n->mode :0,1155 n->path ? n->path :"(missing)");1156}11571158static voiddebug_unpack_callback(int n,1159unsigned long mask,1160unsigned long dirmask,1161struct name_entry *names,1162struct traverse_info *info)1163{1164int i;1165printf("* unpack mask%lu, dirmask%lu, cnt%d",1166 mask, dirmask, n);1167debug_path(info);1168putchar('\n');1169for(i =0; i < n; i++)1170debug_name_entry(i, names + i);1171}11721173/*1174 * Note that traverse_by_cache_tree() duplicates some logic in this function1175 * without actually calling it. If you change the logic here you may need to1176 * check and change there as well.1177 */1178static intunpack_callback(int n,unsigned long mask,unsigned long dirmask,struct name_entry *names,struct traverse_info *info)1179{1180struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, };1181struct unpack_trees_options *o = info->data;1182const struct name_entry *p = names;11831184/* Find first entry with a real name (we could use "mask" too) */1185while(!p->mode)1186 p++;11871188if(o->debug_unpack)1189debug_unpack_callback(n, mask, dirmask, names, info);11901191/* Are we supposed to look at the index too? */1192if(o->merge) {1193while(1) {1194int cmp;1195struct cache_entry *ce;11961197if(o->diff_index_cached)1198 ce =next_cache_entry(o);1199else1200 ce =find_cache_entry(info, p);12011202if(!ce)1203break;1204 cmp =compare_entry(ce, info, p);1205if(cmp <0) {1206if(unpack_index_entry(ce, o) <0)1207returnunpack_failed(o, NULL);1208continue;1209}1210if(!cmp) {1211if(ce_stage(ce)) {1212/*1213 * If we skip unmerged index1214 * entries, we'll skip this1215 * entry *and* the tree1216 * entries associated with it!1217 */1218if(o->skip_unmerged) {1219add_same_unmerged(ce, o);1220return mask;1221}1222}1223 src[0] = ce;1224}1225break;1226}1227}12281229if(unpack_nondirectories(n, mask, dirmask, src, names, info) <0)1230return-1;12311232if(o->merge && src[0]) {1233if(ce_stage(src[0]))1234mark_ce_used_same_name(src[0], o);1235else1236mark_ce_used(src[0], o);1237}12381239/* Now handle any directories.. */1240if(dirmask) {1241/* special case: "diff-index --cached" looking at a tree */1242if(o->diff_index_cached &&1243 n ==1&& dirmask ==1&&S_ISDIR(names->mode)) {1244int matches;1245 matches =cache_tree_matches_traversal(o->src_index->cache_tree,1246 names, info);1247/*1248 * Everything under the name matches; skip the1249 * entire hierarchy. diff_index_cached codepath1250 * special cases D/F conflicts in such a way that1251 * it does not do any look-ahead, so this is safe.1252 */1253if(matches) {1254 o->cache_bottom += matches;1255return mask;1256}1257}12581259if(traverse_trees_recursive(n, dirmask, mask & ~dirmask,1260 names, info) <0)1261return-1;1262return mask;1263}12641265return mask;1266}12671268static intclear_ce_flags_1(struct index_state *istate,1269struct cache_entry **cache,int nr,1270struct strbuf *prefix,1271int select_mask,int clear_mask,1272struct exclude_list *el,int defval);12731274/* Whole directory matching */1275static intclear_ce_flags_dir(struct index_state *istate,1276struct cache_entry **cache,int nr,1277struct strbuf *prefix,1278char*basename,1279int select_mask,int clear_mask,1280struct exclude_list *el,int defval)1281{1282struct cache_entry **cache_end;1283int dtype = DT_DIR;1284int ret =is_excluded_from_list(prefix->buf, prefix->len,1285 basename, &dtype, el, istate);1286int rc;12871288strbuf_addch(prefix,'/');12891290/* If undecided, use matching result of parent dir in defval */1291if(ret <0)1292 ret = defval;12931294for(cache_end = cache; cache_end != cache + nr; cache_end++) {1295struct cache_entry *ce = *cache_end;1296if(strncmp(ce->name, prefix->buf, prefix->len))1297break;1298}12991300/*1301 * TODO: check el, if there are no patterns that may conflict1302 * with ret (iow, we know in advance the incl/excl1303 * decision for the entire directory), clear flag here without1304 * calling clear_ce_flags_1(). That function will call1305 * the expensive is_excluded_from_list() on every entry.1306 */1307 rc =clear_ce_flags_1(istate, cache, cache_end - cache,1308 prefix,1309 select_mask, clear_mask,1310 el, ret);1311strbuf_setlen(prefix, prefix->len -1);1312return rc;1313}13141315/*1316 * Traverse the index, find every entry that matches according to1317 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the1318 * number of traversed entries.1319 *1320 * If select_mask is non-zero, only entries whose ce_flags has on of1321 * those bits enabled are traversed.1322 *1323 * cache : pointer to an index entry1324 * prefix_len : an offset to its path1325 *1326 * The current path ("prefix") including the trailing '/' is1327 * cache[0]->name[0..(prefix_len-1)]1328 * Top level path has prefix_len zero.1329 */1330static intclear_ce_flags_1(struct index_state *istate,1331struct cache_entry **cache,int nr,1332struct strbuf *prefix,1333int select_mask,int clear_mask,1334struct exclude_list *el,int defval)1335{1336struct cache_entry **cache_end = cache + nr;13371338/*1339 * Process all entries that have the given prefix and meet1340 * select_mask condition1341 */1342while(cache != cache_end) {1343struct cache_entry *ce = *cache;1344const char*name, *slash;1345int len, dtype, ret;13461347if(select_mask && !(ce->ce_flags & select_mask)) {1348 cache++;1349continue;1350}13511352if(prefix->len &&strncmp(ce->name, prefix->buf, prefix->len))1353break;13541355 name = ce->name + prefix->len;1356 slash =strchr(name,'/');13571358/* If it's a directory, try whole directory match first */1359if(slash) {1360int processed;13611362 len = slash - name;1363strbuf_add(prefix, name, len);13641365 processed =clear_ce_flags_dir(istate, cache, cache_end - cache,1366 prefix,1367 prefix->buf + prefix->len - len,1368 select_mask, clear_mask,1369 el, defval);13701371/* clear_c_f_dir eats a whole dir already? */1372if(processed) {1373 cache += processed;1374strbuf_setlen(prefix, prefix->len - len);1375continue;1376}13771378strbuf_addch(prefix,'/');1379 cache +=clear_ce_flags_1(istate, cache, cache_end - cache,1380 prefix,1381 select_mask, clear_mask, el, defval);1382strbuf_setlen(prefix, prefix->len - len -1);1383continue;1384}13851386/* Non-directory */1387 dtype =ce_to_dtype(ce);1388 ret =is_excluded_from_list(ce->name,ce_namelen(ce),1389 name, &dtype, el, istate);1390if(ret <0)1391 ret = defval;1392if(ret >0)1393 ce->ce_flags &= ~clear_mask;1394 cache++;1395}1396return nr - (cache_end - cache);1397}13981399static intclear_ce_flags(struct index_state *istate,1400int select_mask,int clear_mask,1401struct exclude_list *el)1402{1403static struct strbuf prefix = STRBUF_INIT;14041405strbuf_reset(&prefix);14061407returnclear_ce_flags_1(istate,1408 istate->cache,1409 istate->cache_nr,1410&prefix,1411 select_mask, clear_mask,1412 el,0);1413}14141415/*1416 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout1417 */1418static voidmark_new_skip_worktree(struct exclude_list *el,1419struct index_state *istate,1420int select_flag,int skip_wt_flag)1421{1422int i;14231424/*1425 * 1. Pretend the narrowest worktree: only unmerged entries1426 * are checked out1427 */1428for(i =0; i < istate->cache_nr; i++) {1429struct cache_entry *ce = istate->cache[i];14301431if(select_flag && !(ce->ce_flags & select_flag))1432continue;14331434if(!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED))1435 ce->ce_flags |= skip_wt_flag;1436else1437 ce->ce_flags &= ~skip_wt_flag;1438}14391440/*1441 * 2. Widen worktree according to sparse-checkout file.1442 * Matched entries will have skip_wt_flag cleared (i.e. "in")1443 */1444clear_ce_flags(istate, select_flag, skip_wt_flag, el);1445}14461447static intverify_absent(const struct cache_entry *,1448enum unpack_trees_error_types,1449struct unpack_trees_options *);1450/*1451 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the1452 * resulting index, -2 on failure to reflect the changes to the work tree.1453 *1454 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally1455 */1456intunpack_trees(unsigned len,struct tree_desc *t,struct unpack_trees_options *o)1457{1458int i, ret;1459static struct cache_entry *dfc;1460struct exclude_list el;14611462if(len > MAX_UNPACK_TREES)1463die("unpack_trees takes at most%dtrees", MAX_UNPACK_TREES);14641465trace_performance_enter();1466memset(&el,0,sizeof(el));1467if(!core_apply_sparse_checkout || !o->update)1468 o->skip_sparse_checkout =1;1469if(!o->skip_sparse_checkout) {1470char*sparse =git_pathdup("info/sparse-checkout");1471if(add_excludes_from_file_to_list(sparse,"",0, &el, NULL) <0)1472 o->skip_sparse_checkout =1;1473else1474 o->el = ⪙1475free(sparse);1476}14771478memset(&o->result,0,sizeof(o->result));1479 o->result.initialized =1;1480 o->result.timestamp.sec = o->src_index->timestamp.sec;1481 o->result.timestamp.nsec = o->src_index->timestamp.nsec;1482 o->result.version = o->src_index->version;1483if(!o->src_index->split_index) {1484 o->result.split_index = NULL;1485}else if(o->src_index == o->dst_index) {1486/*1487 * o->dst_index (and thus o->src_index) will be discarded1488 * and overwritten with o->result at the end of this function,1489 * so just use src_index's split_index to avoid having to1490 * create a new one.1491 */1492 o->result.split_index = o->src_index->split_index;1493 o->result.split_index->refcount++;1494}else{1495 o->result.split_index =init_split_index(&o->result);1496}1497oidcpy(&o->result.oid, &o->src_index->oid);1498 o->merge_size = len;1499mark_all_ce_unused(o->src_index);15001501/*1502 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries1503 */1504if(!o->skip_sparse_checkout)1505mark_new_skip_worktree(o->el, o->src_index,0, CE_NEW_SKIP_WORKTREE);15061507if(!dfc)1508 dfc =xcalloc(1,cache_entry_size(0));1509 o->df_conflict_entry = dfc;15101511if(len) {1512const char*prefix = o->prefix ? o->prefix :"";1513struct traverse_info info;15141515setup_traverse_info(&info, prefix);1516 info.fn = unpack_callback;1517 info.data = o;1518 info.show_all_errors = o->show_all_errors;1519 info.pathspec = o->pathspec;15201521if(o->prefix) {1522/*1523 * Unpack existing index entries that sort before the1524 * prefix the tree is spliced into. Note that o->merge1525 * is always true in this case.1526 */1527while(1) {1528struct cache_entry *ce =next_cache_entry(o);1529if(!ce)1530break;1531if(ce_in_traverse_path(ce, &info))1532break;1533if(unpack_index_entry(ce, o) <0)1534goto return_failed;1535}1536}15371538trace_performance_enter();1539 ret =traverse_trees(o->src_index, len, t, &info);1540trace_performance_leave("traverse_trees");1541if(ret <0)1542goto return_failed;1543}15441545/* Any left-over entries in the index? */1546if(o->merge) {1547while(1) {1548struct cache_entry *ce =next_cache_entry(o);1549if(!ce)1550break;1551if(unpack_index_entry(ce, o) <0)1552goto return_failed;1553}1554}1555mark_all_ce_unused(o->src_index);15561557if(o->trivial_merges_only && o->nontrivial_merge) {1558 ret =unpack_failed(o,"Merge requires file-level merging");1559goto done;1560}15611562if(!o->skip_sparse_checkout) {1563int empty_worktree =1;15641565/*1566 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #11567 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE1568 * so apply_sparse_checkout() won't attempt to remove it from worktree1569 */1570mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);15711572 ret =0;1573for(i =0; i < o->result.cache_nr; i++) {1574struct cache_entry *ce = o->result.cache[i];15751576/*1577 * Entries marked with CE_ADDED in merged_entry() do not have1578 * verify_absent() check (the check is effectively disabled1579 * because CE_NEW_SKIP_WORKTREE is set unconditionally).1580 *1581 * Do the real check now because we have had1582 * correct CE_NEW_SKIP_WORKTREE1583 */1584if(ce->ce_flags & CE_ADDED &&1585verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1586if(!o->show_all_errors)1587goto return_failed;1588 ret = -1;1589}15901591if(apply_sparse_checkout(&o->result, ce, o)) {1592if(!o->show_all_errors)1593goto return_failed;1594 ret = -1;1595}1596if(!ce_skip_worktree(ce))1597 empty_worktree =0;15981599}1600if(ret <0)1601goto return_failed;1602/*1603 * Sparse checkout is meant to narrow down checkout area1604 * but it does not make sense to narrow down to empty working1605 * tree. This is usually a mistake in sparse checkout rules.1606 * Do not allow users to do that.1607 */1608if(o->result.cache_nr && empty_worktree) {1609 ret =unpack_failed(o,"Sparse checkout leaves no entry on working directory");1610goto done;1611}1612}16131614 ret =check_updates(o) ? (-2) :0;1615if(o->dst_index) {1616move_index_extensions(&o->result, o->src_index);1617if(!ret) {1618if(git_env_bool("GIT_TEST_CHECK_CACHE_TREE",0))1619cache_tree_verify(the_repository, &o->result);1620if(!o->result.cache_tree)1621 o->result.cache_tree =cache_tree();1622if(!cache_tree_fully_valid(o->result.cache_tree))1623cache_tree_update(&o->result,1624 WRITE_TREE_SILENT |1625 WRITE_TREE_REPAIR);1626}16271628 o->result.updated_workdir =1;1629discard_index(o->dst_index);1630*o->dst_index = o->result;1631}else{1632discard_index(&o->result);1633}1634 o->src_index = NULL;16351636done:1637trace_performance_leave("unpack_trees");1638clear_exclude_list(&el);1639return ret;16401641return_failed:1642if(o->show_all_errors)1643display_error_msgs(o);1644mark_all_ce_unused(o->src_index);1645 ret =unpack_failed(o, NULL);1646if(o->exiting_early)1647 ret =0;1648goto done;1649}16501651/* Here come the merge functions */16521653static intreject_merge(const struct cache_entry *ce,1654struct unpack_trees_options *o)1655{1656returnadd_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);1657}16581659static intsame(const struct cache_entry *a,const struct cache_entry *b)1660{1661if(!!a != !!b)1662return0;1663if(!a && !b)1664return1;1665if((a->ce_flags | b->ce_flags) & CE_CONFLICTED)1666return0;1667return a->ce_mode == b->ce_mode &&1668oideq(&a->oid, &b->oid);1669}167016711672/*1673 * When a CE gets turned into an unmerged entry, we1674 * want it to be up-to-date1675 */1676static intverify_uptodate_1(const struct cache_entry *ce,1677struct unpack_trees_options *o,1678enum unpack_trees_error_types error_type)1679{1680struct stat st;16811682if(o->index_only)1683return0;16841685/*1686 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again1687 * if this entry is truly up-to-date because this file may be1688 * overwritten.1689 */1690if((ce->ce_flags & CE_VALID) ||ce_skip_worktree(ce))1691;/* keep checking */1692else if(o->reset ||ce_uptodate(ce))1693return0;16941695if(!lstat(ce->name, &st)) {1696int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;1697unsigned changed =ie_match_stat(o->src_index, ce, &st, flags);16981699if(submodule_from_ce(ce)) {1700int r =check_submodule_move_head(ce,1701"HEAD",oid_to_hex(&ce->oid), o);1702if(r)1703returnadd_rejected_path(o, error_type, ce->name);1704return0;1705}17061707if(!changed)1708return0;1709/*1710 * Historic default policy was to allow submodule to be out1711 * of sync wrt the superproject index. If the submodule was1712 * not considered interesting above, we don't care here.1713 */1714if(S_ISGITLINK(ce->ce_mode))1715return0;17161717 errno =0;1718}1719if(errno == ENOENT)1720return0;1721returnadd_rejected_path(o, error_type, ce->name);1722}17231724intverify_uptodate(const struct cache_entry *ce,1725struct unpack_trees_options *o)1726{1727if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1728return0;1729returnverify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);1730}17311732static intverify_uptodate_sparse(const struct cache_entry *ce,1733struct unpack_trees_options *o)1734{1735returnverify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);1736}17371738/*1739 * TODO: We should actually invalidate o->result, not src_index [1].1740 * But since cache tree and untracked cache both are not copied to1741 * o->result until unpacking is complete, we invalidate them on1742 * src_index instead with the assumption that they will be copied to1743 * dst_index at the end.1744 *1745 * [1] src_index->cache_tree is also used in unpack_callback() so if1746 * we invalidate o->result, we need to update it to use1747 * o->result.cache_tree as well.1748 */1749static voidinvalidate_ce_path(const struct cache_entry *ce,1750struct unpack_trees_options *o)1751{1752if(!ce)1753return;1754cache_tree_invalidate_path(o->src_index, ce->name);1755untracked_cache_invalidate_path(o->src_index, ce->name,1);1756}17571758/*1759 * Check that checking out ce->sha1 in subdir ce->name is not1760 * going to overwrite any working files.1761 *1762 * Currently, git does not checkout subprojects during a superproject1763 * checkout, so it is not going to overwrite anything.1764 */1765static intverify_clean_submodule(const char*old_sha1,1766const struct cache_entry *ce,1767struct unpack_trees_options *o)1768{1769if(!submodule_from_ce(ce))1770return0;17711772returncheck_submodule_move_head(ce, old_sha1,1773oid_to_hex(&ce->oid), o);1774}17751776static intverify_clean_subdirectory(const struct cache_entry *ce,1777struct unpack_trees_options *o)1778{1779/*1780 * we are about to extract "ce->name"; we would not want to lose1781 * anything in the existing directory there.1782 */1783int namelen;1784int i;1785struct dir_struct d;1786char*pathbuf;1787int cnt =0;17881789if(S_ISGITLINK(ce->ce_mode)) {1790struct object_id oid;1791int sub_head =resolve_gitlink_ref(ce->name,"HEAD", &oid);1792/*1793 * If we are not going to update the submodule, then1794 * we don't care.1795 */1796if(!sub_head &&oideq(&oid, &ce->oid))1797return0;1798returnverify_clean_submodule(sub_head ? NULL :oid_to_hex(&oid),1799 ce, o);1800}18011802/*1803 * First let's make sure we do not have a local modification1804 * in that directory.1805 */1806 namelen =ce_namelen(ce);1807for(i =locate_in_src_index(ce, o);1808 i < o->src_index->cache_nr;1809 i++) {1810struct cache_entry *ce2 = o->src_index->cache[i];1811int len =ce_namelen(ce2);1812if(len < namelen ||1813strncmp(ce->name, ce2->name, namelen) ||1814 ce2->name[namelen] !='/')1815break;1816/*1817 * ce2->name is an entry in the subdirectory to be1818 * removed.1819 */1820if(!ce_stage(ce2)) {1821if(verify_uptodate(ce2, o))1822return-1;1823add_entry(o, ce2, CE_REMOVE,0);1824invalidate_ce_path(ce, o);1825mark_ce_used(ce2, o);1826}1827 cnt++;1828}18291830/*1831 * Then we need to make sure that we do not lose a locally1832 * present file that is not ignored.1833 */1834 pathbuf =xstrfmt("%.*s/", namelen, ce->name);18351836memset(&d,0,sizeof(d));1837if(o->dir)1838 d.exclude_per_dir = o->dir->exclude_per_dir;1839 i =read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);1840if(i)1841returnadd_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);1842free(pathbuf);1843return cnt;1844}18451846/*1847 * This gets called when there was no index entry for the tree entry 'dst',1848 * but we found a file in the working tree that 'lstat()' said was fine,1849 * and we're on a case-insensitive filesystem.1850 *1851 * See if we can find a case-insensitive match in the index that also1852 * matches the stat information, and assume it's that other file!1853 */1854static inticase_exists(struct unpack_trees_options *o,const char*name,int len,struct stat *st)1855{1856const struct cache_entry *src;18571858 src =index_file_exists(o->src_index, name, len,1);1859return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);1860}18611862static intcheck_ok_to_remove(const char*name,int len,int dtype,1863const struct cache_entry *ce,struct stat *st,1864enum unpack_trees_error_types error_type,1865struct unpack_trees_options *o)1866{1867const struct cache_entry *result;18681869/*1870 * It may be that the 'lstat()' succeeded even though1871 * target 'ce' was absent, because there is an old1872 * entry that is different only in case..1873 *1874 * Ignore that lstat() if it matches.1875 */1876if(ignore_case &&icase_exists(o, name, len, st))1877return0;18781879if(o->dir &&1880is_excluded(o->dir, o->src_index, name, &dtype))1881/*1882 * ce->name is explicitly excluded, so it is Ok to1883 * overwrite it.1884 */1885return0;1886if(S_ISDIR(st->st_mode)) {1887/*1888 * We are checking out path "foo" and1889 * found "foo/." in the working tree.1890 * This is tricky -- if we have modified1891 * files that are in "foo/" we would lose1892 * them.1893 */1894if(verify_clean_subdirectory(ce, o) <0)1895return-1;1896return0;1897}18981899/*1900 * The previous round may already have decided to1901 * delete this path, which is in a subdirectory that1902 * is being replaced with a blob.1903 */1904 result =index_file_exists(&o->result, name, len,0);1905if(result) {1906if(result->ce_flags & CE_REMOVE)1907return0;1908}19091910returnadd_rejected_path(o, error_type, name);1911}19121913/*1914 * We do not want to remove or overwrite a working tree file that1915 * is not tracked, unless it is ignored.1916 */1917static intverify_absent_1(const struct cache_entry *ce,1918enum unpack_trees_error_types error_type,1919struct unpack_trees_options *o)1920{1921int len;1922struct stat st;19231924if(o->index_only || o->reset || !o->update)1925return0;19261927 len =check_leading_path(ce->name,ce_namelen(ce));1928if(!len)1929return0;1930else if(len >0) {1931char*path;1932int ret;19331934 path =xmemdupz(ce->name, len);1935if(lstat(path, &st))1936 ret =error_errno("cannot stat '%s'", path);1937else{1938if(submodule_from_ce(ce))1939 ret =check_submodule_move_head(ce,1940oid_to_hex(&ce->oid),1941 NULL, o);1942else1943 ret =check_ok_to_remove(path, len, DT_UNKNOWN, NULL,1944&st, error_type, o);1945}1946free(path);1947return ret;1948}else if(lstat(ce->name, &st)) {1949if(errno != ENOENT)1950returnerror_errno("cannot stat '%s'", ce->name);1951return0;1952}else{1953if(submodule_from_ce(ce))1954returncheck_submodule_move_head(ce,oid_to_hex(&ce->oid),1955 NULL, o);19561957returncheck_ok_to_remove(ce->name,ce_namelen(ce),1958ce_to_dtype(ce), ce, &st,1959 error_type, o);1960}1961}19621963static intverify_absent(const struct cache_entry *ce,1964enum unpack_trees_error_types error_type,1965struct unpack_trees_options *o)1966{1967if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1968return0;1969returnverify_absent_1(ce, error_type, o);1970}19711972static intverify_absent_sparse(const struct cache_entry *ce,1973enum unpack_trees_error_types error_type,1974struct unpack_trees_options *o)1975{1976enum unpack_trees_error_types orphaned_error = error_type;1977if(orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)1978 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;19791980returnverify_absent_1(ce, orphaned_error, o);1981}19821983static intmerged_entry(const struct cache_entry *ce,1984const struct cache_entry *old,1985struct unpack_trees_options *o)1986{1987int update = CE_UPDATE;1988struct cache_entry *merge =dup_cache_entry(ce, &o->result);19891990if(!old) {1991/*1992 * New index entries. In sparse checkout, the following1993 * verify_absent() will be delayed until after1994 * traverse_trees() finishes in unpack_trees(), then:1995 *1996 * - CE_NEW_SKIP_WORKTREE will be computed correctly1997 * - verify_absent() be called again, this time with1998 * correct CE_NEW_SKIP_WORKTREE1999 *2000 * verify_absent() call here does nothing in sparse2001 * checkout (i.e. o->skip_sparse_checkout == 0)2002 */2003 update |= CE_ADDED;2004 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;20052006if(verify_absent(merge,2007 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {2008discard_cache_entry(merge);2009return-1;2010}2011invalidate_ce_path(merge, o);20122013if(submodule_from_ce(ce)) {2014int ret =check_submodule_move_head(ce, NULL,2015oid_to_hex(&ce->oid),2016 o);2017if(ret)2018return ret;2019}20202021}else if(!(old->ce_flags & CE_CONFLICTED)) {2022/*2023 * See if we can re-use the old CE directly?2024 * That way we get the uptodate stat info.2025 *2026 * This also removes the UPDATE flag on a match; otherwise2027 * we will end up overwriting local changes in the work tree.2028 */2029if(same(old, merge)) {2030copy_cache_entry(merge, old);2031 update =0;2032}else{2033if(verify_uptodate(old, o)) {2034discard_cache_entry(merge);2035return-1;2036}2037/* Migrate old flags over */2038 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);2039invalidate_ce_path(old, o);2040}20412042if(submodule_from_ce(ce)) {2043int ret =check_submodule_move_head(ce,oid_to_hex(&old->oid),2044oid_to_hex(&ce->oid),2045 o);2046if(ret)2047return ret;2048}2049}else{2050/*2051 * Previously unmerged entry left as an existence2052 * marker by read_index_unmerged();2053 */2054invalidate_ce_path(old, o);2055}20562057do_add_entry(o, merge, update, CE_STAGEMASK);2058return1;2059}20602061static intdeleted_entry(const struct cache_entry *ce,2062const struct cache_entry *old,2063struct unpack_trees_options *o)2064{2065/* Did it exist in the index? */2066if(!old) {2067if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))2068return-1;2069return0;2070}2071if(!(old->ce_flags & CE_CONFLICTED) &&verify_uptodate(old, o))2072return-1;2073add_entry(o, ce, CE_REMOVE,0);2074invalidate_ce_path(ce, o);2075return1;2076}20772078static intkeep_entry(const struct cache_entry *ce,2079struct unpack_trees_options *o)2080{2081add_entry(o, ce,0,0);2082if(ce_stage(ce))2083invalidate_ce_path(ce, o);2084return1;2085}20862087#if DBRT_DEBUG2088static voidshow_stage_entry(FILE*o,2089const char*label,const struct cache_entry *ce)2090{2091if(!ce)2092fprintf(o,"%s(missing)\n", label);2093else2094fprintf(o,"%s%06o%s %d\t%s\n",2095 label,2096 ce->ce_mode,2097oid_to_hex(&ce->oid),2098ce_stage(ce),2099 ce->name);2100}2101#endif21022103intthreeway_merge(const struct cache_entry *const*stages,2104struct unpack_trees_options *o)2105{2106const struct cache_entry *index;2107const struct cache_entry *head;2108const struct cache_entry *remote = stages[o->head_idx +1];2109int count;2110int head_match =0;2111int remote_match =0;21122113int df_conflict_head =0;2114int df_conflict_remote =0;21152116int any_anc_missing =0;2117int no_anc_exists =1;2118int i;21192120for(i =1; i < o->head_idx; i++) {2121if(!stages[i] || stages[i] == o->df_conflict_entry)2122 any_anc_missing =1;2123else2124 no_anc_exists =0;2125}21262127 index = stages[0];2128 head = stages[o->head_idx];21292130if(head == o->df_conflict_entry) {2131 df_conflict_head =1;2132 head = NULL;2133}21342135if(remote == o->df_conflict_entry) {2136 df_conflict_remote =1;2137 remote = NULL;2138}21392140/*2141 * First, if there's a #16 situation, note that to prevent #132142 * and #14.2143 */2144if(!same(remote, head)) {2145for(i =1; i < o->head_idx; i++) {2146if(same(stages[i], head)) {2147 head_match = i;2148}2149if(same(stages[i], remote)) {2150 remote_match = i;2151}2152}2153}21542155/*2156 * We start with cases where the index is allowed to match2157 * something other than the head: #14(ALT) and #2ALT, where it2158 * is permitted to match the result instead.2159 */2160/* #14, #14ALT, #2ALT */2161if(remote && !df_conflict_head && head_match && !remote_match) {2162if(index && !same(index, remote) && !same(index, head))2163returnreject_merge(index, o);2164returnmerged_entry(remote, index, o);2165}2166/*2167 * If we have an entry in the index cache, then we want to2168 * make sure that it matches head.2169 */2170if(index && !same(index, head))2171returnreject_merge(index, o);21722173if(head) {2174/* #5ALT, #15 */2175if(same(head, remote))2176returnmerged_entry(head, index, o);2177/* #13, #3ALT */2178if(!df_conflict_remote && remote_match && !head_match)2179returnmerged_entry(head, index, o);2180}21812182/* #1 */2183if(!head && !remote && any_anc_missing)2184return0;21852186/*2187 * Under the "aggressive" rule, we resolve mostly trivial2188 * cases that we historically had git-merge-one-file resolve.2189 */2190if(o->aggressive) {2191int head_deleted = !head;2192int remote_deleted = !remote;2193const struct cache_entry *ce = NULL;21942195if(index)2196 ce = index;2197else if(head)2198 ce = head;2199else if(remote)2200 ce = remote;2201else{2202for(i =1; i < o->head_idx; i++) {2203if(stages[i] && stages[i] != o->df_conflict_entry) {2204 ce = stages[i];2205break;2206}2207}2208}22092210/*2211 * Deleted in both.2212 * Deleted in one and unchanged in the other.2213 */2214if((head_deleted && remote_deleted) ||2215(head_deleted && remote && remote_match) ||2216(remote_deleted && head && head_match)) {2217if(index)2218returndeleted_entry(index, index, o);2219if(ce && !head_deleted) {2220if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))2221return-1;2222}2223return0;2224}2225/*2226 * Added in both, identically.2227 */2228if(no_anc_exists && head && remote &&same(head, remote))2229returnmerged_entry(head, index, o);22302231}22322233/* Below are "no merge" cases, which require that the index be2234 * up-to-date to avoid the files getting overwritten with2235 * conflict resolution files.2236 */2237if(index) {2238if(verify_uptodate(index, o))2239return-1;2240}22412242 o->nontrivial_merge =1;22432244/* #2, #3, #4, #6, #7, #9, #10, #11. */2245 count =0;2246if(!head_match || !remote_match) {2247for(i =1; i < o->head_idx; i++) {2248if(stages[i] && stages[i] != o->df_conflict_entry) {2249keep_entry(stages[i], o);2250 count++;2251break;2252}2253}2254}2255#if DBRT_DEBUG2256else{2257fprintf(stderr,"read-tree: warning #16 detected\n");2258show_stage_entry(stderr,"head ", stages[head_match]);2259show_stage_entry(stderr,"remote ", stages[remote_match]);2260}2261#endif2262if(head) { count +=keep_entry(head, o); }2263if(remote) { count +=keep_entry(remote, o); }2264return count;2265}22662267/*2268 * Two-way merge.2269 *2270 * The rule is to "carry forward" what is in the index without losing2271 * information across a "fast-forward", favoring a successful merge2272 * over a merge failure when it makes sense. For details of the2273 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.2274 *2275 */2276inttwoway_merge(const struct cache_entry *const*src,2277struct unpack_trees_options *o)2278{2279const struct cache_entry *current = src[0];2280const struct cache_entry *oldtree = src[1];2281const struct cache_entry *newtree = src[2];22822283if(o->merge_size !=2)2284returnerror("Cannot do a twoway merge of%dtrees",2285 o->merge_size);22862287if(oldtree == o->df_conflict_entry)2288 oldtree = NULL;2289if(newtree == o->df_conflict_entry)2290 newtree = NULL;22912292if(current) {2293if(current->ce_flags & CE_CONFLICTED) {2294if(same(oldtree, newtree) || o->reset) {2295if(!newtree)2296returndeleted_entry(current, current, o);2297else2298returnmerged_entry(newtree, current, o);2299}2300returnreject_merge(current, o);2301}else if((!oldtree && !newtree) ||/* 4 and 5 */2302(!oldtree && newtree &&2303same(current, newtree)) ||/* 6 and 7 */2304(oldtree && newtree &&2305same(oldtree, newtree)) ||/* 14 and 15 */2306(oldtree && newtree &&2307!same(oldtree, newtree) &&/* 18 and 19 */2308same(current, newtree))) {2309returnkeep_entry(current, o);2310}else if(oldtree && !newtree &&same(current, oldtree)) {2311/* 10 or 11 */2312returndeleted_entry(oldtree, current, o);2313}else if(oldtree && newtree &&2314same(current, oldtree) && !same(current, newtree)) {2315/* 20 or 21 */2316returnmerged_entry(newtree, current, o);2317}else2318returnreject_merge(current, o);2319}2320else if(newtree) {2321if(oldtree && !o->initial_checkout) {2322/*2323 * deletion of the path was staged;2324 */2325if(same(oldtree, newtree))2326return1;2327returnreject_merge(oldtree, o);2328}2329returnmerged_entry(newtree, current, o);2330}2331returndeleted_entry(oldtree, current, o);2332}23332334/*2335 * Bind merge.2336 *2337 * Keep the index entries at stage0, collapse stage1 but make sure2338 * stage0 does not have anything there.2339 */2340intbind_merge(const struct cache_entry *const*src,2341struct unpack_trees_options *o)2342{2343const struct cache_entry *old = src[0];2344const struct cache_entry *a = src[1];23452346if(o->merge_size !=1)2347returnerror("Cannot do a bind merge of%dtrees",2348 o->merge_size);2349if(a && old)2350return o->quiet ? -1:2351error(ERRORMSG(o, ERROR_BIND_OVERLAP),2352super_prefixed(a->name),2353super_prefixed(old->name));2354if(!a)2355returnkeep_entry(old, o);2356else2357returnmerged_entry(a, NULL, o);2358}23592360/*2361 * One-way merge.2362 *2363 * The rule is:2364 * - take the stat information from stage0, take the data from stage12365 */2366intoneway_merge(const struct cache_entry *const*src,2367struct unpack_trees_options *o)2368{2369const struct cache_entry *old = src[0];2370const struct cache_entry *a = src[1];23712372if(o->merge_size !=1)2373returnerror("Cannot do a oneway merge of%dtrees",2374 o->merge_size);23752376if(!a || a == o->df_conflict_entry)2377returndeleted_entry(old, old, o);23782379if(old &&same(old, a)) {2380int update =0;2381if(o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {2382struct stat st;2383if(lstat(old->name, &st) ||2384ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))2385 update |= CE_UPDATE;2386}2387if(o->update &&S_ISGITLINK(old->ce_mode) &&2388should_update_submodules() && !verify_uptodate(old, o))2389 update |= CE_UPDATE;2390add_entry(o, old, update, CE_STAGEMASK);2391return0;2392}2393returnmerged_entry(a, old, o);2394}