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; 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) 422fetch_objects(repository_format_partial_clone, 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; 689size_t len =traverse_path_len(info,tree_entry_len(names)); 690char*name =xmalloc(len +1/* slash */+1/* NUL */); 691int pos; 692 693make_traverse_path(name, info, names->path, names->pathlen); 694 name[len++] ='/'; 695 name[len] ='\0'; 696 pos =index_name_pos(o->src_index, name, len); 697if(pos >=0) 698BUG("This is a directory and should not exist in index"); 699 pos = -pos -1; 700if(!starts_with(o->src_index->cache[pos]->name, name) || 701(pos >0&&starts_with(o->src_index->cache[pos-1]->name, name))) 702BUG("pos must point at the first entry in this directory"); 703free(name); 704return pos; 705} 706 707/* 708 * Fast path if we detect that all trees are the same as cache-tree at this 709 * path. We'll walk these trees in an iterative loop using cache-tree/index 710 * instead of ODB since we already know what these trees contain. 711 */ 712static inttraverse_by_cache_tree(int pos,int nr_entries,int nr_names, 713struct traverse_info *info) 714{ 715struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, }; 716struct unpack_trees_options *o = info->data; 717struct cache_entry *tree_ce = NULL; 718int ce_len =0; 719int i, d; 720 721if(!o->merge) 722BUG("We need cache-tree to do this optimization"); 723 724/* 725 * Do what unpack_callback() and unpack_nondirectories() normally 726 * do. But we walk all paths in an iterative loop instead. 727 * 728 * D/F conflicts and higher stage entries are not a concern 729 * because cache-tree would be invalidated and we would never 730 * get here in the first place. 731 */ 732for(i =0; i < nr_entries; i++) { 733int new_ce_len, len, rc; 734 735 src[0] = o->src_index->cache[pos + i]; 736 737 len =ce_namelen(src[0]); 738 new_ce_len =cache_entry_size(len); 739 740if(new_ce_len > ce_len) { 741 new_ce_len <<=1; 742 tree_ce =xrealloc(tree_ce, new_ce_len); 743memset(tree_ce,0, new_ce_len); 744 ce_len = new_ce_len; 745 746 tree_ce->ce_flags =create_ce_flags(0); 747 748for(d =1; d <= nr_names; d++) 749 src[d] = tree_ce; 750} 751 752 tree_ce->ce_mode = src[0]->ce_mode; 753 tree_ce->ce_namelen = len; 754oidcpy(&tree_ce->oid, &src[0]->oid); 755memcpy(tree_ce->name, src[0]->name, len +1); 756 757 rc =call_unpack_fn((const struct cache_entry *const*)src, o); 758if(rc <0) { 759free(tree_ce); 760return rc; 761} 762 763mark_ce_used(src[0], o); 764} 765free(tree_ce); 766if(o->debug_unpack) 767printf("Unpacked%dentries from%sto%susing cache-tree\n", 768 nr_entries, 769 o->src_index->cache[pos]->name, 770 o->src_index->cache[pos + nr_entries -1]->name); 771return0; 772} 773 774static inttraverse_trees_recursive(int n,unsigned long dirmask, 775unsigned long df_conflicts, 776struct name_entry *names, 777struct traverse_info *info) 778{ 779struct unpack_trees_options *o = info->data; 780int i, ret, bottom; 781int nr_buf =0; 782struct tree_desc t[MAX_UNPACK_TREES]; 783void*buf[MAX_UNPACK_TREES]; 784struct traverse_info newinfo; 785struct name_entry *p; 786int nr_entries; 787 788 nr_entries =all_trees_same_as_cache_tree(n, dirmask, names, info); 789if(nr_entries >0) { 790int pos =index_pos_by_traverse_info(names, info); 791 792if(!o->merge || df_conflicts) 793BUG("Wrong condition to get here buddy"); 794 795/* 796 * All entries up to 'pos' must have been processed 797 * (i.e. marked CE_UNPACKED) at this point. But to be safe, 798 * save and restore cache_bottom anyway to not miss 799 * unprocessed entries before 'pos'. 800 */ 801 bottom = o->cache_bottom; 802 ret =traverse_by_cache_tree(pos, nr_entries, n, info); 803 o->cache_bottom = bottom; 804return ret; 805} 806 807 p = names; 808while(!p->mode) 809 p++; 810 811 newinfo = *info; 812 newinfo.prev = info; 813 newinfo.pathspec = info->pathspec; 814 newinfo.name = p->path; 815 newinfo.namelen = p->pathlen; 816 newinfo.mode = p->mode; 817 newinfo.pathlen =st_add3(newinfo.pathlen,tree_entry_len(p),1); 818 newinfo.df_conflicts |= df_conflicts; 819 820/* 821 * Fetch the tree from the ODB for each peer directory in the 822 * n commits. 823 * 824 * For 2- and 3-way traversals, we try to avoid hitting the 825 * ODB twice for the same OID. This should yield a nice speed 826 * up in checkouts and merges when the commits are similar. 827 * 828 * We don't bother doing the full O(n^2) search for larger n, 829 * because wider traversals don't happen that often and we 830 * avoid the search setup. 831 * 832 * When 2 peer OIDs are the same, we just copy the tree 833 * descriptor data. This implicitly borrows the buffer 834 * data from the earlier cell. 835 */ 836for(i =0; i < n; i++, dirmask >>=1) { 837if(i >0&&are_same_oid(&names[i], &names[i -1])) 838 t[i] = t[i -1]; 839else if(i >1&&are_same_oid(&names[i], &names[i -2])) 840 t[i] = t[i -2]; 841else{ 842const struct object_id *oid = NULL; 843if(dirmask &1) 844 oid = &names[i].oid; 845 buf[nr_buf++] =fill_tree_descriptor(t + i, oid); 846} 847} 848 849 bottom =switch_cache_bottom(&newinfo); 850 ret =traverse_trees(o->src_index, n, t, &newinfo); 851restore_cache_bottom(&newinfo, bottom); 852 853for(i =0; i < nr_buf; i++) 854free(buf[i]); 855 856return ret; 857} 858 859/* 860 * Compare the traverse-path to the cache entry without actually 861 * having to generate the textual representation of the traverse 862 * path. 863 * 864 * NOTE! This *only* compares up to the size of the traverse path 865 * itself - the caller needs to do the final check for the cache 866 * entry having more data at the end! 867 */ 868static intdo_compare_entry_piecewise(const struct cache_entry *ce, 869const struct traverse_info *info, 870const char*name,size_t namelen, 871unsigned mode) 872{ 873int pathlen, ce_len; 874const char*ce_name; 875 876if(info->prev) { 877int cmp =do_compare_entry_piecewise(ce, info->prev, 878 info->name, info->namelen, 879 info->mode); 880if(cmp) 881return cmp; 882} 883 pathlen = info->pathlen; 884 ce_len =ce_namelen(ce); 885 886/* If ce_len < pathlen then we must have previously hit "name == directory" entry */ 887if(ce_len < pathlen) 888return-1; 889 890 ce_len -= pathlen; 891 ce_name = ce->name + pathlen; 892 893returndf_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode); 894} 895 896static intdo_compare_entry(const struct cache_entry *ce, 897const struct traverse_info *info, 898const char*name,size_t namelen, 899unsigned mode) 900{ 901int pathlen, ce_len; 902const char*ce_name; 903int cmp; 904 905/* 906 * If we have not precomputed the traverse path, it is quicker 907 * to avoid doing so. But if we have precomputed it, 908 * it is quicker to use the precomputed version. 909 */ 910if(!info->traverse_path) 911returndo_compare_entry_piecewise(ce, info, name, namelen, mode); 912 913 cmp =strncmp(ce->name, info->traverse_path, info->pathlen); 914if(cmp) 915return cmp; 916 917 pathlen = info->pathlen; 918 ce_len =ce_namelen(ce); 919 920if(ce_len < pathlen) 921return-1; 922 923 ce_len -= pathlen; 924 ce_name = ce->name + pathlen; 925 926returndf_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode); 927} 928 929static intcompare_entry(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 930{ 931int cmp =do_compare_entry(ce, info, n->path, n->pathlen, n->mode); 932if(cmp) 933return cmp; 934 935/* 936 * Even if the beginning compared identically, the ce should 937 * compare as bigger than a directory leading up to it! 938 */ 939returnce_namelen(ce) >traverse_path_len(info,tree_entry_len(n)); 940} 941 942static intce_in_traverse_path(const struct cache_entry *ce, 943const struct traverse_info *info) 944{ 945if(!info->prev) 946return1; 947if(do_compare_entry(ce, info->prev, 948 info->name, info->namelen, info->mode)) 949return0; 950/* 951 * If ce (blob) is the same name as the path (which is a tree 952 * we will be descending into), it won't be inside it. 953 */ 954return(info->pathlen <ce_namelen(ce)); 955} 956 957static struct cache_entry *create_ce_entry(const struct traverse_info *info, 958const struct name_entry *n, 959int stage, 960struct index_state *istate, 961int is_transient) 962{ 963size_t len =traverse_path_len(info,tree_entry_len(n)); 964struct cache_entry *ce = 965 is_transient ? 966make_empty_transient_cache_entry(len) : 967make_empty_cache_entry(istate, len); 968 969 ce->ce_mode =create_ce_mode(n->mode); 970 ce->ce_flags =create_ce_flags(stage); 971 ce->ce_namelen = len; 972oidcpy(&ce->oid, &n->oid); 973make_traverse_path(ce->name, info, n->path, n->pathlen); 974 975return ce; 976} 977 978/* 979 * Note that traverse_by_cache_tree() duplicates some logic in this function 980 * without actually calling it. If you change the logic here you may need to 981 * check and change there as well. 982 */ 983static intunpack_nondirectories(int n,unsigned long mask, 984unsigned long dirmask, 985struct cache_entry **src, 986const struct name_entry *names, 987const struct traverse_info *info) 988{ 989int i; 990struct unpack_trees_options *o = info->data; 991unsigned long conflicts = info->df_conflicts | dirmask; 992 993/* Do we have *only* directories? Nothing to do */ 994if(mask == dirmask && !src[0]) 995return0; 996 997/* 998 * Ok, we've filled in up to any potential index entry in src[0], 999 * now do the rest.1000 */1001for(i =0; i < n; i++) {1002int stage;1003unsigned int bit =1ul<< i;1004if(conflicts & bit) {1005 src[i + o->merge] = o->df_conflict_entry;1006continue;1007}1008if(!(mask & bit))1009continue;1010if(!o->merge)1011 stage =0;1012else if(i +1< o->head_idx)1013 stage =1;1014else if(i +1> o->head_idx)1015 stage =3;1016else1017 stage =2;10181019/*1020 * If the merge bit is set, then the cache entries are1021 * discarded in the following block. In this case,1022 * construct "transient" cache_entries, as they are1023 * not stored in the index. otherwise construct the1024 * cache entry from the index aware logic.1025 */1026 src[i + o->merge] =create_ce_entry(info, names + i, stage, &o->result, o->merge);1027}10281029if(o->merge) {1030int rc =call_unpack_fn((const struct cache_entry *const*)src,1031 o);1032for(i =0; i < n; i++) {1033struct cache_entry *ce = src[i + o->merge];1034if(ce != o->df_conflict_entry)1035discard_cache_entry(ce);1036}1037return rc;1038}10391040for(i =0; i < n; i++)1041if(src[i] && src[i] != o->df_conflict_entry)1042if(do_add_entry(o, src[i],0,0))1043return-1;10441045return0;1046}10471048static intunpack_failed(struct unpack_trees_options *o,const char*message)1049{1050discard_index(&o->result);1051if(!o->quiet && !o->exiting_early) {1052if(message)1053returnerror("%s", message);1054return-1;1055}1056return-1;1057}10581059/*1060 * The tree traversal is looking at name p. If we have a matching entry,1061 * return it. If name p is a directory in the index, do not return1062 * anything, as we will want to match it when the traversal descends into1063 * the directory.1064 */1065static intfind_cache_pos(struct traverse_info *info,1066const char*p,size_t p_len)1067{1068int pos;1069struct unpack_trees_options *o = info->data;1070struct index_state *index = o->src_index;1071int pfxlen = info->pathlen;10721073for(pos = o->cache_bottom; pos < index->cache_nr; pos++) {1074const struct cache_entry *ce = index->cache[pos];1075const char*ce_name, *ce_slash;1076int cmp, ce_len;10771078if(ce->ce_flags & CE_UNPACKED) {1079/*1080 * cache_bottom entry is already unpacked, so1081 * we can never match it; don't check it1082 * again.1083 */1084if(pos == o->cache_bottom)1085++o->cache_bottom;1086continue;1087}1088if(!ce_in_traverse_path(ce, info)) {1089/*1090 * Check if we can skip future cache checks1091 * (because we're already past all possible1092 * entries in the traverse path).1093 */1094if(info->traverse_path) {1095if(strncmp(ce->name, info->traverse_path,1096 info->pathlen) >0)1097break;1098}1099continue;1100}1101 ce_name = ce->name + pfxlen;1102 ce_slash =strchr(ce_name,'/');1103if(ce_slash)1104 ce_len = ce_slash - ce_name;1105else1106 ce_len =ce_namelen(ce) - pfxlen;1107 cmp =name_compare(p, p_len, ce_name, ce_len);1108/*1109 * Exact match; if we have a directory we need to1110 * delay returning it.1111 */1112if(!cmp)1113return ce_slash ? -2- pos : pos;1114if(0< cmp)1115continue;/* keep looking */1116/*1117 * ce_name sorts after p->path; could it be that we1118 * have files under p->path directory in the index?1119 * E.g. ce_name == "t-i", and p->path == "t"; we may1120 * have "t/a" in the index.1121 */1122if(p_len < ce_len && !memcmp(ce_name, p, p_len) &&1123 ce_name[p_len] <'/')1124continue;/* keep looking */1125break;1126}1127return-1;1128}11291130static struct cache_entry *find_cache_entry(struct traverse_info *info,1131const struct name_entry *p)1132{1133int pos =find_cache_pos(info, p->path, p->pathlen);1134struct unpack_trees_options *o = info->data;11351136if(0<= pos)1137return o->src_index->cache[pos];1138else1139return NULL;1140}11411142static voiddebug_path(struct traverse_info *info)1143{1144if(info->prev) {1145debug_path(info->prev);1146if(*info->prev->name)1147putchar('/');1148}1149printf("%s", info->name);1150}11511152static voiddebug_name_entry(int i,struct name_entry *n)1153{1154printf("ent#%d %06o%s\n", i,1155 n->path ? n->mode :0,1156 n->path ? n->path :"(missing)");1157}11581159static voiddebug_unpack_callback(int n,1160unsigned long mask,1161unsigned long dirmask,1162struct name_entry *names,1163struct traverse_info *info)1164{1165int i;1166printf("* unpack mask%lu, dirmask%lu, cnt%d",1167 mask, dirmask, n);1168debug_path(info);1169putchar('\n');1170for(i =0; i < n; i++)1171debug_name_entry(i, names + i);1172}11731174/*1175 * Note that traverse_by_cache_tree() duplicates some logic in this function1176 * without actually calling it. If you change the logic here you may need to1177 * check and change there as well.1178 */1179static intunpack_callback(int n,unsigned long mask,unsigned long dirmask,struct name_entry *names,struct traverse_info *info)1180{1181struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, };1182struct unpack_trees_options *o = info->data;1183const struct name_entry *p = names;11841185/* Find first entry with a real name (we could use "mask" too) */1186while(!p->mode)1187 p++;11881189if(o->debug_unpack)1190debug_unpack_callback(n, mask, dirmask, names, info);11911192/* Are we supposed to look at the index too? */1193if(o->merge) {1194while(1) {1195int cmp;1196struct cache_entry *ce;11971198if(o->diff_index_cached)1199 ce =next_cache_entry(o);1200else1201 ce =find_cache_entry(info, p);12021203if(!ce)1204break;1205 cmp =compare_entry(ce, info, p);1206if(cmp <0) {1207if(unpack_index_entry(ce, o) <0)1208returnunpack_failed(o, NULL);1209continue;1210}1211if(!cmp) {1212if(ce_stage(ce)) {1213/*1214 * If we skip unmerged index1215 * entries, we'll skip this1216 * entry *and* the tree1217 * entries associated with it!1218 */1219if(o->skip_unmerged) {1220add_same_unmerged(ce, o);1221return mask;1222}1223}1224 src[0] = ce;1225}1226break;1227}1228}12291230if(unpack_nondirectories(n, mask, dirmask, src, names, info) <0)1231return-1;12321233if(o->merge && src[0]) {1234if(ce_stage(src[0]))1235mark_ce_used_same_name(src[0], o);1236else1237mark_ce_used(src[0], o);1238}12391240/* Now handle any directories.. */1241if(dirmask) {1242/* special case: "diff-index --cached" looking at a tree */1243if(o->diff_index_cached &&1244 n ==1&& dirmask ==1&&S_ISDIR(names->mode)) {1245int matches;1246 matches =cache_tree_matches_traversal(o->src_index->cache_tree,1247 names, info);1248/*1249 * Everything under the name matches; skip the1250 * entire hierarchy. diff_index_cached codepath1251 * special cases D/F conflicts in such a way that1252 * it does not do any look-ahead, so this is safe.1253 */1254if(matches) {1255 o->cache_bottom += matches;1256return mask;1257}1258}12591260if(traverse_trees_recursive(n, dirmask, mask & ~dirmask,1261 names, info) <0)1262return-1;1263return mask;1264}12651266return mask;1267}12681269static intclear_ce_flags_1(struct index_state *istate,1270struct cache_entry **cache,int nr,1271struct strbuf *prefix,1272int select_mask,int clear_mask,1273struct exclude_list *el,int defval);12741275/* Whole directory matching */1276static intclear_ce_flags_dir(struct index_state *istate,1277struct cache_entry **cache,int nr,1278struct strbuf *prefix,1279char*basename,1280int select_mask,int clear_mask,1281struct exclude_list *el,int defval)1282{1283struct cache_entry **cache_end;1284int dtype = DT_DIR;1285int ret =is_excluded_from_list(prefix->buf, prefix->len,1286 basename, &dtype, el, istate);1287int rc;12881289strbuf_addch(prefix,'/');12901291/* If undecided, use matching result of parent dir in defval */1292if(ret <0)1293 ret = defval;12941295for(cache_end = cache; cache_end != cache + nr; cache_end++) {1296struct cache_entry *ce = *cache_end;1297if(strncmp(ce->name, prefix->buf, prefix->len))1298break;1299}13001301/*1302 * TODO: check el, if there are no patterns that may conflict1303 * with ret (iow, we know in advance the incl/excl1304 * decision for the entire directory), clear flag here without1305 * calling clear_ce_flags_1(). That function will call1306 * the expensive is_excluded_from_list() on every entry.1307 */1308 rc =clear_ce_flags_1(istate, cache, cache_end - cache,1309 prefix,1310 select_mask, clear_mask,1311 el, ret);1312strbuf_setlen(prefix, prefix->len -1);1313return rc;1314}13151316/*1317 * Traverse the index, find every entry that matches according to1318 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the1319 * number of traversed entries.1320 *1321 * If select_mask is non-zero, only entries whose ce_flags has on of1322 * those bits enabled are traversed.1323 *1324 * cache : pointer to an index entry1325 * prefix_len : an offset to its path1326 *1327 * The current path ("prefix") including the trailing '/' is1328 * cache[0]->name[0..(prefix_len-1)]1329 * Top level path has prefix_len zero.1330 */1331static intclear_ce_flags_1(struct index_state *istate,1332struct cache_entry **cache,int nr,1333struct strbuf *prefix,1334int select_mask,int clear_mask,1335struct exclude_list *el,int defval)1336{1337struct cache_entry **cache_end = cache + nr;13381339/*1340 * Process all entries that have the given prefix and meet1341 * select_mask condition1342 */1343while(cache != cache_end) {1344struct cache_entry *ce = *cache;1345const char*name, *slash;1346int len, dtype, ret;13471348if(select_mask && !(ce->ce_flags & select_mask)) {1349 cache++;1350continue;1351}13521353if(prefix->len &&strncmp(ce->name, prefix->buf, prefix->len))1354break;13551356 name = ce->name + prefix->len;1357 slash =strchr(name,'/');13581359/* If it's a directory, try whole directory match first */1360if(slash) {1361int processed;13621363 len = slash - name;1364strbuf_add(prefix, name, len);13651366 processed =clear_ce_flags_dir(istate, cache, cache_end - cache,1367 prefix,1368 prefix->buf + prefix->len - len,1369 select_mask, clear_mask,1370 el, defval);13711372/* clear_c_f_dir eats a whole dir already? */1373if(processed) {1374 cache += processed;1375strbuf_setlen(prefix, prefix->len - len);1376continue;1377}13781379strbuf_addch(prefix,'/');1380 cache +=clear_ce_flags_1(istate, cache, cache_end - cache,1381 prefix,1382 select_mask, clear_mask, el, defval);1383strbuf_setlen(prefix, prefix->len - len -1);1384continue;1385}13861387/* Non-directory */1388 dtype =ce_to_dtype(ce);1389 ret =is_excluded_from_list(ce->name,ce_namelen(ce),1390 name, &dtype, el, istate);1391if(ret <0)1392 ret = defval;1393if(ret >0)1394 ce->ce_flags &= ~clear_mask;1395 cache++;1396}1397return nr - (cache_end - cache);1398}13991400static intclear_ce_flags(struct index_state *istate,1401int select_mask,int clear_mask,1402struct exclude_list *el)1403{1404static struct strbuf prefix = STRBUF_INIT;14051406strbuf_reset(&prefix);14071408returnclear_ce_flags_1(istate,1409 istate->cache,1410 istate->cache_nr,1411&prefix,1412 select_mask, clear_mask,1413 el,0);1414}14151416/*1417 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout1418 */1419static voidmark_new_skip_worktree(struct exclude_list *el,1420struct index_state *istate,1421int select_flag,int skip_wt_flag)1422{1423int i;14241425/*1426 * 1. Pretend the narrowest worktree: only unmerged entries1427 * are checked out1428 */1429for(i =0; i < istate->cache_nr; i++) {1430struct cache_entry *ce = istate->cache[i];14311432if(select_flag && !(ce->ce_flags & select_flag))1433continue;14341435if(!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED))1436 ce->ce_flags |= skip_wt_flag;1437else1438 ce->ce_flags &= ~skip_wt_flag;1439}14401441/*1442 * 2. Widen worktree according to sparse-checkout file.1443 * Matched entries will have skip_wt_flag cleared (i.e. "in")1444 */1445clear_ce_flags(istate, select_flag, skip_wt_flag, el);1446}14471448static intverify_absent(const struct cache_entry *,1449enum unpack_trees_error_types,1450struct unpack_trees_options *);1451/*1452 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the1453 * resulting index, -2 on failure to reflect the changes to the work tree.1454 *1455 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally1456 */1457intunpack_trees(unsigned len,struct tree_desc *t,struct unpack_trees_options *o)1458{1459int i, ret;1460static struct cache_entry *dfc;1461struct exclude_list el;14621463if(len > MAX_UNPACK_TREES)1464die("unpack_trees takes at most%dtrees", MAX_UNPACK_TREES);14651466trace_performance_enter();1467memset(&el,0,sizeof(el));1468if(!core_apply_sparse_checkout || !o->update)1469 o->skip_sparse_checkout =1;1470if(!o->skip_sparse_checkout) {1471char*sparse =git_pathdup("info/sparse-checkout");1472if(add_excludes_from_file_to_list(sparse,"",0, &el, NULL) <0)1473 o->skip_sparse_checkout =1;1474else1475 o->el = ⪙1476free(sparse);1477}14781479memset(&o->result,0,sizeof(o->result));1480 o->result.initialized =1;1481 o->result.timestamp.sec = o->src_index->timestamp.sec;1482 o->result.timestamp.nsec = o->src_index->timestamp.nsec;1483 o->result.version = o->src_index->version;1484if(!o->src_index->split_index) {1485 o->result.split_index = NULL;1486}else if(o->src_index == o->dst_index) {1487/*1488 * o->dst_index (and thus o->src_index) will be discarded1489 * and overwritten with o->result at the end of this function,1490 * so just use src_index's split_index to avoid having to1491 * create a new one.1492 */1493 o->result.split_index = o->src_index->split_index;1494 o->result.split_index->refcount++;1495}else{1496 o->result.split_index =init_split_index(&o->result);1497}1498oidcpy(&o->result.oid, &o->src_index->oid);1499 o->merge_size = len;1500mark_all_ce_unused(o->src_index);15011502/*1503 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries1504 */1505if(!o->skip_sparse_checkout)1506mark_new_skip_worktree(o->el, o->src_index,0, CE_NEW_SKIP_WORKTREE);15071508if(!dfc)1509 dfc =xcalloc(1,cache_entry_size(0));1510 o->df_conflict_entry = dfc;15111512if(len) {1513const char*prefix = o->prefix ? o->prefix :"";1514struct traverse_info info;15151516setup_traverse_info(&info, prefix);1517 info.fn = unpack_callback;1518 info.data = o;1519 info.show_all_errors = o->show_all_errors;1520 info.pathspec = o->pathspec;15211522if(o->prefix) {1523/*1524 * Unpack existing index entries that sort before the1525 * prefix the tree is spliced into. Note that o->merge1526 * is always true in this case.1527 */1528while(1) {1529struct cache_entry *ce =next_cache_entry(o);1530if(!ce)1531break;1532if(ce_in_traverse_path(ce, &info))1533break;1534if(unpack_index_entry(ce, o) <0)1535goto return_failed;1536}1537}15381539trace_performance_enter();1540 ret =traverse_trees(o->src_index, len, t, &info);1541trace_performance_leave("traverse_trees");1542if(ret <0)1543goto return_failed;1544}15451546/* Any left-over entries in the index? */1547if(o->merge) {1548while(1) {1549struct cache_entry *ce =next_cache_entry(o);1550if(!ce)1551break;1552if(unpack_index_entry(ce, o) <0)1553goto return_failed;1554}1555}1556mark_all_ce_unused(o->src_index);15571558if(o->trivial_merges_only && o->nontrivial_merge) {1559 ret =unpack_failed(o,"Merge requires file-level merging");1560goto done;1561}15621563if(!o->skip_sparse_checkout) {1564int empty_worktree =1;15651566/*1567 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #11568 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE1569 * so apply_sparse_checkout() won't attempt to remove it from worktree1570 */1571mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);15721573 ret =0;1574for(i =0; i < o->result.cache_nr; i++) {1575struct cache_entry *ce = o->result.cache[i];15761577/*1578 * Entries marked with CE_ADDED in merged_entry() do not have1579 * verify_absent() check (the check is effectively disabled1580 * because CE_NEW_SKIP_WORKTREE is set unconditionally).1581 *1582 * Do the real check now because we have had1583 * correct CE_NEW_SKIP_WORKTREE1584 */1585if(ce->ce_flags & CE_ADDED &&1586verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1587if(!o->show_all_errors)1588goto return_failed;1589 ret = -1;1590}15911592if(apply_sparse_checkout(&o->result, ce, o)) {1593if(!o->show_all_errors)1594goto return_failed;1595 ret = -1;1596}1597if(!ce_skip_worktree(ce))1598 empty_worktree =0;15991600}1601if(ret <0)1602goto return_failed;1603/*1604 * Sparse checkout is meant to narrow down checkout area1605 * but it does not make sense to narrow down to empty working1606 * tree. This is usually a mistake in sparse checkout rules.1607 * Do not allow users to do that.1608 */1609if(o->result.cache_nr && empty_worktree) {1610 ret =unpack_failed(o,"Sparse checkout leaves no entry on working directory");1611goto done;1612}1613}16141615 ret =check_updates(o) ? (-2) :0;1616if(o->dst_index) {1617move_index_extensions(&o->result, o->src_index);1618if(!ret) {1619if(git_env_bool("GIT_TEST_CHECK_CACHE_TREE",0))1620cache_tree_verify(the_repository, &o->result);1621if(!o->result.cache_tree)1622 o->result.cache_tree =cache_tree();1623if(!cache_tree_fully_valid(o->result.cache_tree))1624cache_tree_update(&o->result,1625 WRITE_TREE_SILENT |1626 WRITE_TREE_REPAIR);1627}16281629 o->result.updated_workdir =1;1630discard_index(o->dst_index);1631*o->dst_index = o->result;1632}else{1633discard_index(&o->result);1634}1635 o->src_index = NULL;16361637done:1638trace_performance_leave("unpack_trees");1639clear_exclude_list(&el);1640return ret;16411642return_failed:1643if(o->show_all_errors)1644display_error_msgs(o);1645mark_all_ce_unused(o->src_index);1646 ret =unpack_failed(o, NULL);1647if(o->exiting_early)1648 ret =0;1649goto done;1650}16511652/* Here come the merge functions */16531654static intreject_merge(const struct cache_entry *ce,1655struct unpack_trees_options *o)1656{1657returnadd_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);1658}16591660static intsame(const struct cache_entry *a,const struct cache_entry *b)1661{1662if(!!a != !!b)1663return0;1664if(!a && !b)1665return1;1666if((a->ce_flags | b->ce_flags) & CE_CONFLICTED)1667return0;1668return a->ce_mode == b->ce_mode &&1669oideq(&a->oid, &b->oid);1670}167116721673/*1674 * When a CE gets turned into an unmerged entry, we1675 * want it to be up-to-date1676 */1677static intverify_uptodate_1(const struct cache_entry *ce,1678struct unpack_trees_options *o,1679enum unpack_trees_error_types error_type)1680{1681struct stat st;16821683if(o->index_only)1684return0;16851686/*1687 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again1688 * if this entry is truly up-to-date because this file may be1689 * overwritten.1690 */1691if((ce->ce_flags & CE_VALID) ||ce_skip_worktree(ce))1692;/* keep checking */1693else if(o->reset ||ce_uptodate(ce))1694return0;16951696if(!lstat(ce->name, &st)) {1697int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;1698unsigned changed =ie_match_stat(o->src_index, ce, &st, flags);16991700if(submodule_from_ce(ce)) {1701int r =check_submodule_move_head(ce,1702"HEAD",oid_to_hex(&ce->oid), o);1703if(r)1704returnadd_rejected_path(o, error_type, ce->name);1705return0;1706}17071708if(!changed)1709return0;1710/*1711 * Historic default policy was to allow submodule to be out1712 * of sync wrt the superproject index. If the submodule was1713 * not considered interesting above, we don't care here.1714 */1715if(S_ISGITLINK(ce->ce_mode))1716return0;17171718 errno =0;1719}1720if(errno == ENOENT)1721return0;1722returnadd_rejected_path(o, error_type, ce->name);1723}17241725intverify_uptodate(const struct cache_entry *ce,1726struct unpack_trees_options *o)1727{1728if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1729return0;1730returnverify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);1731}17321733static intverify_uptodate_sparse(const struct cache_entry *ce,1734struct unpack_trees_options *o)1735{1736returnverify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);1737}17381739/*1740 * TODO: We should actually invalidate o->result, not src_index [1].1741 * But since cache tree and untracked cache both are not copied to1742 * o->result until unpacking is complete, we invalidate them on1743 * src_index instead with the assumption that they will be copied to1744 * dst_index at the end.1745 *1746 * [1] src_index->cache_tree is also used in unpack_callback() so if1747 * we invalidate o->result, we need to update it to use1748 * o->result.cache_tree as well.1749 */1750static voidinvalidate_ce_path(const struct cache_entry *ce,1751struct unpack_trees_options *o)1752{1753if(!ce)1754return;1755cache_tree_invalidate_path(o->src_index, ce->name);1756untracked_cache_invalidate_path(o->src_index, ce->name,1);1757}17581759/*1760 * Check that checking out ce->sha1 in subdir ce->name is not1761 * going to overwrite any working files.1762 *1763 * Currently, git does not checkout subprojects during a superproject1764 * checkout, so it is not going to overwrite anything.1765 */1766static intverify_clean_submodule(const char*old_sha1,1767const struct cache_entry *ce,1768struct unpack_trees_options *o)1769{1770if(!submodule_from_ce(ce))1771return0;17721773returncheck_submodule_move_head(ce, old_sha1,1774oid_to_hex(&ce->oid), o);1775}17761777static intverify_clean_subdirectory(const struct cache_entry *ce,1778struct unpack_trees_options *o)1779{1780/*1781 * we are about to extract "ce->name"; we would not want to lose1782 * anything in the existing directory there.1783 */1784int namelen;1785int i;1786struct dir_struct d;1787char*pathbuf;1788int cnt =0;17891790if(S_ISGITLINK(ce->ce_mode)) {1791struct object_id oid;1792int sub_head =resolve_gitlink_ref(ce->name,"HEAD", &oid);1793/*1794 * If we are not going to update the submodule, then1795 * we don't care.1796 */1797if(!sub_head &&oideq(&oid, &ce->oid))1798return0;1799returnverify_clean_submodule(sub_head ? NULL :oid_to_hex(&oid),1800 ce, o);1801}18021803/*1804 * First let's make sure we do not have a local modification1805 * in that directory.1806 */1807 namelen =ce_namelen(ce);1808for(i =locate_in_src_index(ce, o);1809 i < o->src_index->cache_nr;1810 i++) {1811struct cache_entry *ce2 = o->src_index->cache[i];1812int len =ce_namelen(ce2);1813if(len < namelen ||1814strncmp(ce->name, ce2->name, namelen) ||1815 ce2->name[namelen] !='/')1816break;1817/*1818 * ce2->name is an entry in the subdirectory to be1819 * removed.1820 */1821if(!ce_stage(ce2)) {1822if(verify_uptodate(ce2, o))1823return-1;1824add_entry(o, ce2, CE_REMOVE,0);1825invalidate_ce_path(ce, o);1826mark_ce_used(ce2, o);1827}1828 cnt++;1829}18301831/*1832 * Then we need to make sure that we do not lose a locally1833 * present file that is not ignored.1834 */1835 pathbuf =xstrfmt("%.*s/", namelen, ce->name);18361837memset(&d,0,sizeof(d));1838if(o->dir)1839 d.exclude_per_dir = o->dir->exclude_per_dir;1840 i =read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);1841if(i)1842returnadd_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);1843free(pathbuf);1844return cnt;1845}18461847/*1848 * This gets called when there was no index entry for the tree entry 'dst',1849 * but we found a file in the working tree that 'lstat()' said was fine,1850 * and we're on a case-insensitive filesystem.1851 *1852 * See if we can find a case-insensitive match in the index that also1853 * matches the stat information, and assume it's that other file!1854 */1855static inticase_exists(struct unpack_trees_options *o,const char*name,int len,struct stat *st)1856{1857const struct cache_entry *src;18581859 src =index_file_exists(o->src_index, name, len,1);1860return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);1861}18621863static intcheck_ok_to_remove(const char*name,int len,int dtype,1864const struct cache_entry *ce,struct stat *st,1865enum unpack_trees_error_types error_type,1866struct unpack_trees_options *o)1867{1868const struct cache_entry *result;18691870/*1871 * It may be that the 'lstat()' succeeded even though1872 * target 'ce' was absent, because there is an old1873 * entry that is different only in case..1874 *1875 * Ignore that lstat() if it matches.1876 */1877if(ignore_case &&icase_exists(o, name, len, st))1878return0;18791880if(o->dir &&1881is_excluded(o->dir, o->src_index, name, &dtype))1882/*1883 * ce->name is explicitly excluded, so it is Ok to1884 * overwrite it.1885 */1886return0;1887if(S_ISDIR(st->st_mode)) {1888/*1889 * We are checking out path "foo" and1890 * found "foo/." in the working tree.1891 * This is tricky -- if we have modified1892 * files that are in "foo/" we would lose1893 * them.1894 */1895if(verify_clean_subdirectory(ce, o) <0)1896return-1;1897return0;1898}18991900/*1901 * The previous round may already have decided to1902 * delete this path, which is in a subdirectory that1903 * is being replaced with a blob.1904 */1905 result =index_file_exists(&o->result, name, len,0);1906if(result) {1907if(result->ce_flags & CE_REMOVE)1908return0;1909}19101911returnadd_rejected_path(o, error_type, name);1912}19131914/*1915 * We do not want to remove or overwrite a working tree file that1916 * is not tracked, unless it is ignored.1917 */1918static intverify_absent_1(const struct cache_entry *ce,1919enum unpack_trees_error_types error_type,1920struct unpack_trees_options *o)1921{1922int len;1923struct stat st;19241925if(o->index_only || o->reset || !o->update)1926return0;19271928 len =check_leading_path(ce->name,ce_namelen(ce));1929if(!len)1930return0;1931else if(len >0) {1932char*path;1933int ret;19341935 path =xmemdupz(ce->name, len);1936if(lstat(path, &st))1937 ret =error_errno("cannot stat '%s'", path);1938else{1939if(submodule_from_ce(ce))1940 ret =check_submodule_move_head(ce,1941oid_to_hex(&ce->oid),1942 NULL, o);1943else1944 ret =check_ok_to_remove(path, len, DT_UNKNOWN, NULL,1945&st, error_type, o);1946}1947free(path);1948return ret;1949}else if(lstat(ce->name, &st)) {1950if(errno != ENOENT)1951returnerror_errno("cannot stat '%s'", ce->name);1952return0;1953}else{1954if(submodule_from_ce(ce))1955returncheck_submodule_move_head(ce,oid_to_hex(&ce->oid),1956 NULL, o);19571958returncheck_ok_to_remove(ce->name,ce_namelen(ce),1959ce_to_dtype(ce), ce, &st,1960 error_type, o);1961}1962}19631964static intverify_absent(const struct cache_entry *ce,1965enum unpack_trees_error_types error_type,1966struct unpack_trees_options *o)1967{1968if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1969return0;1970returnverify_absent_1(ce, error_type, o);1971}19721973static intverify_absent_sparse(const struct cache_entry *ce,1974enum unpack_trees_error_types error_type,1975struct unpack_trees_options *o)1976{1977enum unpack_trees_error_types orphaned_error = error_type;1978if(orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)1979 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;19801981returnverify_absent_1(ce, orphaned_error, o);1982}19831984static intmerged_entry(const struct cache_entry *ce,1985const struct cache_entry *old,1986struct unpack_trees_options *o)1987{1988int update = CE_UPDATE;1989struct cache_entry *merge =dup_cache_entry(ce, &o->result);19901991if(!old) {1992/*1993 * New index entries. In sparse checkout, the following1994 * verify_absent() will be delayed until after1995 * traverse_trees() finishes in unpack_trees(), then:1996 *1997 * - CE_NEW_SKIP_WORKTREE will be computed correctly1998 * - verify_absent() be called again, this time with1999 * correct CE_NEW_SKIP_WORKTREE2000 *2001 * verify_absent() call here does nothing in sparse2002 * checkout (i.e. o->skip_sparse_checkout == 0)2003 */2004 update |= CE_ADDED;2005 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;20062007if(verify_absent(merge,2008 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {2009discard_cache_entry(merge);2010return-1;2011}2012invalidate_ce_path(merge, o);20132014if(submodule_from_ce(ce)) {2015int ret =check_submodule_move_head(ce, NULL,2016oid_to_hex(&ce->oid),2017 o);2018if(ret)2019return ret;2020}20212022}else if(!(old->ce_flags & CE_CONFLICTED)) {2023/*2024 * See if we can re-use the old CE directly?2025 * That way we get the uptodate stat info.2026 *2027 * This also removes the UPDATE flag on a match; otherwise2028 * we will end up overwriting local changes in the work tree.2029 */2030if(same(old, merge)) {2031copy_cache_entry(merge, old);2032 update =0;2033}else{2034if(verify_uptodate(old, o)) {2035discard_cache_entry(merge);2036return-1;2037}2038/* Migrate old flags over */2039 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);2040invalidate_ce_path(old, o);2041}20422043if(submodule_from_ce(ce)) {2044int ret =check_submodule_move_head(ce,oid_to_hex(&old->oid),2045oid_to_hex(&ce->oid),2046 o);2047if(ret)2048return ret;2049}2050}else{2051/*2052 * Previously unmerged entry left as an existence2053 * marker by read_index_unmerged();2054 */2055invalidate_ce_path(old, o);2056}20572058do_add_entry(o, merge, update, CE_STAGEMASK);2059return1;2060}20612062static intdeleted_entry(const struct cache_entry *ce,2063const struct cache_entry *old,2064struct unpack_trees_options *o)2065{2066/* Did it exist in the index? */2067if(!old) {2068if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))2069return-1;2070return0;2071}2072if(!(old->ce_flags & CE_CONFLICTED) &&verify_uptodate(old, o))2073return-1;2074add_entry(o, ce, CE_REMOVE,0);2075invalidate_ce_path(ce, o);2076return1;2077}20782079static intkeep_entry(const struct cache_entry *ce,2080struct unpack_trees_options *o)2081{2082add_entry(o, ce,0,0);2083if(ce_stage(ce))2084invalidate_ce_path(ce, o);2085return1;2086}20872088#if DBRT_DEBUG2089static voidshow_stage_entry(FILE*o,2090const char*label,const struct cache_entry *ce)2091{2092if(!ce)2093fprintf(o,"%s(missing)\n", label);2094else2095fprintf(o,"%s%06o%s %d\t%s\n",2096 label,2097 ce->ce_mode,2098oid_to_hex(&ce->oid),2099ce_stage(ce),2100 ce->name);2101}2102#endif21032104intthreeway_merge(const struct cache_entry *const*stages,2105struct unpack_trees_options *o)2106{2107const struct cache_entry *index;2108const struct cache_entry *head;2109const struct cache_entry *remote = stages[o->head_idx +1];2110int count;2111int head_match =0;2112int remote_match =0;21132114int df_conflict_head =0;2115int df_conflict_remote =0;21162117int any_anc_missing =0;2118int no_anc_exists =1;2119int i;21202121for(i =1; i < o->head_idx; i++) {2122if(!stages[i] || stages[i] == o->df_conflict_entry)2123 any_anc_missing =1;2124else2125 no_anc_exists =0;2126}21272128 index = stages[0];2129 head = stages[o->head_idx];21302131if(head == o->df_conflict_entry) {2132 df_conflict_head =1;2133 head = NULL;2134}21352136if(remote == o->df_conflict_entry) {2137 df_conflict_remote =1;2138 remote = NULL;2139}21402141/*2142 * First, if there's a #16 situation, note that to prevent #132143 * and #14.2144 */2145if(!same(remote, head)) {2146for(i =1; i < o->head_idx; i++) {2147if(same(stages[i], head)) {2148 head_match = i;2149}2150if(same(stages[i], remote)) {2151 remote_match = i;2152}2153}2154}21552156/*2157 * We start with cases where the index is allowed to match2158 * something other than the head: #14(ALT) and #2ALT, where it2159 * is permitted to match the result instead.2160 */2161/* #14, #14ALT, #2ALT */2162if(remote && !df_conflict_head && head_match && !remote_match) {2163if(index && !same(index, remote) && !same(index, head))2164returnreject_merge(index, o);2165returnmerged_entry(remote, index, o);2166}2167/*2168 * If we have an entry in the index cache, then we want to2169 * make sure that it matches head.2170 */2171if(index && !same(index, head))2172returnreject_merge(index, o);21732174if(head) {2175/* #5ALT, #15 */2176if(same(head, remote))2177returnmerged_entry(head, index, o);2178/* #13, #3ALT */2179if(!df_conflict_remote && remote_match && !head_match)2180returnmerged_entry(head, index, o);2181}21822183/* #1 */2184if(!head && !remote && any_anc_missing)2185return0;21862187/*2188 * Under the "aggressive" rule, we resolve mostly trivial2189 * cases that we historically had git-merge-one-file resolve.2190 */2191if(o->aggressive) {2192int head_deleted = !head;2193int remote_deleted = !remote;2194const struct cache_entry *ce = NULL;21952196if(index)2197 ce = index;2198else if(head)2199 ce = head;2200else if(remote)2201 ce = remote;2202else{2203for(i =1; i < o->head_idx; i++) {2204if(stages[i] && stages[i] != o->df_conflict_entry) {2205 ce = stages[i];2206break;2207}2208}2209}22102211/*2212 * Deleted in both.2213 * Deleted in one and unchanged in the other.2214 */2215if((head_deleted && remote_deleted) ||2216(head_deleted && remote && remote_match) ||2217(remote_deleted && head && head_match)) {2218if(index)2219returndeleted_entry(index, index, o);2220if(ce && !head_deleted) {2221if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))2222return-1;2223}2224return0;2225}2226/*2227 * Added in both, identically.2228 */2229if(no_anc_exists && head && remote &&same(head, remote))2230returnmerged_entry(head, index, o);22312232}22332234/* Below are "no merge" cases, which require that the index be2235 * up-to-date to avoid the files getting overwritten with2236 * conflict resolution files.2237 */2238if(index) {2239if(verify_uptodate(index, o))2240return-1;2241}22422243 o->nontrivial_merge =1;22442245/* #2, #3, #4, #6, #7, #9, #10, #11. */2246 count =0;2247if(!head_match || !remote_match) {2248for(i =1; i < o->head_idx; i++) {2249if(stages[i] && stages[i] != o->df_conflict_entry) {2250keep_entry(stages[i], o);2251 count++;2252break;2253}2254}2255}2256#if DBRT_DEBUG2257else{2258fprintf(stderr,"read-tree: warning #16 detected\n");2259show_stage_entry(stderr,"head ", stages[head_match]);2260show_stage_entry(stderr,"remote ", stages[remote_match]);2261}2262#endif2263if(head) { count +=keep_entry(head, o); }2264if(remote) { count +=keep_entry(remote, o); }2265return count;2266}22672268/*2269 * Two-way merge.2270 *2271 * The rule is to "carry forward" what is in the index without losing2272 * information across a "fast-forward", favoring a successful merge2273 * over a merge failure when it makes sense. For details of the2274 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.2275 *2276 */2277inttwoway_merge(const struct cache_entry *const*src,2278struct unpack_trees_options *o)2279{2280const struct cache_entry *current = src[0];2281const struct cache_entry *oldtree = src[1];2282const struct cache_entry *newtree = src[2];22832284if(o->merge_size !=2)2285returnerror("Cannot do a twoway merge of%dtrees",2286 o->merge_size);22872288if(oldtree == o->df_conflict_entry)2289 oldtree = NULL;2290if(newtree == o->df_conflict_entry)2291 newtree = NULL;22922293if(current) {2294if(current->ce_flags & CE_CONFLICTED) {2295if(same(oldtree, newtree) || o->reset) {2296if(!newtree)2297returndeleted_entry(current, current, o);2298else2299returnmerged_entry(newtree, current, o);2300}2301returnreject_merge(current, o);2302}else if((!oldtree && !newtree) ||/* 4 and 5 */2303(!oldtree && newtree &&2304same(current, newtree)) ||/* 6 and 7 */2305(oldtree && newtree &&2306same(oldtree, newtree)) ||/* 14 and 15 */2307(oldtree && newtree &&2308!same(oldtree, newtree) &&/* 18 and 19 */2309same(current, newtree))) {2310returnkeep_entry(current, o);2311}else if(oldtree && !newtree &&same(current, oldtree)) {2312/* 10 or 11 */2313returndeleted_entry(oldtree, current, o);2314}else if(oldtree && newtree &&2315same(current, oldtree) && !same(current, newtree)) {2316/* 20 or 21 */2317returnmerged_entry(newtree, current, o);2318}else2319returnreject_merge(current, o);2320}2321else if(newtree) {2322if(oldtree && !o->initial_checkout) {2323/*2324 * deletion of the path was staged;2325 */2326if(same(oldtree, newtree))2327return1;2328returnreject_merge(oldtree, o);2329}2330returnmerged_entry(newtree, current, o);2331}2332returndeleted_entry(oldtree, current, o);2333}23342335/*2336 * Bind merge.2337 *2338 * Keep the index entries at stage0, collapse stage1 but make sure2339 * stage0 does not have anything there.2340 */2341intbind_merge(const struct cache_entry *const*src,2342struct unpack_trees_options *o)2343{2344const struct cache_entry *old = src[0];2345const struct cache_entry *a = src[1];23462347if(o->merge_size !=1)2348returnerror("Cannot do a bind merge of%dtrees",2349 o->merge_size);2350if(a && old)2351return o->quiet ? -1:2352error(ERRORMSG(o, ERROR_BIND_OVERLAP),2353super_prefixed(a->name),2354super_prefixed(old->name));2355if(!a)2356returnkeep_entry(old, o);2357else2358returnmerged_entry(a, NULL, o);2359}23602361/*2362 * One-way merge.2363 *2364 * The rule is:2365 * - take the stat information from stage0, take the data from stage12366 */2367intoneway_merge(const struct cache_entry *const*src,2368struct unpack_trees_options *o)2369{2370const struct cache_entry *old = src[0];2371const struct cache_entry *a = src[1];23722373if(o->merge_size !=1)2374returnerror("Cannot do a oneway merge of%dtrees",2375 o->merge_size);23762377if(!a || a == o->df_conflict_entry)2378returndeleted_entry(old, old, o);23792380if(old &&same(old, a)) {2381int update =0;2382if(o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {2383struct stat st;2384if(lstat(old->name, &st) ||2385ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))2386 update |= CE_UPDATE;2387}2388if(o->update &&S_ISGITLINK(old->ce_mode) &&2389should_update_submodules() && !verify_uptodate(old, o))2390 update |= CE_UPDATE;2391add_entry(o, old, update, CE_STAGEMASK);2392return0;2393}2394returnmerged_entry(a, old, o);2395}