1#define NO_THE_INDEX_COMPATIBILITY_MACROS 2#include"cache.h" 3#include"argv-array.h" 4#include"repository.h" 5#include"config.h" 6#include"dir.h" 7#include"tree.h" 8#include"tree-walk.h" 9#include"cache-tree.h" 10#include"unpack-trees.h" 11#include"progress.h" 12#include"refs.h" 13#include"attr.h" 14#include"split-index.h" 15#include"dir.h" 16#include"submodule.h" 17#include"submodule-config.h" 18#include"fsmonitor.h" 19#include"object-store.h" 20#include"fetch-object.h" 21 22/* 23 * Error messages expected by scripts out of plumbing commands such as 24 * read-tree. Non-scripted Porcelain is not required to use these messages 25 * and in fact are encouraged to reword them to better suit their particular 26 * situation better. See how "git checkout" and "git merge" replaces 27 * them using setup_unpack_trees_porcelain(), for example. 28 */ 29static const char*unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { 30/* ERROR_WOULD_OVERWRITE */ 31"Entry '%s' would be overwritten by merge. Cannot merge.", 32 33/* ERROR_NOT_UPTODATE_FILE */ 34"Entry '%s' not uptodate. Cannot merge.", 35 36/* ERROR_NOT_UPTODATE_DIR */ 37"Updating '%s' would lose untracked files in it", 38 39/* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */ 40"Untracked working tree file '%s' would be overwritten by merge.", 41 42/* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */ 43"Untracked working tree file '%s' would be removed by merge.", 44 45/* ERROR_BIND_OVERLAP */ 46"Entry '%s' overlaps with '%s'. Cannot bind.", 47 48/* ERROR_SPARSE_NOT_UPTODATE_FILE */ 49"Entry '%s' not uptodate. Cannot update sparse checkout.", 50 51/* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ 52"Working tree file '%s' would be overwritten by sparse checkout update.", 53 54/* ERROR_WOULD_LOSE_ORPHANED_REMOVED */ 55"Working tree file '%s' would be removed by sparse checkout update.", 56 57/* ERROR_WOULD_LOSE_SUBMODULE */ 58"Submodule '%s' cannot checkout new HEAD.", 59}; 60 61#define ERRORMSG(o,type) \ 62 ( ((o) && (o)->msgs[(type)]) \ 63 ? ((o)->msgs[(type)]) \ 64 : (unpack_plumbing_errors[(type)]) ) 65 66static const char*super_prefixed(const char*path) 67{ 68/* 69 * It is necessary and sufficient to have two static buffers 70 * here, as the return value of this function is fed to 71 * error() using the unpack_*_errors[] templates we see above. 72 */ 73static struct strbuf buf[2] = {STRBUF_INIT, STRBUF_INIT}; 74static int super_prefix_len = -1; 75static unsigned idx =ARRAY_SIZE(buf) -1; 76 77if(super_prefix_len <0) { 78const char*super_prefix =get_super_prefix(); 79if(!super_prefix) { 80 super_prefix_len =0; 81}else{ 82int i; 83for(i =0; i <ARRAY_SIZE(buf); i++) 84strbuf_addstr(&buf[i], super_prefix); 85 super_prefix_len = buf[0].len; 86} 87} 88 89if(!super_prefix_len) 90return path; 91 92if(++idx >=ARRAY_SIZE(buf)) 93 idx =0; 94 95strbuf_setlen(&buf[idx], super_prefix_len); 96strbuf_addstr(&buf[idx], path); 97 98return buf[idx].buf; 99} 100 101voidsetup_unpack_trees_porcelain(struct unpack_trees_options *opts, 102const char*cmd) 103{ 104int i; 105const char**msgs = opts->msgs; 106const char*msg; 107 108argv_array_init(&opts->msgs_to_free); 109 110if(!strcmp(cmd,"checkout")) 111 msg = advice_commit_before_merge 112?_("Your local changes to the following files would be overwritten by checkout:\n%%s" 113"Please commit your changes or stash them before you switch branches.") 114:_("Your local changes to the following files would be overwritten by checkout:\n%%s"); 115else if(!strcmp(cmd,"merge")) 116 msg = advice_commit_before_merge 117?_("Your local changes to the following files would be overwritten by merge:\n%%s" 118"Please commit your changes or stash them before you merge.") 119:_("Your local changes to the following files would be overwritten by merge:\n%%s"); 120else 121 msg = advice_commit_before_merge 122?_("Your local changes to the following files would be overwritten by%s:\n%%s" 123"Please commit your changes or stash them before you%s.") 124:_("Your local changes to the following files would be overwritten by%s:\n%%s"); 125 msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = 126argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); 127 128 msgs[ERROR_NOT_UPTODATE_DIR] = 129_("Updating the following directories would lose untracked files in them:\n%s"); 130 131if(!strcmp(cmd,"checkout")) 132 msg = advice_commit_before_merge 133?_("The following untracked working tree files would be removed by checkout:\n%%s" 134"Please move or remove them before you switch branches.") 135:_("The following untracked working tree files would be removed by checkout:\n%%s"); 136else if(!strcmp(cmd,"merge")) 137 msg = advice_commit_before_merge 138?_("The following untracked working tree files would be removed by merge:\n%%s" 139"Please move or remove them before you merge.") 140:_("The following untracked working tree files would be removed by merge:\n%%s"); 141else 142 msg = advice_commit_before_merge 143?_("The following untracked working tree files would be removed by%s:\n%%s" 144"Please move or remove them before you%s.") 145:_("The following untracked working tree files would be removed by%s:\n%%s"); 146 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = 147argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); 148 149if(!strcmp(cmd,"checkout")) 150 msg = advice_commit_before_merge 151?_("The following untracked working tree files would be overwritten by checkout:\n%%s" 152"Please move or remove them before you switch branches.") 153:_("The following untracked working tree files would be overwritten by checkout:\n%%s"); 154else if(!strcmp(cmd,"merge")) 155 msg = advice_commit_before_merge 156?_("The following untracked working tree files would be overwritten by merge:\n%%s" 157"Please move or remove them before you merge.") 158:_("The following untracked working tree files would be overwritten by merge:\n%%s"); 159else 160 msg = advice_commit_before_merge 161?_("The following untracked working tree files would be overwritten by%s:\n%%s" 162"Please move or remove them before you%s.") 163:_("The following untracked working tree files would be overwritten by%s:\n%%s"); 164 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = 165argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); 166 167/* 168 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we 169 * cannot easily display it as a list. 170 */ 171 msgs[ERROR_BIND_OVERLAP] =_("Entry '%s' overlaps with '%s'. Cannot bind."); 172 173 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = 174_("Cannot update sparse checkout: the following entries are not up to date:\n%s"); 175 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = 176_("The following working tree files would be overwritten by sparse checkout update:\n%s"); 177 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = 178_("The following working tree files would be removed by sparse checkout update:\n%s"); 179 msgs[ERROR_WOULD_LOSE_SUBMODULE] = 180_("Cannot update submodule:\n%s"); 181 182 opts->show_all_errors =1; 183/* rejected paths may not have a static buffer */ 184for(i =0; i <ARRAY_SIZE(opts->unpack_rejects); i++) 185 opts->unpack_rejects[i].strdup_strings =1; 186} 187 188voidclear_unpack_trees_porcelain(struct unpack_trees_options *opts) 189{ 190argv_array_clear(&opts->msgs_to_free); 191memset(opts->msgs,0,sizeof(opts->msgs)); 192} 193 194static intdo_add_entry(struct unpack_trees_options *o,struct cache_entry *ce, 195unsigned int set,unsigned int clear) 196{ 197 clear |= CE_HASHED; 198 199if(set & CE_REMOVE) 200 set |= CE_WT_REMOVE; 201 202 ce->ce_flags = (ce->ce_flags & ~clear) | set; 203returnadd_index_entry(&o->result, ce, 204 ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); 205} 206 207static voidadd_entry(struct unpack_trees_options *o, 208const struct cache_entry *ce, 209unsigned int set,unsigned int clear) 210{ 211do_add_entry(o,dup_cache_entry(ce, &o->result), set, clear); 212} 213 214/* 215 * add error messages on path <path> 216 * corresponding to the type <e> with the message <msg> 217 * indicating if it should be display in porcelain or not 218 */ 219static intadd_rejected_path(struct unpack_trees_options *o, 220enum unpack_trees_error_types e, 221const char*path) 222{ 223if(!o->show_all_errors) 224returnerror(ERRORMSG(o, e),super_prefixed(path)); 225 226/* 227 * Otherwise, insert in a list for future display by 228 * display_error_msgs() 229 */ 230string_list_append(&o->unpack_rejects[e], path); 231return-1; 232} 233 234/* 235 * display all the error messages stored in a nice way 236 */ 237static voiddisplay_error_msgs(struct unpack_trees_options *o) 238{ 239int e, i; 240int something_displayed =0; 241for(e =0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { 242struct string_list *rejects = &o->unpack_rejects[e]; 243if(rejects->nr >0) { 244struct strbuf path = STRBUF_INIT; 245 something_displayed =1; 246for(i =0; i < rejects->nr; i++) 247strbuf_addf(&path,"\t%s\n", rejects->items[i].string); 248error(ERRORMSG(o, e),super_prefixed(path.buf)); 249strbuf_release(&path); 250} 251string_list_clear(rejects,0); 252} 253if(something_displayed) 254fprintf(stderr,_("Aborting\n")); 255} 256 257static intcheck_submodule_move_head(const struct cache_entry *ce, 258const char*old_id, 259const char*new_id, 260struct unpack_trees_options *o) 261{ 262unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN; 263const struct submodule *sub =submodule_from_ce(ce); 264 265if(!sub) 266return0; 267 268if(o->reset) 269 flags |= SUBMODULE_MOVE_HEAD_FORCE; 270 271if(submodule_move_head(ce->name, old_id, new_id, flags)) 272return o->gently ? -1: 273add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name); 274return0; 275} 276 277/* 278 * Preform the loading of the repository's gitmodules file. This function is 279 * used by 'check_update()' to perform loading of the gitmodules file in two 280 * differnt situations: 281 * (1) before removing entries from the working tree if the gitmodules file has 282 * been marked for removal. This situation is specified by 'state' == NULL. 283 * (2) before checking out entries to the working tree if the gitmodules file 284 * has been marked for update. This situation is specified by 'state' != NULL. 285 */ 286static voidload_gitmodules_file(struct index_state *index, 287struct checkout *state) 288{ 289int pos =index_name_pos(index, GITMODULES_FILE,strlen(GITMODULES_FILE)); 290 291if(pos >=0) { 292struct cache_entry *ce = index->cache[pos]; 293if(!state && ce->ce_flags & CE_WT_REMOVE) { 294repo_read_gitmodules(the_repository); 295}else if(state && (ce->ce_flags & CE_UPDATE)) { 296submodule_free(the_repository); 297checkout_entry(ce, state, NULL); 298repo_read_gitmodules(the_repository); 299} 300} 301} 302 303/* 304 * Unlink the last component and schedule the leading directories for 305 * removal, such that empty directories get removed. 306 */ 307static voidunlink_entry(const struct cache_entry *ce) 308{ 309const struct submodule *sub =submodule_from_ce(ce); 310if(sub) { 311/* state.force is set at the caller. */ 312submodule_move_head(ce->name,"HEAD", NULL, 313 SUBMODULE_MOVE_HEAD_FORCE); 314} 315if(!check_leading_path(ce->name,ce_namelen(ce))) 316return; 317if(remove_or_warn(ce->ce_mode, ce->name)) 318return; 319schedule_dir_for_removal(ce->name,ce_namelen(ce)); 320} 321 322static struct progress *get_progress(struct unpack_trees_options *o) 323{ 324unsigned cnt =0, total =0; 325struct index_state *index = &o->result; 326 327if(!o->update || !o->verbose_update) 328return NULL; 329 330for(; cnt < index->cache_nr; cnt++) { 331const struct cache_entry *ce = index->cache[cnt]; 332if(ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE)) 333 total++; 334} 335 336returnstart_delayed_progress(_("Checking out files"), total); 337} 338 339static intcheck_updates(struct unpack_trees_options *o) 340{ 341unsigned cnt =0; 342int errs =0; 343struct progress *progress = NULL; 344struct index_state *index = &o->result; 345struct checkout state = CHECKOUT_INIT; 346int i; 347 348 state.force =1; 349 state.quiet =1; 350 state.refresh_cache =1; 351 state.istate = index; 352 353 progress =get_progress(o); 354 355if(o->update) 356git_attr_set_direction(GIT_ATTR_CHECKOUT, index); 357 358if(should_update_submodules() && o->update && !o->dry_run) 359load_gitmodules_file(index, NULL); 360 361for(i =0; i < index->cache_nr; i++) { 362const struct cache_entry *ce = index->cache[i]; 363 364if(ce->ce_flags & CE_WT_REMOVE) { 365display_progress(progress, ++cnt); 366if(o->update && !o->dry_run) 367unlink_entry(ce); 368} 369} 370remove_marked_cache_entries(index); 371remove_scheduled_dirs(); 372 373if(should_update_submodules() && o->update && !o->dry_run) 374load_gitmodules_file(index, &state); 375 376enable_delayed_checkout(&state); 377if(repository_format_partial_clone && o->update && !o->dry_run) { 378/* 379 * Prefetch the objects that are to be checked out in the loop 380 * below. 381 */ 382struct oid_array to_fetch = OID_ARRAY_INIT; 383int fetch_if_missing_store = fetch_if_missing; 384 fetch_if_missing =0; 385for(i =0; i < index->cache_nr; i++) { 386struct cache_entry *ce = index->cache[i]; 387if((ce->ce_flags & CE_UPDATE) && 388!S_ISGITLINK(ce->ce_mode)) { 389if(!has_object_file(&ce->oid)) 390oid_array_append(&to_fetch, &ce->oid); 391} 392} 393if(to_fetch.nr) 394fetch_objects(repository_format_partial_clone, 395&to_fetch); 396 fetch_if_missing = fetch_if_missing_store; 397oid_array_clear(&to_fetch); 398} 399for(i =0; i < index->cache_nr; i++) { 400struct cache_entry *ce = index->cache[i]; 401 402if(ce->ce_flags & CE_UPDATE) { 403if(ce->ce_flags & CE_WT_REMOVE) 404BUG("both update and delete flags are set on%s", 405 ce->name); 406display_progress(progress, ++cnt); 407 ce->ce_flags &= ~CE_UPDATE; 408if(o->update && !o->dry_run) { 409 errs |=checkout_entry(ce, &state, NULL); 410} 411} 412} 413stop_progress(&progress); 414 errs |=finish_delayed_checkout(&state); 415if(o->update) 416git_attr_set_direction(GIT_ATTR_CHECKIN, NULL); 417return errs !=0; 418} 419 420static intverify_uptodate_sparse(const struct cache_entry *ce, 421struct unpack_trees_options *o); 422static intverify_absent_sparse(const struct cache_entry *ce, 423enum unpack_trees_error_types, 424struct unpack_trees_options *o); 425 426static intapply_sparse_checkout(struct index_state *istate, 427struct cache_entry *ce, 428struct unpack_trees_options *o) 429{ 430int was_skip_worktree =ce_skip_worktree(ce); 431 432if(ce->ce_flags & CE_NEW_SKIP_WORKTREE) 433 ce->ce_flags |= CE_SKIP_WORKTREE; 434else 435 ce->ce_flags &= ~CE_SKIP_WORKTREE; 436if(was_skip_worktree !=ce_skip_worktree(ce)) { 437 ce->ce_flags |= CE_UPDATE_IN_BASE; 438mark_fsmonitor_invalid(istate, ce); 439 istate->cache_changed |= CE_ENTRY_CHANGED; 440} 441 442/* 443 * if (!was_skip_worktree && !ce_skip_worktree()) { 444 * This is perfectly normal. Move on; 445 * } 446 */ 447 448/* 449 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout 450 * area as a result of ce_skip_worktree() shortcuts in 451 * verify_absent() and verify_uptodate(). 452 * Make sure they don't modify worktree if they are already 453 * outside checkout area 454 */ 455if(was_skip_worktree &&ce_skip_worktree(ce)) { 456 ce->ce_flags &= ~CE_UPDATE; 457 458/* 459 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also 460 * on to get that file removed from both index and worktree. 461 * If that file is already outside worktree area, don't 462 * bother remove it. 463 */ 464if(ce->ce_flags & CE_REMOVE) 465 ce->ce_flags &= ~CE_WT_REMOVE; 466} 467 468if(!was_skip_worktree &&ce_skip_worktree(ce)) { 469/* 470 * If CE_UPDATE is set, verify_uptodate() must be called already 471 * also stat info may have lost after merged_entry() so calling 472 * verify_uptodate() again may fail 473 */ 474if(!(ce->ce_flags & CE_UPDATE) &&verify_uptodate_sparse(ce, o)) 475return-1; 476 ce->ce_flags |= CE_WT_REMOVE; 477 ce->ce_flags &= ~CE_UPDATE; 478} 479if(was_skip_worktree && !ce_skip_worktree(ce)) { 480if(verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) 481return-1; 482 ce->ce_flags |= CE_UPDATE; 483} 484return0; 485} 486 487staticinlineintcall_unpack_fn(const struct cache_entry *const*src, 488struct unpack_trees_options *o) 489{ 490int ret = o->fn(src, o); 491if(ret >0) 492 ret =0; 493return ret; 494} 495 496static voidmark_ce_used(struct cache_entry *ce,struct unpack_trees_options *o) 497{ 498 ce->ce_flags |= CE_UNPACKED; 499 500if(o->cache_bottom < o->src_index->cache_nr && 501 o->src_index->cache[o->cache_bottom] == ce) { 502int bottom = o->cache_bottom; 503while(bottom < o->src_index->cache_nr && 504 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) 505 bottom++; 506 o->cache_bottom = bottom; 507} 508} 509 510static voidmark_all_ce_unused(struct index_state *index) 511{ 512int i; 513for(i =0; i < index->cache_nr; i++) 514 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE); 515} 516 517static intlocate_in_src_index(const struct cache_entry *ce, 518struct unpack_trees_options *o) 519{ 520struct index_state *index = o->src_index; 521int len =ce_namelen(ce); 522int pos =index_name_pos(index, ce->name, len); 523if(pos <0) 524 pos = -1- pos; 525return pos; 526} 527 528/* 529 * We call unpack_index_entry() with an unmerged cache entry 530 * only in diff-index, and it wants a single callback. Skip 531 * the other unmerged entry with the same name. 532 */ 533static voidmark_ce_used_same_name(struct cache_entry *ce, 534struct unpack_trees_options *o) 535{ 536struct index_state *index = o->src_index; 537int len =ce_namelen(ce); 538int pos; 539 540for(pos =locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { 541struct cache_entry *next = index->cache[pos]; 542if(len !=ce_namelen(next) || 543memcmp(ce->name, next->name, len)) 544break; 545mark_ce_used(next, o); 546} 547} 548 549static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) 550{ 551const struct index_state *index = o->src_index; 552int pos = o->cache_bottom; 553 554while(pos < index->cache_nr) { 555struct cache_entry *ce = index->cache[pos]; 556if(!(ce->ce_flags & CE_UNPACKED)) 557return ce; 558 pos++; 559} 560return NULL; 561} 562 563static voidadd_same_unmerged(const struct cache_entry *ce, 564struct unpack_trees_options *o) 565{ 566struct index_state *index = o->src_index; 567int len =ce_namelen(ce); 568int pos =index_name_pos(index, ce->name, len); 569 570if(0<= pos) 571die("programming error in a caller of mark_ce_used_same_name"); 572for(pos = -pos -1; pos < index->cache_nr; pos++) { 573struct cache_entry *next = index->cache[pos]; 574if(len !=ce_namelen(next) || 575memcmp(ce->name, next->name, len)) 576break; 577add_entry(o, next,0,0); 578mark_ce_used(next, o); 579} 580} 581 582static intunpack_index_entry(struct cache_entry *ce, 583struct unpack_trees_options *o) 584{ 585const struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, }; 586int ret; 587 588 src[0] = ce; 589 590mark_ce_used(ce, o); 591if(ce_stage(ce)) { 592if(o->skip_unmerged) { 593add_entry(o, ce,0,0); 594return0; 595} 596} 597 ret =call_unpack_fn(src, o); 598if(ce_stage(ce)) 599mark_ce_used_same_name(ce, o); 600return ret; 601} 602 603static intfind_cache_pos(struct traverse_info *,const struct name_entry *); 604 605static voidrestore_cache_bottom(struct traverse_info *info,int bottom) 606{ 607struct unpack_trees_options *o = info->data; 608 609if(o->diff_index_cached) 610return; 611 o->cache_bottom = bottom; 612} 613 614static intswitch_cache_bottom(struct traverse_info *info) 615{ 616struct unpack_trees_options *o = info->data; 617int ret, pos; 618 619if(o->diff_index_cached) 620return0; 621 ret = o->cache_bottom; 622 pos =find_cache_pos(info->prev, &info->name); 623 624if(pos < -1) 625 o->cache_bottom = -2- pos; 626else if(pos <0) 627 o->cache_bottom = o->src_index->cache_nr; 628return ret; 629} 630 631staticinlineintare_same_oid(struct name_entry *name_j,struct name_entry *name_k) 632{ 633return name_j->oid && name_k->oid && !oidcmp(name_j->oid, name_k->oid); 634} 635 636static inttraverse_trees_recursive(int n,unsigned long dirmask, 637unsigned long df_conflicts, 638struct name_entry *names, 639struct traverse_info *info) 640{ 641int i, ret, bottom; 642int nr_buf =0; 643struct tree_desc t[MAX_UNPACK_TREES]; 644void*buf[MAX_UNPACK_TREES]; 645struct traverse_info newinfo; 646struct name_entry *p; 647 648 p = names; 649while(!p->mode) 650 p++; 651 652 newinfo = *info; 653 newinfo.prev = info; 654 newinfo.pathspec = info->pathspec; 655 newinfo.name = *p; 656 newinfo.pathlen +=tree_entry_len(p) +1; 657 newinfo.df_conflicts |= df_conflicts; 658 659/* 660 * Fetch the tree from the ODB for each peer directory in the 661 * n commits. 662 * 663 * For 2- and 3-way traversals, we try to avoid hitting the 664 * ODB twice for the same OID. This should yield a nice speed 665 * up in checkouts and merges when the commits are similar. 666 * 667 * We don't bother doing the full O(n^2) search for larger n, 668 * because wider traversals don't happen that often and we 669 * avoid the search setup. 670 * 671 * When 2 peer OIDs are the same, we just copy the tree 672 * descriptor data. This implicitly borrows the buffer 673 * data from the earlier cell. 674 */ 675for(i =0; i < n; i++, dirmask >>=1) { 676if(i >0&&are_same_oid(&names[i], &names[i -1])) 677 t[i] = t[i -1]; 678else if(i >1&&are_same_oid(&names[i], &names[i -2])) 679 t[i] = t[i -2]; 680else{ 681const struct object_id *oid = NULL; 682if(dirmask &1) 683 oid = names[i].oid; 684 buf[nr_buf++] =fill_tree_descriptor(t + i, oid); 685} 686} 687 688 bottom =switch_cache_bottom(&newinfo); 689 ret =traverse_trees(n, t, &newinfo); 690restore_cache_bottom(&newinfo, bottom); 691 692for(i =0; i < nr_buf; i++) 693free(buf[i]); 694 695return ret; 696} 697 698/* 699 * Compare the traverse-path to the cache entry without actually 700 * having to generate the textual representation of the traverse 701 * path. 702 * 703 * NOTE! This *only* compares up to the size of the traverse path 704 * itself - the caller needs to do the final check for the cache 705 * entry having more data at the end! 706 */ 707static intdo_compare_entry_piecewise(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 708{ 709int len, pathlen, ce_len; 710const char*ce_name; 711 712if(info->prev) { 713int cmp =do_compare_entry_piecewise(ce, info->prev, 714&info->name); 715if(cmp) 716return cmp; 717} 718 pathlen = info->pathlen; 719 ce_len =ce_namelen(ce); 720 721/* If ce_len < pathlen then we must have previously hit "name == directory" entry */ 722if(ce_len < pathlen) 723return-1; 724 725 ce_len -= pathlen; 726 ce_name = ce->name + pathlen; 727 728 len =tree_entry_len(n); 729returndf_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 730} 731 732static intdo_compare_entry(const struct cache_entry *ce, 733const struct traverse_info *info, 734const struct name_entry *n) 735{ 736int len, pathlen, ce_len; 737const char*ce_name; 738int cmp; 739 740/* 741 * If we have not precomputed the traverse path, it is quicker 742 * to avoid doing so. But if we have precomputed it, 743 * it is quicker to use the precomputed version. 744 */ 745if(!info->traverse_path) 746returndo_compare_entry_piecewise(ce, info, n); 747 748 cmp =strncmp(ce->name, info->traverse_path, info->pathlen); 749if(cmp) 750return cmp; 751 752 pathlen = info->pathlen; 753 ce_len =ce_namelen(ce); 754 755if(ce_len < pathlen) 756return-1; 757 758 ce_len -= pathlen; 759 ce_name = ce->name + pathlen; 760 761 len =tree_entry_len(n); 762returndf_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 763} 764 765static intcompare_entry(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 766{ 767int cmp =do_compare_entry(ce, info, n); 768if(cmp) 769return cmp; 770 771/* 772 * Even if the beginning compared identically, the ce should 773 * compare as bigger than a directory leading up to it! 774 */ 775returnce_namelen(ce) >traverse_path_len(info, n); 776} 777 778static intce_in_traverse_path(const struct cache_entry *ce, 779const struct traverse_info *info) 780{ 781if(!info->prev) 782return1; 783if(do_compare_entry(ce, info->prev, &info->name)) 784return0; 785/* 786 * If ce (blob) is the same name as the path (which is a tree 787 * we will be descending into), it won't be inside it. 788 */ 789return(info->pathlen <ce_namelen(ce)); 790} 791 792static struct cache_entry *create_ce_entry(const struct traverse_info *info, 793const struct name_entry *n, 794int stage, 795struct index_state *istate, 796int is_transient) 797{ 798int len =traverse_path_len(info, n); 799struct cache_entry *ce = 800 is_transient ? 801make_empty_transient_cache_entry(len) : 802make_empty_cache_entry(istate, len); 803 804 ce->ce_mode =create_ce_mode(n->mode); 805 ce->ce_flags =create_ce_flags(stage); 806 ce->ce_namelen = len; 807oidcpy(&ce->oid, n->oid); 808make_traverse_path(ce->name, info, n); 809 810return ce; 811} 812 813static intunpack_nondirectories(int n,unsigned long mask, 814unsigned long dirmask, 815struct cache_entry **src, 816const struct name_entry *names, 817const struct traverse_info *info) 818{ 819int i; 820struct unpack_trees_options *o = info->data; 821unsigned long conflicts = info->df_conflicts | dirmask; 822 823/* Do we have *only* directories? Nothing to do */ 824if(mask == dirmask && !src[0]) 825return0; 826 827/* 828 * Ok, we've filled in up to any potential index entry in src[0], 829 * now do the rest. 830 */ 831for(i =0; i < n; i++) { 832int stage; 833unsigned int bit =1ul<< i; 834if(conflicts & bit) { 835 src[i + o->merge] = o->df_conflict_entry; 836continue; 837} 838if(!(mask & bit)) 839continue; 840if(!o->merge) 841 stage =0; 842else if(i +1< o->head_idx) 843 stage =1; 844else if(i +1> o->head_idx) 845 stage =3; 846else 847 stage =2; 848 849/* 850 * If the merge bit is set, then the cache entries are 851 * discarded in the following block. In this case, 852 * construct "transient" cache_entries, as they are 853 * not stored in the index. otherwise construct the 854 * cache entry from the index aware logic. 855 */ 856 src[i + o->merge] =create_ce_entry(info, names + i, stage, &o->result, o->merge); 857} 858 859if(o->merge) { 860int rc =call_unpack_fn((const struct cache_entry *const*)src, 861 o); 862for(i =0; i < n; i++) { 863struct cache_entry *ce = src[i + o->merge]; 864if(ce != o->df_conflict_entry) 865discard_cache_entry(ce); 866} 867return rc; 868} 869 870for(i =0; i < n; i++) 871if(src[i] && src[i] != o->df_conflict_entry) 872if(do_add_entry(o, src[i],0,0)) 873return-1; 874 875return0; 876} 877 878static intunpack_failed(struct unpack_trees_options *o,const char*message) 879{ 880discard_index(&o->result); 881if(!o->gently && !o->exiting_early) { 882if(message) 883returnerror("%s", message); 884return-1; 885} 886return-1; 887} 888 889/* 890 * The tree traversal is looking at name p. If we have a matching entry, 891 * return it. If name p is a directory in the index, do not return 892 * anything, as we will want to match it when the traversal descends into 893 * the directory. 894 */ 895static intfind_cache_pos(struct traverse_info *info, 896const struct name_entry *p) 897{ 898int pos; 899struct unpack_trees_options *o = info->data; 900struct index_state *index = o->src_index; 901int pfxlen = info->pathlen; 902int p_len =tree_entry_len(p); 903 904for(pos = o->cache_bottom; pos < index->cache_nr; pos++) { 905const struct cache_entry *ce = index->cache[pos]; 906const char*ce_name, *ce_slash; 907int cmp, ce_len; 908 909if(ce->ce_flags & CE_UNPACKED) { 910/* 911 * cache_bottom entry is already unpacked, so 912 * we can never match it; don't check it 913 * again. 914 */ 915if(pos == o->cache_bottom) 916++o->cache_bottom; 917continue; 918} 919if(!ce_in_traverse_path(ce, info)) { 920/* 921 * Check if we can skip future cache checks 922 * (because we're already past all possible 923 * entries in the traverse path). 924 */ 925if(info->traverse_path) { 926if(strncmp(ce->name, info->traverse_path, 927 info->pathlen) >0) 928break; 929} 930continue; 931} 932 ce_name = ce->name + pfxlen; 933 ce_slash =strchr(ce_name,'/'); 934if(ce_slash) 935 ce_len = ce_slash - ce_name; 936else 937 ce_len =ce_namelen(ce) - pfxlen; 938 cmp =name_compare(p->path, p_len, ce_name, ce_len); 939/* 940 * Exact match; if we have a directory we need to 941 * delay returning it. 942 */ 943if(!cmp) 944return ce_slash ? -2- pos : pos; 945if(0< cmp) 946continue;/* keep looking */ 947/* 948 * ce_name sorts after p->path; could it be that we 949 * have files under p->path directory in the index? 950 * E.g. ce_name == "t-i", and p->path == "t"; we may 951 * have "t/a" in the index. 952 */ 953if(p_len < ce_len && !memcmp(ce_name, p->path, p_len) && 954 ce_name[p_len] <'/') 955continue;/* keep looking */ 956break; 957} 958return-1; 959} 960 961static struct cache_entry *find_cache_entry(struct traverse_info *info, 962const struct name_entry *p) 963{ 964int pos =find_cache_pos(info, p); 965struct unpack_trees_options *o = info->data; 966 967if(0<= pos) 968return o->src_index->cache[pos]; 969else 970return NULL; 971} 972 973static voiddebug_path(struct traverse_info *info) 974{ 975if(info->prev) { 976debug_path(info->prev); 977if(*info->prev->name.path) 978putchar('/'); 979} 980printf("%s", info->name.path); 981} 982 983static voiddebug_name_entry(int i,struct name_entry *n) 984{ 985printf("ent#%d %06o%s\n", i, 986 n->path ? n->mode :0, 987 n->path ? n->path :"(missing)"); 988} 989 990static voiddebug_unpack_callback(int n, 991unsigned long mask, 992unsigned long dirmask, 993struct name_entry *names, 994struct traverse_info *info) 995{ 996int i; 997printf("* unpack mask%lu, dirmask%lu, cnt%d", 998 mask, dirmask, n); 999debug_path(info);1000putchar('\n');1001for(i =0; i < n; i++)1002debug_name_entry(i, names + i);1003}10041005static intunpack_callback(int n,unsigned long mask,unsigned long dirmask,struct name_entry *names,struct traverse_info *info)1006{1007struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, };1008struct unpack_trees_options *o = info->data;1009const struct name_entry *p = names;10101011/* Find first entry with a real name (we could use "mask" too) */1012while(!p->mode)1013 p++;10141015if(o->debug_unpack)1016debug_unpack_callback(n, mask, dirmask, names, info);10171018/* Are we supposed to look at the index too? */1019if(o->merge) {1020while(1) {1021int cmp;1022struct cache_entry *ce;10231024if(o->diff_index_cached)1025 ce =next_cache_entry(o);1026else1027 ce =find_cache_entry(info, p);10281029if(!ce)1030break;1031 cmp =compare_entry(ce, info, p);1032if(cmp <0) {1033if(unpack_index_entry(ce, o) <0)1034returnunpack_failed(o, NULL);1035continue;1036}1037if(!cmp) {1038if(ce_stage(ce)) {1039/*1040 * If we skip unmerged index1041 * entries, we'll skip this1042 * entry *and* the tree1043 * entries associated with it!1044 */1045if(o->skip_unmerged) {1046add_same_unmerged(ce, o);1047return mask;1048}1049}1050 src[0] = ce;1051}1052break;1053}1054}10551056if(unpack_nondirectories(n, mask, dirmask, src, names, info) <0)1057return-1;10581059if(o->merge && src[0]) {1060if(ce_stage(src[0]))1061mark_ce_used_same_name(src[0], o);1062else1063mark_ce_used(src[0], o);1064}10651066/* Now handle any directories.. */1067if(dirmask) {1068/* special case: "diff-index --cached" looking at a tree */1069if(o->diff_index_cached &&1070 n ==1&& dirmask ==1&&S_ISDIR(names->mode)) {1071int matches;1072 matches =cache_tree_matches_traversal(o->src_index->cache_tree,1073 names, info);1074/*1075 * Everything under the name matches; skip the1076 * entire hierarchy. diff_index_cached codepath1077 * special cases D/F conflicts in such a way that1078 * it does not do any look-ahead, so this is safe.1079 */1080if(matches) {1081 o->cache_bottom += matches;1082return mask;1083}1084}10851086if(traverse_trees_recursive(n, dirmask, mask & ~dirmask,1087 names, info) <0)1088return-1;1089return mask;1090}10911092return mask;1093}10941095static intclear_ce_flags_1(struct cache_entry **cache,int nr,1096struct strbuf *prefix,1097int select_mask,int clear_mask,1098struct exclude_list *el,int defval);10991100/* Whole directory matching */1101static intclear_ce_flags_dir(struct cache_entry **cache,int nr,1102struct strbuf *prefix,1103char*basename,1104int select_mask,int clear_mask,1105struct exclude_list *el,int defval)1106{1107struct cache_entry **cache_end;1108int dtype = DT_DIR;1109int ret =is_excluded_from_list(prefix->buf, prefix->len,1110 basename, &dtype, el, &the_index);1111int rc;11121113strbuf_addch(prefix,'/');11141115/* If undecided, use matching result of parent dir in defval */1116if(ret <0)1117 ret = defval;11181119for(cache_end = cache; cache_end != cache + nr; cache_end++) {1120struct cache_entry *ce = *cache_end;1121if(strncmp(ce->name, prefix->buf, prefix->len))1122break;1123}11241125/*1126 * TODO: check el, if there are no patterns that may conflict1127 * with ret (iow, we know in advance the incl/excl1128 * decision for the entire directory), clear flag here without1129 * calling clear_ce_flags_1(). That function will call1130 * the expensive is_excluded_from_list() on every entry.1131 */1132 rc =clear_ce_flags_1(cache, cache_end - cache,1133 prefix,1134 select_mask, clear_mask,1135 el, ret);1136strbuf_setlen(prefix, prefix->len -1);1137return rc;1138}11391140/*1141 * Traverse the index, find every entry that matches according to1142 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the1143 * number of traversed entries.1144 *1145 * If select_mask is non-zero, only entries whose ce_flags has on of1146 * those bits enabled are traversed.1147 *1148 * cache : pointer to an index entry1149 * prefix_len : an offset to its path1150 *1151 * The current path ("prefix") including the trailing '/' is1152 * cache[0]->name[0..(prefix_len-1)]1153 * Top level path has prefix_len zero.1154 */1155static intclear_ce_flags_1(struct cache_entry **cache,int nr,1156struct strbuf *prefix,1157int select_mask,int clear_mask,1158struct exclude_list *el,int defval)1159{1160struct cache_entry **cache_end = cache + nr;11611162/*1163 * Process all entries that have the given prefix and meet1164 * select_mask condition1165 */1166while(cache != cache_end) {1167struct cache_entry *ce = *cache;1168const char*name, *slash;1169int len, dtype, ret;11701171if(select_mask && !(ce->ce_flags & select_mask)) {1172 cache++;1173continue;1174}11751176if(prefix->len &&strncmp(ce->name, prefix->buf, prefix->len))1177break;11781179 name = ce->name + prefix->len;1180 slash =strchr(name,'/');11811182/* If it's a directory, try whole directory match first */1183if(slash) {1184int processed;11851186 len = slash - name;1187strbuf_add(prefix, name, len);11881189 processed =clear_ce_flags_dir(cache, cache_end - cache,1190 prefix,1191 prefix->buf + prefix->len - len,1192 select_mask, clear_mask,1193 el, defval);11941195/* clear_c_f_dir eats a whole dir already? */1196if(processed) {1197 cache += processed;1198strbuf_setlen(prefix, prefix->len - len);1199continue;1200}12011202strbuf_addch(prefix,'/');1203 cache +=clear_ce_flags_1(cache, cache_end - cache,1204 prefix,1205 select_mask, clear_mask, el, defval);1206strbuf_setlen(prefix, prefix->len - len -1);1207continue;1208}12091210/* Non-directory */1211 dtype =ce_to_dtype(ce);1212 ret =is_excluded_from_list(ce->name,ce_namelen(ce),1213 name, &dtype, el, &the_index);1214if(ret <0)1215 ret = defval;1216if(ret >0)1217 ce->ce_flags &= ~clear_mask;1218 cache++;1219}1220return nr - (cache_end - cache);1221}12221223static intclear_ce_flags(struct cache_entry **cache,int nr,1224int select_mask,int clear_mask,1225struct exclude_list *el)1226{1227static struct strbuf prefix = STRBUF_INIT;12281229strbuf_reset(&prefix);12301231returnclear_ce_flags_1(cache, nr,1232&prefix,1233 select_mask, clear_mask,1234 el,0);1235}12361237/*1238 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout1239 */1240static voidmark_new_skip_worktree(struct exclude_list *el,1241struct index_state *istate,1242int select_flag,int skip_wt_flag)1243{1244int i;12451246/*1247 * 1. Pretend the narrowest worktree: only unmerged entries1248 * are checked out1249 */1250for(i =0; i < istate->cache_nr; i++) {1251struct cache_entry *ce = istate->cache[i];12521253if(select_flag && !(ce->ce_flags & select_flag))1254continue;12551256if(!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED))1257 ce->ce_flags |= skip_wt_flag;1258else1259 ce->ce_flags &= ~skip_wt_flag;1260}12611262/*1263 * 2. Widen worktree according to sparse-checkout file.1264 * Matched entries will have skip_wt_flag cleared (i.e. "in")1265 */1266clear_ce_flags(istate->cache, istate->cache_nr, select_flag, skip_wt_flag, el);1267}12681269static intverify_absent(const struct cache_entry *,1270enum unpack_trees_error_types,1271struct unpack_trees_options *);1272/*1273 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the1274 * resulting index, -2 on failure to reflect the changes to the work tree.1275 *1276 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally1277 */1278intunpack_trees(unsigned len,struct tree_desc *t,struct unpack_trees_options *o)1279{1280int i, ret;1281static struct cache_entry *dfc;1282struct exclude_list el;12831284if(len > MAX_UNPACK_TREES)1285die("unpack_trees takes at most%dtrees", MAX_UNPACK_TREES);12861287memset(&el,0,sizeof(el));1288if(!core_apply_sparse_checkout || !o->update)1289 o->skip_sparse_checkout =1;1290if(!o->skip_sparse_checkout) {1291char*sparse =git_pathdup("info/sparse-checkout");1292if(add_excludes_from_file_to_list(sparse,"",0, &el, NULL) <0)1293 o->skip_sparse_checkout =1;1294else1295 o->el = ⪙1296free(sparse);1297}12981299memset(&o->result,0,sizeof(o->result));1300 o->result.initialized =1;1301 o->result.timestamp.sec = o->src_index->timestamp.sec;1302 o->result.timestamp.nsec = o->src_index->timestamp.nsec;1303 o->result.version = o->src_index->version;1304if(!o->src_index->split_index) {1305 o->result.split_index = NULL;1306}else if(o->src_index == o->dst_index) {1307/*1308 * o->dst_index (and thus o->src_index) will be discarded1309 * and overwritten with o->result at the end of this function,1310 * so just use src_index's split_index to avoid having to1311 * create a new one.1312 */1313 o->result.split_index = o->src_index->split_index;1314 o->result.split_index->refcount++;1315}else{1316 o->result.split_index =init_split_index(&o->result);1317}1318oidcpy(&o->result.oid, &o->src_index->oid);1319 o->merge_size = len;1320mark_all_ce_unused(o->src_index);13211322/*1323 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries1324 */1325if(!o->skip_sparse_checkout)1326mark_new_skip_worktree(o->el, o->src_index,0, CE_NEW_SKIP_WORKTREE);13271328if(!dfc)1329 dfc =xcalloc(1,cache_entry_size(0));1330 o->df_conflict_entry = dfc;13311332if(len) {1333const char*prefix = o->prefix ? o->prefix :"";1334struct traverse_info info;13351336setup_traverse_info(&info, prefix);1337 info.fn = unpack_callback;1338 info.data = o;1339 info.show_all_errors = o->show_all_errors;1340 info.pathspec = o->pathspec;13411342if(o->prefix) {1343/*1344 * Unpack existing index entries that sort before the1345 * prefix the tree is spliced into. Note that o->merge1346 * is always true in this case.1347 */1348while(1) {1349struct cache_entry *ce =next_cache_entry(o);1350if(!ce)1351break;1352if(ce_in_traverse_path(ce, &info))1353break;1354if(unpack_index_entry(ce, o) <0)1355goto return_failed;1356}1357}13581359if(traverse_trees(len, t, &info) <0)1360goto return_failed;1361}13621363/* Any left-over entries in the index? */1364if(o->merge) {1365while(1) {1366struct cache_entry *ce =next_cache_entry(o);1367if(!ce)1368break;1369if(unpack_index_entry(ce, o) <0)1370goto return_failed;1371}1372}1373mark_all_ce_unused(o->src_index);13741375if(o->trivial_merges_only && o->nontrivial_merge) {1376 ret =unpack_failed(o,"Merge requires file-level merging");1377goto done;1378}13791380if(!o->skip_sparse_checkout) {1381int empty_worktree =1;13821383/*1384 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #11385 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE1386 * so apply_sparse_checkout() won't attempt to remove it from worktree1387 */1388mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);13891390 ret =0;1391for(i =0; i < o->result.cache_nr; i++) {1392struct cache_entry *ce = o->result.cache[i];13931394/*1395 * Entries marked with CE_ADDED in merged_entry() do not have1396 * verify_absent() check (the check is effectively disabled1397 * because CE_NEW_SKIP_WORKTREE is set unconditionally).1398 *1399 * Do the real check now because we have had1400 * correct CE_NEW_SKIP_WORKTREE1401 */1402if(ce->ce_flags & CE_ADDED &&1403verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1404if(!o->show_all_errors)1405goto return_failed;1406 ret = -1;1407}14081409if(apply_sparse_checkout(&o->result, ce, o)) {1410if(!o->show_all_errors)1411goto return_failed;1412 ret = -1;1413}1414if(!ce_skip_worktree(ce))1415 empty_worktree =0;14161417}1418if(ret <0)1419goto return_failed;1420/*1421 * Sparse checkout is meant to narrow down checkout area1422 * but it does not make sense to narrow down to empty working1423 * tree. This is usually a mistake in sparse checkout rules.1424 * Do not allow users to do that.1425 */1426if(o->result.cache_nr && empty_worktree) {1427 ret =unpack_failed(o,"Sparse checkout leaves no entry on working directory");1428goto done;1429}1430}14311432 ret =check_updates(o) ? (-2) :0;1433if(o->dst_index) {1434if(!ret) {1435if(!o->result.cache_tree)1436 o->result.cache_tree =cache_tree();1437if(!cache_tree_fully_valid(o->result.cache_tree))1438cache_tree_update(&o->result,1439 WRITE_TREE_SILENT |1440 WRITE_TREE_REPAIR);1441}1442move_index_extensions(&o->result, o->src_index);1443discard_index(o->dst_index);1444*o->dst_index = o->result;1445}else{1446discard_index(&o->result);1447}1448 o->src_index = NULL;14491450done:1451clear_exclude_list(&el);1452return ret;14531454return_failed:1455if(o->show_all_errors)1456display_error_msgs(o);1457mark_all_ce_unused(o->src_index);1458 ret =unpack_failed(o, NULL);1459if(o->exiting_early)1460 ret =0;1461goto done;1462}14631464/* Here come the merge functions */14651466static intreject_merge(const struct cache_entry *ce,1467struct unpack_trees_options *o)1468{1469return o->gently ? -1:1470add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);1471}14721473static intsame(const struct cache_entry *a,const struct cache_entry *b)1474{1475if(!!a != !!b)1476return0;1477if(!a && !b)1478return1;1479if((a->ce_flags | b->ce_flags) & CE_CONFLICTED)1480return0;1481return a->ce_mode == b->ce_mode &&1482!oidcmp(&a->oid, &b->oid);1483}148414851486/*1487 * When a CE gets turned into an unmerged entry, we1488 * want it to be up-to-date1489 */1490static intverify_uptodate_1(const struct cache_entry *ce,1491struct unpack_trees_options *o,1492enum unpack_trees_error_types error_type)1493{1494struct stat st;14951496if(o->index_only)1497return0;14981499/*1500 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again1501 * if this entry is truly up-to-date because this file may be1502 * overwritten.1503 */1504if((ce->ce_flags & CE_VALID) ||ce_skip_worktree(ce))1505;/* keep checking */1506else if(o->reset ||ce_uptodate(ce))1507return0;15081509if(!lstat(ce->name, &st)) {1510int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;1511unsigned changed =ie_match_stat(o->src_index, ce, &st, flags);15121513if(submodule_from_ce(ce)) {1514int r =check_submodule_move_head(ce,1515"HEAD",oid_to_hex(&ce->oid), o);1516if(r)1517return o->gently ? -1:1518add_rejected_path(o, error_type, ce->name);1519return0;1520}15211522if(!changed)1523return0;1524/*1525 * Historic default policy was to allow submodule to be out1526 * of sync wrt the superproject index. If the submodule was1527 * not considered interesting above, we don't care here.1528 */1529if(S_ISGITLINK(ce->ce_mode))1530return0;15311532 errno =0;1533}1534if(errno == ENOENT)1535return0;1536return o->gently ? -1:1537add_rejected_path(o, error_type, ce->name);1538}15391540intverify_uptodate(const struct cache_entry *ce,1541struct unpack_trees_options *o)1542{1543if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1544return0;1545returnverify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);1546}15471548static intverify_uptodate_sparse(const struct cache_entry *ce,1549struct unpack_trees_options *o)1550{1551returnverify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);1552}15531554/*1555 * TODO: We should actually invalidate o->result, not src_index [1].1556 * But since cache tree and untracked cache both are not copied to1557 * o->result until unpacking is complete, we invalidate them on1558 * src_index instead with the assumption that they will be copied to1559 * dst_index at the end.1560 *1561 * [1] src_index->cache_tree is also used in unpack_callback() so if1562 * we invalidate o->result, we need to update it to use1563 * o->result.cache_tree as well.1564 */1565static voidinvalidate_ce_path(const struct cache_entry *ce,1566struct unpack_trees_options *o)1567{1568if(!ce)1569return;1570cache_tree_invalidate_path(o->src_index, ce->name);1571untracked_cache_invalidate_path(o->src_index, ce->name,1);1572}15731574/*1575 * Check that checking out ce->sha1 in subdir ce->name is not1576 * going to overwrite any working files.1577 *1578 * Currently, git does not checkout subprojects during a superproject1579 * checkout, so it is not going to overwrite anything.1580 */1581static intverify_clean_submodule(const char*old_sha1,1582const struct cache_entry *ce,1583enum unpack_trees_error_types error_type,1584struct unpack_trees_options *o)1585{1586if(!submodule_from_ce(ce))1587return0;15881589returncheck_submodule_move_head(ce, old_sha1,1590oid_to_hex(&ce->oid), o);1591}15921593static intverify_clean_subdirectory(const struct cache_entry *ce,1594enum unpack_trees_error_types error_type,1595struct unpack_trees_options *o)1596{1597/*1598 * we are about to extract "ce->name"; we would not want to lose1599 * anything in the existing directory there.1600 */1601int namelen;1602int i;1603struct dir_struct d;1604char*pathbuf;1605int cnt =0;16061607if(S_ISGITLINK(ce->ce_mode)) {1608struct object_id oid;1609int sub_head =resolve_gitlink_ref(ce->name,"HEAD", &oid);1610/*1611 * If we are not going to update the submodule, then1612 * we don't care.1613 */1614if(!sub_head && !oidcmp(&oid, &ce->oid))1615return0;1616returnverify_clean_submodule(sub_head ? NULL :oid_to_hex(&oid),1617 ce, error_type, o);1618}16191620/*1621 * First let's make sure we do not have a local modification1622 * in that directory.1623 */1624 namelen =ce_namelen(ce);1625for(i =locate_in_src_index(ce, o);1626 i < o->src_index->cache_nr;1627 i++) {1628struct cache_entry *ce2 = o->src_index->cache[i];1629int len =ce_namelen(ce2);1630if(len < namelen ||1631strncmp(ce->name, ce2->name, namelen) ||1632 ce2->name[namelen] !='/')1633break;1634/*1635 * ce2->name is an entry in the subdirectory to be1636 * removed.1637 */1638if(!ce_stage(ce2)) {1639if(verify_uptodate(ce2, o))1640return-1;1641add_entry(o, ce2, CE_REMOVE,0);1642mark_ce_used(ce2, o);1643}1644 cnt++;1645}16461647/*1648 * Then we need to make sure that we do not lose a locally1649 * present file that is not ignored.1650 */1651 pathbuf =xstrfmt("%.*s/", namelen, ce->name);16521653memset(&d,0,sizeof(d));1654if(o->dir)1655 d.exclude_per_dir = o->dir->exclude_per_dir;1656 i =read_directory(&d, &the_index, pathbuf, namelen+1, NULL);1657if(i)1658return o->gently ? -1:1659add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);1660free(pathbuf);1661return cnt;1662}16631664/*1665 * This gets called when there was no index entry for the tree entry 'dst',1666 * but we found a file in the working tree that 'lstat()' said was fine,1667 * and we're on a case-insensitive filesystem.1668 *1669 * See if we can find a case-insensitive match in the index that also1670 * matches the stat information, and assume it's that other file!1671 */1672static inticase_exists(struct unpack_trees_options *o,const char*name,int len,struct stat *st)1673{1674const struct cache_entry *src;16751676 src =index_file_exists(o->src_index, name, len,1);1677return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);1678}16791680static intcheck_ok_to_remove(const char*name,int len,int dtype,1681const struct cache_entry *ce,struct stat *st,1682enum unpack_trees_error_types error_type,1683struct unpack_trees_options *o)1684{1685const struct cache_entry *result;16861687/*1688 * It may be that the 'lstat()' succeeded even though1689 * target 'ce' was absent, because there is an old1690 * entry that is different only in case..1691 *1692 * Ignore that lstat() if it matches.1693 */1694if(ignore_case &&icase_exists(o, name, len, st))1695return0;16961697if(o->dir &&1698is_excluded(o->dir, &the_index, name, &dtype))1699/*1700 * ce->name is explicitly excluded, so it is Ok to1701 * overwrite it.1702 */1703return0;1704if(S_ISDIR(st->st_mode)) {1705/*1706 * We are checking out path "foo" and1707 * found "foo/." in the working tree.1708 * This is tricky -- if we have modified1709 * files that are in "foo/" we would lose1710 * them.1711 */1712if(verify_clean_subdirectory(ce, error_type, o) <0)1713return-1;1714return0;1715}17161717/*1718 * The previous round may already have decided to1719 * delete this path, which is in a subdirectory that1720 * is being replaced with a blob.1721 */1722 result =index_file_exists(&o->result, name, len,0);1723if(result) {1724if(result->ce_flags & CE_REMOVE)1725return0;1726}17271728return o->gently ? -1:1729add_rejected_path(o, error_type, name);1730}17311732/*1733 * We do not want to remove or overwrite a working tree file that1734 * is not tracked, unless it is ignored.1735 */1736static intverify_absent_1(const struct cache_entry *ce,1737enum unpack_trees_error_types error_type,1738struct unpack_trees_options *o)1739{1740int len;1741struct stat st;17421743if(o->index_only || o->reset || !o->update)1744return0;17451746 len =check_leading_path(ce->name,ce_namelen(ce));1747if(!len)1748return0;1749else if(len >0) {1750char*path;1751int ret;17521753 path =xmemdupz(ce->name, len);1754if(lstat(path, &st))1755 ret =error_errno("cannot stat '%s'", path);1756else{1757if(submodule_from_ce(ce))1758 ret =check_submodule_move_head(ce,1759oid_to_hex(&ce->oid),1760 NULL, o);1761else1762 ret =check_ok_to_remove(path, len, DT_UNKNOWN, NULL,1763&st, error_type, o);1764}1765free(path);1766return ret;1767}else if(lstat(ce->name, &st)) {1768if(errno != ENOENT)1769returnerror_errno("cannot stat '%s'", ce->name);1770return0;1771}else{1772if(submodule_from_ce(ce))1773returncheck_submodule_move_head(ce,oid_to_hex(&ce->oid),1774 NULL, o);17751776returncheck_ok_to_remove(ce->name,ce_namelen(ce),1777ce_to_dtype(ce), ce, &st,1778 error_type, o);1779}1780}17811782static intverify_absent(const struct cache_entry *ce,1783enum unpack_trees_error_types error_type,1784struct unpack_trees_options *o)1785{1786if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1787return0;1788returnverify_absent_1(ce, error_type, o);1789}17901791static intverify_absent_sparse(const struct cache_entry *ce,1792enum unpack_trees_error_types error_type,1793struct unpack_trees_options *o)1794{1795enum unpack_trees_error_types orphaned_error = error_type;1796if(orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)1797 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;17981799returnverify_absent_1(ce, orphaned_error, o);1800}18011802static intmerged_entry(const struct cache_entry *ce,1803const struct cache_entry *old,1804struct unpack_trees_options *o)1805{1806int update = CE_UPDATE;1807struct cache_entry *merge =dup_cache_entry(ce, &o->result);18081809if(!old) {1810/*1811 * New index entries. In sparse checkout, the following1812 * verify_absent() will be delayed until after1813 * traverse_trees() finishes in unpack_trees(), then:1814 *1815 * - CE_NEW_SKIP_WORKTREE will be computed correctly1816 * - verify_absent() be called again, this time with1817 * correct CE_NEW_SKIP_WORKTREE1818 *1819 * verify_absent() call here does nothing in sparse1820 * checkout (i.e. o->skip_sparse_checkout == 0)1821 */1822 update |= CE_ADDED;1823 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;18241825if(verify_absent(merge,1826 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1827discard_cache_entry(merge);1828return-1;1829}1830invalidate_ce_path(merge, o);18311832if(submodule_from_ce(ce)) {1833int ret =check_submodule_move_head(ce, NULL,1834oid_to_hex(&ce->oid),1835 o);1836if(ret)1837return ret;1838}18391840}else if(!(old->ce_flags & CE_CONFLICTED)) {1841/*1842 * See if we can re-use the old CE directly?1843 * That way we get the uptodate stat info.1844 *1845 * This also removes the UPDATE flag on a match; otherwise1846 * we will end up overwriting local changes in the work tree.1847 */1848if(same(old, merge)) {1849copy_cache_entry(merge, old);1850 update =0;1851}else{1852if(verify_uptodate(old, o)) {1853discard_cache_entry(merge);1854return-1;1855}1856/* Migrate old flags over */1857 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);1858invalidate_ce_path(old, o);1859}18601861if(submodule_from_ce(ce)) {1862int ret =check_submodule_move_head(ce,oid_to_hex(&old->oid),1863oid_to_hex(&ce->oid),1864 o);1865if(ret)1866return ret;1867}1868}else{1869/*1870 * Previously unmerged entry left as an existence1871 * marker by read_index_unmerged();1872 */1873invalidate_ce_path(old, o);1874}18751876do_add_entry(o, merge, update, CE_STAGEMASK);1877return1;1878}18791880static intdeleted_entry(const struct cache_entry *ce,1881const struct cache_entry *old,1882struct unpack_trees_options *o)1883{1884/* Did it exist in the index? */1885if(!old) {1886if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))1887return-1;1888return0;1889}1890if(!(old->ce_flags & CE_CONFLICTED) &&verify_uptodate(old, o))1891return-1;1892add_entry(o, ce, CE_REMOVE,0);1893invalidate_ce_path(ce, o);1894return1;1895}18961897static intkeep_entry(const struct cache_entry *ce,1898struct unpack_trees_options *o)1899{1900add_entry(o, ce,0,0);1901return1;1902}19031904#if DBRT_DEBUG1905static voidshow_stage_entry(FILE*o,1906const char*label,const struct cache_entry *ce)1907{1908if(!ce)1909fprintf(o,"%s(missing)\n", label);1910else1911fprintf(o,"%s%06o%s %d\t%s\n",1912 label,1913 ce->ce_mode,1914oid_to_hex(&ce->oid),1915ce_stage(ce),1916 ce->name);1917}1918#endif19191920intthreeway_merge(const struct cache_entry *const*stages,1921struct unpack_trees_options *o)1922{1923const struct cache_entry *index;1924const struct cache_entry *head;1925const struct cache_entry *remote = stages[o->head_idx +1];1926int count;1927int head_match =0;1928int remote_match =0;19291930int df_conflict_head =0;1931int df_conflict_remote =0;19321933int any_anc_missing =0;1934int no_anc_exists =1;1935int i;19361937for(i =1; i < o->head_idx; i++) {1938if(!stages[i] || stages[i] == o->df_conflict_entry)1939 any_anc_missing =1;1940else1941 no_anc_exists =0;1942}19431944 index = stages[0];1945 head = stages[o->head_idx];19461947if(head == o->df_conflict_entry) {1948 df_conflict_head =1;1949 head = NULL;1950}19511952if(remote == o->df_conflict_entry) {1953 df_conflict_remote =1;1954 remote = NULL;1955}19561957/*1958 * First, if there's a #16 situation, note that to prevent #131959 * and #14.1960 */1961if(!same(remote, head)) {1962for(i =1; i < o->head_idx; i++) {1963if(same(stages[i], head)) {1964 head_match = i;1965}1966if(same(stages[i], remote)) {1967 remote_match = i;1968}1969}1970}19711972/*1973 * We start with cases where the index is allowed to match1974 * something other than the head: #14(ALT) and #2ALT, where it1975 * is permitted to match the result instead.1976 */1977/* #14, #14ALT, #2ALT */1978if(remote && !df_conflict_head && head_match && !remote_match) {1979if(index && !same(index, remote) && !same(index, head))1980returnreject_merge(index, o);1981returnmerged_entry(remote, index, o);1982}1983/*1984 * If we have an entry in the index cache, then we want to1985 * make sure that it matches head.1986 */1987if(index && !same(index, head))1988returnreject_merge(index, o);19891990if(head) {1991/* #5ALT, #15 */1992if(same(head, remote))1993returnmerged_entry(head, index, o);1994/* #13, #3ALT */1995if(!df_conflict_remote && remote_match && !head_match)1996returnmerged_entry(head, index, o);1997}19981999/* #1 */2000if(!head && !remote && any_anc_missing)2001return0;20022003/*2004 * Under the "aggressive" rule, we resolve mostly trivial2005 * cases that we historically had git-merge-one-file resolve.2006 */2007if(o->aggressive) {2008int head_deleted = !head;2009int remote_deleted = !remote;2010const struct cache_entry *ce = NULL;20112012if(index)2013 ce = index;2014else if(head)2015 ce = head;2016else if(remote)2017 ce = remote;2018else{2019for(i =1; i < o->head_idx; i++) {2020if(stages[i] && stages[i] != o->df_conflict_entry) {2021 ce = stages[i];2022break;2023}2024}2025}20262027/*2028 * Deleted in both.2029 * Deleted in one and unchanged in the other.2030 */2031if((head_deleted && remote_deleted) ||2032(head_deleted && remote && remote_match) ||2033(remote_deleted && head && head_match)) {2034if(index)2035returndeleted_entry(index, index, o);2036if(ce && !head_deleted) {2037if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))2038return-1;2039}2040return0;2041}2042/*2043 * Added in both, identically.2044 */2045if(no_anc_exists && head && remote &&same(head, remote))2046returnmerged_entry(head, index, o);20472048}20492050/* Below are "no merge" cases, which require that the index be2051 * up-to-date to avoid the files getting overwritten with2052 * conflict resolution files.2053 */2054if(index) {2055if(verify_uptodate(index, o))2056return-1;2057}20582059 o->nontrivial_merge =1;20602061/* #2, #3, #4, #6, #7, #9, #10, #11. */2062 count =0;2063if(!head_match || !remote_match) {2064for(i =1; i < o->head_idx; i++) {2065if(stages[i] && stages[i] != o->df_conflict_entry) {2066keep_entry(stages[i], o);2067 count++;2068break;2069}2070}2071}2072#if DBRT_DEBUG2073else{2074fprintf(stderr,"read-tree: warning #16 detected\n");2075show_stage_entry(stderr,"head ", stages[head_match]);2076show_stage_entry(stderr,"remote ", stages[remote_match]);2077}2078#endif2079if(head) { count +=keep_entry(head, o); }2080if(remote) { count +=keep_entry(remote, o); }2081return count;2082}20832084/*2085 * Two-way merge.2086 *2087 * The rule is to "carry forward" what is in the index without losing2088 * information across a "fast-forward", favoring a successful merge2089 * over a merge failure when it makes sense. For details of the2090 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.2091 *2092 */2093inttwoway_merge(const struct cache_entry *const*src,2094struct unpack_trees_options *o)2095{2096const struct cache_entry *current = src[0];2097const struct cache_entry *oldtree = src[1];2098const struct cache_entry *newtree = src[2];20992100if(o->merge_size !=2)2101returnerror("Cannot do a twoway merge of%dtrees",2102 o->merge_size);21032104if(oldtree == o->df_conflict_entry)2105 oldtree = NULL;2106if(newtree == o->df_conflict_entry)2107 newtree = NULL;21082109if(current) {2110if(current->ce_flags & CE_CONFLICTED) {2111if(same(oldtree, newtree) || o->reset) {2112if(!newtree)2113returndeleted_entry(current, current, o);2114else2115returnmerged_entry(newtree, current, o);2116}2117returnreject_merge(current, o);2118}else if((!oldtree && !newtree) ||/* 4 and 5 */2119(!oldtree && newtree &&2120same(current, newtree)) ||/* 6 and 7 */2121(oldtree && newtree &&2122same(oldtree, newtree)) ||/* 14 and 15 */2123(oldtree && newtree &&2124!same(oldtree, newtree) &&/* 18 and 19 */2125same(current, newtree))) {2126returnkeep_entry(current, o);2127}else if(oldtree && !newtree &&same(current, oldtree)) {2128/* 10 or 11 */2129returndeleted_entry(oldtree, current, o);2130}else if(oldtree && newtree &&2131same(current, oldtree) && !same(current, newtree)) {2132/* 20 or 21 */2133returnmerged_entry(newtree, current, o);2134}else2135returnreject_merge(current, o);2136}2137else if(newtree) {2138if(oldtree && !o->initial_checkout) {2139/*2140 * deletion of the path was staged;2141 */2142if(same(oldtree, newtree))2143return1;2144returnreject_merge(oldtree, o);2145}2146returnmerged_entry(newtree, current, o);2147}2148returndeleted_entry(oldtree, current, o);2149}21502151/*2152 * Bind merge.2153 *2154 * Keep the index entries at stage0, collapse stage1 but make sure2155 * stage0 does not have anything there.2156 */2157intbind_merge(const struct cache_entry *const*src,2158struct unpack_trees_options *o)2159{2160const struct cache_entry *old = src[0];2161const struct cache_entry *a = src[1];21622163if(o->merge_size !=1)2164returnerror("Cannot do a bind merge of%dtrees",2165 o->merge_size);2166if(a && old)2167return o->gently ? -1:2168error(ERRORMSG(o, ERROR_BIND_OVERLAP),2169super_prefixed(a->name),2170super_prefixed(old->name));2171if(!a)2172returnkeep_entry(old, o);2173else2174returnmerged_entry(a, NULL, o);2175}21762177/*2178 * One-way merge.2179 *2180 * The rule is:2181 * - take the stat information from stage0, take the data from stage12182 */2183intoneway_merge(const struct cache_entry *const*src,2184struct unpack_trees_options *o)2185{2186const struct cache_entry *old = src[0];2187const struct cache_entry *a = src[1];21882189if(o->merge_size !=1)2190returnerror("Cannot do a oneway merge of%dtrees",2191 o->merge_size);21922193if(!a || a == o->df_conflict_entry)2194returndeleted_entry(old, old, o);21952196if(old &&same(old, a)) {2197int update =0;2198if(o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {2199struct stat st;2200if(lstat(old->name, &st) ||2201ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))2202 update |= CE_UPDATE;2203}2204if(o->update &&S_ISGITLINK(old->ce_mode) &&2205should_update_submodules() && !verify_uptodate(old, o))2206 update |= CE_UPDATE;2207add_entry(o, old, update,0);2208return0;2209}2210returnmerged_entry(a, old, o);2211}