1/* 2 * GIT - The information manager from hell 3 * 4 * Copyright (C) Linus Torvalds, 2005 5 */ 6#define NO_THE_INDEX_COMPATIBILITY_MACROS 7#include"cache.h" 8#include"cache-tree.h" 9#include"refs.h" 10#include"dir.h" 11#include"tree.h" 12#include"commit.h" 13#include"diff.h" 14#include"diffcore.h" 15#include"revision.h" 16#include"blob.h" 17 18/* Index extensions. 19 * 20 * The first letter should be 'A'..'Z' for extensions that are not 21 * necessary for a correct operation (i.e. optimization data). 22 * When new extensions are added that _needs_ to be understood in 23 * order to correctly interpret the index file, pick character that 24 * is outside the range, to cause the reader to abort. 25 */ 26 27#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) ) 28#define CACHE_EXT_TREE 0x54524545/* "TREE" */ 29 30struct index_state the_index; 31 32static voidset_index_entry(struct index_state *istate,int nr,struct cache_entry *ce) 33{ 34 istate->cache[nr] = ce; 35add_name_hash(istate, ce); 36} 37 38static voidreplace_index_entry(struct index_state *istate,int nr,struct cache_entry *ce) 39{ 40struct cache_entry *old = istate->cache[nr]; 41 42remove_name_hash(old); 43set_index_entry(istate, nr, ce); 44 istate->cache_changed =1; 45} 46 47voidrename_index_entry_at(struct index_state *istate,int nr,const char*new_name) 48{ 49struct cache_entry *old = istate->cache[nr], *new; 50int namelen =strlen(new_name); 51 52new=xmalloc(cache_entry_size(namelen)); 53copy_cache_entry(new, old); 54new->ce_flags &= ~(CE_STATE_MASK | CE_NAMEMASK); 55new->ce_flags |= (namelen >= CE_NAMEMASK ? CE_NAMEMASK : namelen); 56memcpy(new->name, new_name, namelen +1); 57 58cache_tree_invalidate_path(istate->cache_tree, old->name); 59remove_index_entry_at(istate, nr); 60add_index_entry(istate,new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); 61} 62 63/* 64 * This only updates the "non-critical" parts of the directory 65 * cache, ie the parts that aren't tracked by GIT, and only used 66 * to validate the cache. 67 */ 68voidfill_stat_cache_info(struct cache_entry *ce,struct stat *st) 69{ 70 ce->ce_ctime = st->st_ctime; 71 ce->ce_mtime = st->st_mtime; 72 ce->ce_dev = st->st_dev; 73 ce->ce_ino = st->st_ino; 74 ce->ce_uid = st->st_uid; 75 ce->ce_gid = st->st_gid; 76 ce->ce_size = st->st_size; 77 78if(assume_unchanged) 79 ce->ce_flags |= CE_VALID; 80 81if(S_ISREG(st->st_mode)) 82ce_mark_uptodate(ce); 83} 84 85static intce_compare_data(struct cache_entry *ce,struct stat *st) 86{ 87int match = -1; 88int fd =open(ce->name, O_RDONLY); 89 90if(fd >=0) { 91unsigned char sha1[20]; 92if(!index_fd(sha1, fd, st,0, OBJ_BLOB, ce->name)) 93 match =hashcmp(sha1, ce->sha1); 94/* index_fd() closed the file descriptor already */ 95} 96return match; 97} 98 99static intce_compare_link(struct cache_entry *ce,size_t expected_size) 100{ 101int match = -1; 102char*target; 103void*buffer; 104unsigned long size; 105enum object_type type; 106int len; 107 108 target =xmalloc(expected_size); 109 len =readlink(ce->name, target, expected_size); 110if(len != expected_size) { 111free(target); 112return-1; 113} 114 buffer =read_sha1_file(ce->sha1, &type, &size); 115if(!buffer) { 116free(target); 117return-1; 118} 119if(size == expected_size) 120 match =memcmp(buffer, target, size); 121free(buffer); 122free(target); 123return match; 124} 125 126static intce_compare_gitlink(struct cache_entry *ce) 127{ 128unsigned char sha1[20]; 129 130/* 131 * We don't actually require that the .git directory 132 * under GITLINK directory be a valid git directory. It 133 * might even be missing (in case nobody populated that 134 * sub-project). 135 * 136 * If so, we consider it always to match. 137 */ 138if(resolve_gitlink_ref(ce->name,"HEAD", sha1) <0) 139return0; 140returnhashcmp(sha1, ce->sha1); 141} 142 143static intce_modified_check_fs(struct cache_entry *ce,struct stat *st) 144{ 145switch(st->st_mode & S_IFMT) { 146case S_IFREG: 147if(ce_compare_data(ce, st)) 148return DATA_CHANGED; 149break; 150case S_IFLNK: 151if(ce_compare_link(ce,xsize_t(st->st_size))) 152return DATA_CHANGED; 153break; 154case S_IFDIR: 155if(S_ISGITLINK(ce->ce_mode)) 156returnce_compare_gitlink(ce) ? DATA_CHANGED :0; 157default: 158return TYPE_CHANGED; 159} 160return0; 161} 162 163intis_empty_blob_sha1(const unsigned char*sha1) 164{ 165static const unsigned char empty_blob_sha1[20] = { 1660xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b, 1670x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91 168}; 169 170return!hashcmp(sha1, empty_blob_sha1); 171} 172 173static intce_match_stat_basic(struct cache_entry *ce,struct stat *st) 174{ 175unsigned int changed =0; 176 177if(ce->ce_flags & CE_REMOVE) 178return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED; 179 180switch(ce->ce_mode & S_IFMT) { 181case S_IFREG: 182 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED :0; 183/* We consider only the owner x bit to be relevant for 184 * "mode changes" 185 */ 186if(trust_executable_bit && 187(0100& (ce->ce_mode ^ st->st_mode))) 188 changed |= MODE_CHANGED; 189break; 190case S_IFLNK: 191if(!S_ISLNK(st->st_mode) && 192(has_symlinks || !S_ISREG(st->st_mode))) 193 changed |= TYPE_CHANGED; 194break; 195case S_IFGITLINK: 196/* We ignore most of the st_xxx fields for gitlinks */ 197if(!S_ISDIR(st->st_mode)) 198 changed |= TYPE_CHANGED; 199else if(ce_compare_gitlink(ce)) 200 changed |= DATA_CHANGED; 201return changed; 202default: 203die("internal error: ce_mode is%o", ce->ce_mode); 204} 205if(ce->ce_mtime != (unsigned int) st->st_mtime) 206 changed |= MTIME_CHANGED; 207if(trust_ctime && ce->ce_ctime != (unsigned int) st->st_ctime) 208 changed |= CTIME_CHANGED; 209 210if(ce->ce_uid != (unsigned int) st->st_uid || 211 ce->ce_gid != (unsigned int) st->st_gid) 212 changed |= OWNER_CHANGED; 213if(ce->ce_ino != (unsigned int) st->st_ino) 214 changed |= INODE_CHANGED; 215 216#ifdef USE_STDEV 217/* 218 * st_dev breaks on network filesystems where different 219 * clients will have different views of what "device" 220 * the filesystem is on 221 */ 222if(ce->ce_dev != (unsigned int) st->st_dev) 223 changed |= INODE_CHANGED; 224#endif 225 226if(ce->ce_size != (unsigned int) st->st_size) 227 changed |= DATA_CHANGED; 228 229/* Racily smudged entry? */ 230if(!ce->ce_size) { 231if(!is_empty_blob_sha1(ce->sha1)) 232 changed |= DATA_CHANGED; 233} 234 235return changed; 236} 237 238static intis_racy_timestamp(const struct index_state *istate,struct cache_entry *ce) 239{ 240return(!S_ISGITLINK(ce->ce_mode) && 241 istate->timestamp && 242((unsigned int)istate->timestamp) <= ce->ce_mtime); 243} 244 245intie_match_stat(const struct index_state *istate, 246struct cache_entry *ce,struct stat *st, 247unsigned int options) 248{ 249unsigned int changed; 250int ignore_valid = options & CE_MATCH_IGNORE_VALID; 251int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY; 252 253/* 254 * If it's marked as always valid in the index, it's 255 * valid whatever the checked-out copy says. 256 */ 257if(!ignore_valid && (ce->ce_flags & CE_VALID)) 258return0; 259 260 changed =ce_match_stat_basic(ce, st); 261 262/* 263 * Within 1 second of this sequence: 264 * echo xyzzy >file && git-update-index --add file 265 * running this command: 266 * echo frotz >file 267 * would give a falsely clean cache entry. The mtime and 268 * length match the cache, and other stat fields do not change. 269 * 270 * We could detect this at update-index time (the cache entry 271 * being registered/updated records the same time as "now") 272 * and delay the return from git-update-index, but that would 273 * effectively mean we can make at most one commit per second, 274 * which is not acceptable. Instead, we check cache entries 275 * whose mtime are the same as the index file timestamp more 276 * carefully than others. 277 */ 278if(!changed &&is_racy_timestamp(istate, ce)) { 279if(assume_racy_is_modified) 280 changed |= DATA_CHANGED; 281else 282 changed |=ce_modified_check_fs(ce, st); 283} 284 285return changed; 286} 287 288intie_modified(const struct index_state *istate, 289struct cache_entry *ce,struct stat *st,unsigned int options) 290{ 291int changed, changed_fs; 292 293 changed =ie_match_stat(istate, ce, st, options); 294if(!changed) 295return0; 296/* 297 * If the mode or type has changed, there's no point in trying 298 * to refresh the entry - it's not going to match 299 */ 300if(changed & (MODE_CHANGED | TYPE_CHANGED)) 301return changed; 302 303/* 304 * Immediately after read-tree or update-index --cacheinfo, 305 * the length field is zero, as we have never even read the 306 * lstat(2) information once, and we cannot trust DATA_CHANGED 307 * returned by ie_match_stat() which in turn was returned by 308 * ce_match_stat_basic() to signal that the filesize of the 309 * blob changed. We have to actually go to the filesystem to 310 * see if the contents match, and if so, should answer "unchanged". 311 * 312 * The logic does not apply to gitlinks, as ce_match_stat_basic() 313 * already has checked the actual HEAD from the filesystem in the 314 * subproject. If ie_match_stat() already said it is different, 315 * then we know it is. 316 */ 317if((changed & DATA_CHANGED) && 318(S_ISGITLINK(ce->ce_mode) || ce->ce_size !=0)) 319return changed; 320 321 changed_fs =ce_modified_check_fs(ce, st); 322if(changed_fs) 323return changed | changed_fs; 324return0; 325} 326 327intbase_name_compare(const char*name1,int len1,int mode1, 328const char*name2,int len2,int mode2) 329{ 330unsigned char c1, c2; 331int len = len1 < len2 ? len1 : len2; 332int cmp; 333 334 cmp =memcmp(name1, name2, len); 335if(cmp) 336return cmp; 337 c1 = name1[len]; 338 c2 = name2[len]; 339if(!c1 &&S_ISDIR(mode1)) 340 c1 ='/'; 341if(!c2 &&S_ISDIR(mode2)) 342 c2 ='/'; 343return(c1 < c2) ? -1: (c1 > c2) ?1:0; 344} 345 346/* 347 * df_name_compare() is identical to base_name_compare(), except it 348 * compares conflicting directory/file entries as equal. Note that 349 * while a directory name compares as equal to a regular file, they 350 * then individually compare _differently_ to a filename that has 351 * a dot after the basename (because '\0' < '.' < '/'). 352 * 353 * This is used by routines that want to traverse the git namespace 354 * but then handle conflicting entries together when possible. 355 */ 356intdf_name_compare(const char*name1,int len1,int mode1, 357const char*name2,int len2,int mode2) 358{ 359int len = len1 < len2 ? len1 : len2, cmp; 360unsigned char c1, c2; 361 362 cmp =memcmp(name1, name2, len); 363if(cmp) 364return cmp; 365/* Directories and files compare equal (same length, same name) */ 366if(len1 == len2) 367return0; 368 c1 = name1[len]; 369if(!c1 &&S_ISDIR(mode1)) 370 c1 ='/'; 371 c2 = name2[len]; 372if(!c2 &&S_ISDIR(mode2)) 373 c2 ='/'; 374if(c1 =='/'&& !c2) 375return0; 376if(c2 =='/'&& !c1) 377return0; 378return c1 - c2; 379} 380 381intcache_name_compare(const char*name1,int flags1,const char*name2,int flags2) 382{ 383int len1 = flags1 & CE_NAMEMASK; 384int len2 = flags2 & CE_NAMEMASK; 385int len = len1 < len2 ? len1 : len2; 386int cmp; 387 388 cmp =memcmp(name1, name2, len); 389if(cmp) 390return cmp; 391if(len1 < len2) 392return-1; 393if(len1 > len2) 394return1; 395 396/* Compare stages */ 397 flags1 &= CE_STAGEMASK; 398 flags2 &= CE_STAGEMASK; 399 400if(flags1 < flags2) 401return-1; 402if(flags1 > flags2) 403return1; 404return0; 405} 406 407intindex_name_pos(const struct index_state *istate,const char*name,int namelen) 408{ 409int first, last; 410 411 first =0; 412 last = istate->cache_nr; 413while(last > first) { 414int next = (last + first) >>1; 415struct cache_entry *ce = istate->cache[next]; 416int cmp =cache_name_compare(name, namelen, ce->name, ce->ce_flags); 417if(!cmp) 418return next; 419if(cmp <0) { 420 last = next; 421continue; 422} 423 first = next+1; 424} 425return-first-1; 426} 427 428/* Remove entry, return true if there are more entries to go.. */ 429intremove_index_entry_at(struct index_state *istate,int pos) 430{ 431struct cache_entry *ce = istate->cache[pos]; 432 433remove_name_hash(ce); 434 istate->cache_changed =1; 435 istate->cache_nr--; 436if(pos >= istate->cache_nr) 437return0; 438memmove(istate->cache + pos, 439 istate->cache + pos +1, 440(istate->cache_nr - pos) *sizeof(struct cache_entry *)); 441return1; 442} 443 444intremove_file_from_index(struct index_state *istate,const char*path) 445{ 446int pos =index_name_pos(istate, path,strlen(path)); 447if(pos <0) 448 pos = -pos-1; 449cache_tree_invalidate_path(istate->cache_tree, path); 450while(pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path)) 451remove_index_entry_at(istate, pos); 452return0; 453} 454 455static intcompare_name(struct cache_entry *ce,const char*path,int namelen) 456{ 457return namelen !=ce_namelen(ce) ||memcmp(path, ce->name, namelen); 458} 459 460static intindex_name_pos_also_unmerged(struct index_state *istate, 461const char*path,int namelen) 462{ 463int pos =index_name_pos(istate, path, namelen); 464struct cache_entry *ce; 465 466if(pos >=0) 467return pos; 468 469/* maybe unmerged? */ 470 pos = -1- pos; 471if(pos >= istate->cache_nr || 472compare_name((ce = istate->cache[pos]), path, namelen)) 473return-1; 474 475/* order of preference: stage 2, 1, 3 */ 476if(ce_stage(ce) ==1&& pos +1< istate->cache_nr && 477ce_stage((ce = istate->cache[pos +1])) ==2&& 478!compare_name(ce, path, namelen)) 479 pos++; 480return pos; 481} 482 483static intdifferent_name(struct cache_entry *ce,struct cache_entry *alias) 484{ 485int len =ce_namelen(ce); 486returnce_namelen(alias) != len ||memcmp(ce->name, alias->name, len); 487} 488 489/* 490 * If we add a filename that aliases in the cache, we will use the 491 * name that we already have - but we don't want to update the same 492 * alias twice, because that implies that there were actually two 493 * different files with aliasing names! 494 * 495 * So we use the CE_ADDED flag to verify that the alias was an old 496 * one before we accept it as 497 */ 498static struct cache_entry *create_alias_ce(struct cache_entry *ce,struct cache_entry *alias) 499{ 500int len; 501struct cache_entry *new; 502 503if(alias->ce_flags & CE_ADDED) 504die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name); 505 506/* Ok, create the new entry using the name of the existing alias */ 507 len =ce_namelen(alias); 508new=xcalloc(1,cache_entry_size(len)); 509memcpy(new->name, alias->name, len); 510copy_cache_entry(new, ce); 511free(ce); 512return new; 513} 514 515static voidrecord_intent_to_add(struct cache_entry *ce) 516{ 517unsigned char sha1[20]; 518if(write_sha1_file("",0, blob_type, sha1)) 519die("cannot create an empty blob in the object database"); 520hashcpy(ce->sha1, sha1); 521} 522 523intadd_to_index(struct index_state *istate,const char*path,struct stat *st,int flags) 524{ 525int size, namelen, was_same; 526 mode_t st_mode = st->st_mode; 527struct cache_entry *ce, *alias; 528unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY; 529int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND); 530int pretend = flags & ADD_CACHE_PRETEND; 531int intent_only = flags & ADD_CACHE_INTENT; 532int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE| 533(intent_only ? ADD_CACHE_NEW_ONLY :0)); 534 535if(!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode)) 536returnerror("%s: can only add regular files, symbolic links or git-directories", path); 537 538 namelen =strlen(path); 539if(S_ISDIR(st_mode)) { 540while(namelen && path[namelen-1] =='/') 541 namelen--; 542} 543 size =cache_entry_size(namelen); 544 ce =xcalloc(1, size); 545memcpy(ce->name, path, namelen); 546 ce->ce_flags = namelen; 547if(!intent_only) 548fill_stat_cache_info(ce, st); 549 550if(trust_executable_bit && has_symlinks) 551 ce->ce_mode =create_ce_mode(st_mode); 552else{ 553/* If there is an existing entry, pick the mode bits and type 554 * from it, otherwise assume unexecutable regular file. 555 */ 556struct cache_entry *ent; 557int pos =index_name_pos_also_unmerged(istate, path, namelen); 558 559 ent = (0<= pos) ? istate->cache[pos] : NULL; 560 ce->ce_mode =ce_mode_from_stat(ent, st_mode); 561} 562 563 alias =index_name_exists(istate, ce->name,ce_namelen(ce), ignore_case); 564if(alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) { 565/* Nothing changed, really */ 566free(ce); 567ce_mark_uptodate(alias); 568 alias->ce_flags |= CE_ADDED; 569return0; 570} 571if(!intent_only) { 572if(index_path(ce->sha1, path, st,1)) 573returnerror("unable to index file%s", path); 574}else 575record_intent_to_add(ce); 576 577if(ignore_case && alias &&different_name(ce, alias)) 578 ce =create_alias_ce(ce, alias); 579 ce->ce_flags |= CE_ADDED; 580 581/* It was suspected to be racily clean, but it turns out to be Ok */ 582 was_same = (alias && 583!ce_stage(alias) && 584!hashcmp(alias->sha1, ce->sha1) && 585 ce->ce_mode == alias->ce_mode); 586 587if(pretend) 588; 589else if(add_index_entry(istate, ce, add_option)) 590returnerror("unable to add%sto index",path); 591if(verbose && !was_same) 592printf("add '%s'\n", path); 593return0; 594} 595 596intadd_file_to_index(struct index_state *istate,const char*path,int flags) 597{ 598struct stat st; 599if(lstat(path, &st)) 600die("%s: unable to stat (%s)", path,strerror(errno)); 601returnadd_to_index(istate, path, &st, flags); 602} 603 604struct cache_entry *make_cache_entry(unsigned int mode, 605const unsigned char*sha1,const char*path,int stage, 606int refresh) 607{ 608int size, len; 609struct cache_entry *ce; 610 611if(!verify_path(path)) { 612error("Invalid path '%s'", path); 613return NULL; 614} 615 616 len =strlen(path); 617 size =cache_entry_size(len); 618 ce =xcalloc(1, size); 619 620hashcpy(ce->sha1, sha1); 621memcpy(ce->name, path, len); 622 ce->ce_flags =create_ce_flags(len, stage); 623 ce->ce_mode =create_ce_mode(mode); 624 625if(refresh) 626returnrefresh_cache_entry(ce,0); 627 628return ce; 629} 630 631intce_same_name(struct cache_entry *a,struct cache_entry *b) 632{ 633int len =ce_namelen(a); 634returnce_namelen(b) == len && !memcmp(a->name, b->name, len); 635} 636 637intce_path_match(const struct cache_entry *ce,const char**pathspec) 638{ 639const char*match, *name; 640int len; 641 642if(!pathspec) 643return1; 644 645 len =ce_namelen(ce); 646 name = ce->name; 647while((match = *pathspec++) != NULL) { 648int matchlen =strlen(match); 649if(matchlen > len) 650continue; 651if(memcmp(name, match, matchlen)) 652continue; 653if(matchlen && name[matchlen-1] =='/') 654return1; 655if(name[matchlen] =='/'|| !name[matchlen]) 656return1; 657if(!matchlen) 658return1; 659} 660return0; 661} 662 663/* 664 * We fundamentally don't like some paths: we don't want 665 * dot or dot-dot anywhere, and for obvious reasons don't 666 * want to recurse into ".git" either. 667 * 668 * Also, we don't want double slashes or slashes at the 669 * end that can make pathnames ambiguous. 670 */ 671static intverify_dotfile(const char*rest) 672{ 673/* 674 * The first character was '.', but that 675 * has already been discarded, we now test 676 * the rest. 677 */ 678switch(*rest) { 679/* "." is not allowed */ 680case'\0':case'/': 681return0; 682 683/* 684 * ".git" followed by NUL or slash is bad. This 685 * shares the path end test with the ".." case. 686 */ 687case'g': 688if(rest[1] !='i') 689break; 690if(rest[2] !='t') 691break; 692 rest +=2; 693/* fallthrough */ 694case'.': 695if(rest[1] =='\0'|| rest[1] =='/') 696return0; 697} 698return1; 699} 700 701intverify_path(const char*path) 702{ 703char c; 704 705goto inside; 706for(;;) { 707if(!c) 708return1; 709if(c =='/') { 710inside: 711 c = *path++; 712switch(c) { 713default: 714continue; 715case'/':case'\0': 716break; 717case'.': 718if(verify_dotfile(path)) 719continue; 720} 721return0; 722} 723 c = *path++; 724} 725} 726 727/* 728 * Do we have another file that has the beginning components being a 729 * proper superset of the name we're trying to add? 730 */ 731static inthas_file_name(struct index_state *istate, 732const struct cache_entry *ce,int pos,int ok_to_replace) 733{ 734int retval =0; 735int len =ce_namelen(ce); 736int stage =ce_stage(ce); 737const char*name = ce->name; 738 739while(pos < istate->cache_nr) { 740struct cache_entry *p = istate->cache[pos++]; 741 742if(len >=ce_namelen(p)) 743break; 744if(memcmp(name, p->name, len)) 745break; 746if(ce_stage(p) != stage) 747continue; 748if(p->name[len] !='/') 749continue; 750if(p->ce_flags & CE_REMOVE) 751continue; 752 retval = -1; 753if(!ok_to_replace) 754break; 755remove_index_entry_at(istate, --pos); 756} 757return retval; 758} 759 760/* 761 * Do we have another file with a pathname that is a proper 762 * subset of the name we're trying to add? 763 */ 764static inthas_dir_name(struct index_state *istate, 765const struct cache_entry *ce,int pos,int ok_to_replace) 766{ 767int retval =0; 768int stage =ce_stage(ce); 769const char*name = ce->name; 770const char*slash = name +ce_namelen(ce); 771 772for(;;) { 773int len; 774 775for(;;) { 776if(*--slash =='/') 777break; 778if(slash <= ce->name) 779return retval; 780} 781 len = slash - name; 782 783 pos =index_name_pos(istate, name,create_ce_flags(len, stage)); 784if(pos >=0) { 785/* 786 * Found one, but not so fast. This could 787 * be a marker that says "I was here, but 788 * I am being removed". Such an entry is 789 * not a part of the resulting tree, and 790 * it is Ok to have a directory at the same 791 * path. 792 */ 793if(!(istate->cache[pos]->ce_flags & CE_REMOVE)) { 794 retval = -1; 795if(!ok_to_replace) 796break; 797remove_index_entry_at(istate, pos); 798continue; 799} 800} 801else 802 pos = -pos-1; 803 804/* 805 * Trivial optimization: if we find an entry that 806 * already matches the sub-directory, then we know 807 * we're ok, and we can exit. 808 */ 809while(pos < istate->cache_nr) { 810struct cache_entry *p = istate->cache[pos]; 811if((ce_namelen(p) <= len) || 812(p->name[len] !='/') || 813memcmp(p->name, name, len)) 814break;/* not our subdirectory */ 815if(ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) 816/* 817 * p is at the same stage as our entry, and 818 * is a subdirectory of what we are looking 819 * at, so we cannot have conflicts at our 820 * level or anything shorter. 821 */ 822return retval; 823 pos++; 824} 825} 826return retval; 827} 828 829/* We may be in a situation where we already have path/file and path 830 * is being added, or we already have path and path/file is being 831 * added. Either one would result in a nonsense tree that has path 832 * twice when git-write-tree tries to write it out. Prevent it. 833 * 834 * If ok-to-replace is specified, we remove the conflicting entries 835 * from the cache so the caller should recompute the insert position. 836 * When this happens, we return non-zero. 837 */ 838static intcheck_file_directory_conflict(struct index_state *istate, 839const struct cache_entry *ce, 840int pos,int ok_to_replace) 841{ 842int retval; 843 844/* 845 * When ce is an "I am going away" entry, we allow it to be added 846 */ 847if(ce->ce_flags & CE_REMOVE) 848return0; 849 850/* 851 * We check if the path is a sub-path of a subsequent pathname 852 * first, since removing those will not change the position 853 * in the array. 854 */ 855 retval =has_file_name(istate, ce, pos, ok_to_replace); 856 857/* 858 * Then check if the path might have a clashing sub-directory 859 * before it. 860 */ 861return retval +has_dir_name(istate, ce, pos, ok_to_replace); 862} 863 864static intadd_index_entry_with_check(struct index_state *istate,struct cache_entry *ce,int option) 865{ 866int pos; 867int ok_to_add = option & ADD_CACHE_OK_TO_ADD; 868int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; 869int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; 870int new_only = option & ADD_CACHE_NEW_ONLY; 871 872cache_tree_invalidate_path(istate->cache_tree, ce->name); 873 pos =index_name_pos(istate, ce->name, ce->ce_flags); 874 875/* existing match? Just replace it. */ 876if(pos >=0) { 877if(!new_only) 878replace_index_entry(istate, pos, ce); 879return0; 880} 881 pos = -pos-1; 882 883/* 884 * Inserting a merged entry ("stage 0") into the index 885 * will always replace all non-merged entries.. 886 */ 887if(pos < istate->cache_nr &&ce_stage(ce) ==0) { 888while(ce_same_name(istate->cache[pos], ce)) { 889 ok_to_add =1; 890if(!remove_index_entry_at(istate, pos)) 891break; 892} 893} 894 895if(!ok_to_add) 896return-1; 897if(!verify_path(ce->name)) 898returnerror("Invalid path '%s'", ce->name); 899 900if(!skip_df_check && 901check_file_directory_conflict(istate, ce, pos, ok_to_replace)) { 902if(!ok_to_replace) 903returnerror("'%s' appears as both a file and as a directory", 904 ce->name); 905 pos =index_name_pos(istate, ce->name, ce->ce_flags); 906 pos = -pos-1; 907} 908return pos +1; 909} 910 911intadd_index_entry(struct index_state *istate,struct cache_entry *ce,int option) 912{ 913int pos; 914 915if(option & ADD_CACHE_JUST_APPEND) 916 pos = istate->cache_nr; 917else{ 918int ret; 919 ret =add_index_entry_with_check(istate, ce, option); 920if(ret <=0) 921return ret; 922 pos = ret -1; 923} 924 925/* Make sure the array is big enough .. */ 926if(istate->cache_nr == istate->cache_alloc) { 927 istate->cache_alloc =alloc_nr(istate->cache_alloc); 928 istate->cache =xrealloc(istate->cache, 929 istate->cache_alloc *sizeof(struct cache_entry *)); 930} 931 932/* Add it in.. */ 933 istate->cache_nr++; 934if(istate->cache_nr > pos +1) 935memmove(istate->cache + pos +1, 936 istate->cache + pos, 937(istate->cache_nr - pos -1) *sizeof(ce)); 938set_index_entry(istate, pos, ce); 939 istate->cache_changed =1; 940return0; 941} 942 943/* 944 * "refresh" does not calculate a new sha1 file or bring the 945 * cache up-to-date for mode/content changes. But what it 946 * _does_ do is to "re-match" the stat information of a file 947 * with the cache, so that you can refresh the cache for a 948 * file that hasn't been changed but where the stat entry is 949 * out of date. 950 * 951 * For example, you'd want to do this after doing a "git-read-tree", 952 * to link up the stat cache details with the proper files. 953 */ 954static struct cache_entry *refresh_cache_ent(struct index_state *istate, 955struct cache_entry *ce, 956unsigned int options,int*err) 957{ 958struct stat st; 959struct cache_entry *updated; 960int changed, size; 961int ignore_valid = options & CE_MATCH_IGNORE_VALID; 962 963if(ce_uptodate(ce)) 964return ce; 965 966/* 967 * CE_VALID means the user promised us that the change to 968 * the work tree does not matter and told us not to worry. 969 */ 970if(!ignore_valid && (ce->ce_flags & CE_VALID)) { 971ce_mark_uptodate(ce); 972return ce; 973} 974 975if(lstat(ce->name, &st) <0) { 976if(err) 977*err = errno; 978return NULL; 979} 980 981 changed =ie_match_stat(istate, ce, &st, options); 982if(!changed) { 983/* 984 * The path is unchanged. If we were told to ignore 985 * valid bit, then we did the actual stat check and 986 * found that the entry is unmodified. If the entry 987 * is not marked VALID, this is the place to mark it 988 * valid again, under "assume unchanged" mode. 989 */ 990if(ignore_valid && assume_unchanged && 991!(ce->ce_flags & CE_VALID)) 992;/* mark this one VALID again */ 993else{ 994/* 995 * We do not mark the index itself "modified" 996 * because CE_UPTODATE flag is in-core only; 997 * we are not going to write this change out. 998 */ 999ce_mark_uptodate(ce);1000return ce;1001}1002}10031004if(ie_modified(istate, ce, &st, options)) {1005if(err)1006*err = EINVAL;1007return NULL;1008}10091010 size =ce_size(ce);1011 updated =xmalloc(size);1012memcpy(updated, ce, size);1013fill_stat_cache_info(updated, &st);1014/*1015 * If ignore_valid is not set, we should leave CE_VALID bit1016 * alone. Otherwise, paths marked with --no-assume-unchanged1017 * (i.e. things to be edited) will reacquire CE_VALID bit1018 * automatically, which is not really what we want.1019 */1020if(!ignore_valid && assume_unchanged &&1021!(ce->ce_flags & CE_VALID))1022 updated->ce_flags &= ~CE_VALID;10231024return updated;1025}10261027intrefresh_index(struct index_state *istate,unsigned int flags,const char**pathspec,char*seen)1028{1029int i;1030int has_errors =0;1031int really = (flags & REFRESH_REALLY) !=0;1032int allow_unmerged = (flags & REFRESH_UNMERGED) !=0;1033int quiet = (flags & REFRESH_QUIET) !=0;1034int not_new = (flags & REFRESH_IGNORE_MISSING) !=0;1035int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) !=0;1036unsigned int options = really ? CE_MATCH_IGNORE_VALID :0;1037const char*needs_update_message;10381039 needs_update_message = ((flags & REFRESH_SAY_CHANGED)1040?"locally modified":"needs update");1041for(i =0; i < istate->cache_nr; i++) {1042struct cache_entry *ce, *new;1043int cache_errno =0;10441045 ce = istate->cache[i];1046if(ignore_submodules &&S_ISGITLINK(ce->ce_mode))1047continue;10481049if(ce_stage(ce)) {1050while((i < istate->cache_nr) &&1051!strcmp(istate->cache[i]->name, ce->name))1052 i++;1053 i--;1054if(allow_unmerged)1055continue;1056printf("%s: needs merge\n", ce->name);1057 has_errors =1;1058continue;1059}10601061if(pathspec && !match_pathspec(pathspec, ce->name,strlen(ce->name),0, seen))1062continue;10631064new=refresh_cache_ent(istate, ce, options, &cache_errno);1065if(new== ce)1066continue;1067if(!new) {1068if(not_new && cache_errno == ENOENT)1069continue;1070if(really && cache_errno == EINVAL) {1071/* If we are doing --really-refresh that1072 * means the index is not valid anymore.1073 */1074 ce->ce_flags &= ~CE_VALID;1075 istate->cache_changed =1;1076}1077if(quiet)1078continue;1079printf("%s:%s\n", ce->name, needs_update_message);1080 has_errors =1;1081continue;1082}10831084replace_index_entry(istate, i,new);1085}1086return has_errors;1087}10881089struct cache_entry *refresh_cache_entry(struct cache_entry *ce,int really)1090{1091returnrefresh_cache_ent(&the_index, ce, really, NULL);1092}10931094static intverify_hdr(struct cache_header *hdr,unsigned long size)1095{1096 git_SHA_CTX c;1097unsigned char sha1[20];10981099if(hdr->hdr_signature !=htonl(CACHE_SIGNATURE))1100returnerror("bad signature");1101if(hdr->hdr_version !=htonl(2))1102returnerror("bad index version");1103git_SHA1_Init(&c);1104git_SHA1_Update(&c, hdr, size -20);1105git_SHA1_Final(sha1, &c);1106if(hashcmp(sha1, (unsigned char*)hdr + size -20))1107returnerror("bad index file sha1 signature");1108return0;1109}11101111static intread_index_extension(struct index_state *istate,1112const char*ext,void*data,unsigned long sz)1113{1114switch(CACHE_EXT(ext)) {1115case CACHE_EXT_TREE:1116 istate->cache_tree =cache_tree_read(data, sz);1117break;1118default:1119if(*ext <'A'||'Z'< *ext)1120returnerror("index uses %.4s extension, which we do not understand",1121 ext);1122fprintf(stderr,"ignoring %.4s extension\n", ext);1123break;1124}1125return0;1126}11271128intread_index(struct index_state *istate)1129{1130returnread_index_from(istate,get_index_file());1131}11321133static voidconvert_from_disk(struct ondisk_cache_entry *ondisk,struct cache_entry *ce)1134{1135size_t len;11361137 ce->ce_ctime =ntohl(ondisk->ctime.sec);1138 ce->ce_mtime =ntohl(ondisk->mtime.sec);1139 ce->ce_dev =ntohl(ondisk->dev);1140 ce->ce_ino =ntohl(ondisk->ino);1141 ce->ce_mode =ntohl(ondisk->mode);1142 ce->ce_uid =ntohl(ondisk->uid);1143 ce->ce_gid =ntohl(ondisk->gid);1144 ce->ce_size =ntohl(ondisk->size);1145/* On-disk flags are just 16 bits */1146 ce->ce_flags =ntohs(ondisk->flags);11471148/* For future extension: we do not understand this entry yet */1149if(ce->ce_flags & CE_EXTENDED)1150die("Unknown index entry format");1151hashcpy(ce->sha1, ondisk->sha1);11521153 len = ce->ce_flags & CE_NAMEMASK;1154if(len == CE_NAMEMASK)1155 len =strlen(ondisk->name);1156/*1157 * NEEDSWORK: If the original index is crafted, this copy could1158 * go unchecked.1159 */1160memcpy(ce->name, ondisk->name, len +1);1161}11621163staticinlinesize_testimate_cache_size(size_t ondisk_size,unsigned int entries)1164{1165long per_entry;11661167 per_entry =sizeof(struct cache_entry) -sizeof(struct ondisk_cache_entry);11681169/*1170 * Alignment can cause differences. This should be "alignof", but1171 * since that's a gcc'ism, just use the size of a pointer.1172 */1173 per_entry +=sizeof(void*);1174return ondisk_size + entries*per_entry;1175}11761177/* remember to discard_cache() before reading a different cache! */1178intread_index_from(struct index_state *istate,const char*path)1179{1180int fd, i;1181struct stat st;1182unsigned long src_offset, dst_offset;1183struct cache_header *hdr;1184void*mmap;1185size_t mmap_size;11861187 errno = EBUSY;1188if(istate->initialized)1189return istate->cache_nr;11901191 errno = ENOENT;1192 istate->timestamp =0;1193 fd =open(path, O_RDONLY);1194if(fd <0) {1195if(errno == ENOENT)1196return0;1197die("index file open failed (%s)",strerror(errno));1198}11991200if(fstat(fd, &st))1201die("cannot stat the open index (%s)",strerror(errno));12021203 errno = EINVAL;1204 mmap_size =xsize_t(st.st_size);1205if(mmap_size <sizeof(struct cache_header) +20)1206die("index file smaller than expected");12071208 mmap =xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,0);1209close(fd);1210if(mmap == MAP_FAILED)1211die("unable to map index file");12121213 hdr = mmap;1214if(verify_hdr(hdr, mmap_size) <0)1215goto unmap;12161217 istate->cache_nr =ntohl(hdr->hdr_entries);1218 istate->cache_alloc =alloc_nr(istate->cache_nr);1219 istate->cache =xcalloc(istate->cache_alloc,sizeof(struct cache_entry *));12201221/*1222 * The disk format is actually larger than the in-memory format,1223 * due to space for nsec etc, so even though the in-memory one1224 * has room for a few more flags, we can allocate using the same1225 * index size1226 */1227 istate->alloc =xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));1228 istate->initialized =1;12291230 src_offset =sizeof(*hdr);1231 dst_offset =0;1232for(i =0; i < istate->cache_nr; i++) {1233struct ondisk_cache_entry *disk_ce;1234struct cache_entry *ce;12351236 disk_ce = (struct ondisk_cache_entry *)((char*)mmap + src_offset);1237 ce = (struct cache_entry *)((char*)istate->alloc + dst_offset);1238convert_from_disk(disk_ce, ce);1239set_index_entry(istate, i, ce);12401241 src_offset +=ondisk_ce_size(ce);1242 dst_offset +=ce_size(ce);1243}1244 istate->timestamp = st.st_mtime;1245while(src_offset <= mmap_size -20-8) {1246/* After an array of active_nr index entries,1247 * there can be arbitrary number of extended1248 * sections, each of which is prefixed with1249 * extension name (4-byte) and section length1250 * in 4-byte network byte order.1251 */1252unsigned long extsize;1253memcpy(&extsize, (char*)mmap + src_offset +4,4);1254 extsize =ntohl(extsize);1255if(read_index_extension(istate,1256(const char*) mmap + src_offset,1257(char*) mmap + src_offset +8,1258 extsize) <0)1259goto unmap;1260 src_offset +=8;1261 src_offset += extsize;1262}1263munmap(mmap, mmap_size);1264return istate->cache_nr;12651266unmap:1267munmap(mmap, mmap_size);1268 errno = EINVAL;1269die("index file corrupt");1270}12711272intis_index_unborn(struct index_state *istate)1273{1274return(!istate->cache_nr && !istate->alloc && !istate->timestamp);1275}12761277intdiscard_index(struct index_state *istate)1278{1279 istate->cache_nr =0;1280 istate->cache_changed =0;1281 istate->timestamp =0;1282 istate->name_hash_initialized =0;1283free_hash(&istate->name_hash);1284cache_tree_free(&(istate->cache_tree));1285free(istate->alloc);1286 istate->alloc = NULL;1287 istate->initialized =0;12881289/* no need to throw away allocated active_cache */1290return0;1291}12921293intunmerged_index(const struct index_state *istate)1294{1295int i;1296for(i =0; i < istate->cache_nr; i++) {1297if(ce_stage(istate->cache[i]))1298return1;1299}1300return0;1301}13021303#define WRITE_BUFFER_SIZE 81921304static unsigned char write_buffer[WRITE_BUFFER_SIZE];1305static unsigned long write_buffer_len;13061307static intce_write_flush(git_SHA_CTX *context,int fd)1308{1309unsigned int buffered = write_buffer_len;1310if(buffered) {1311git_SHA1_Update(context, write_buffer, buffered);1312if(write_in_full(fd, write_buffer, buffered) != buffered)1313return-1;1314 write_buffer_len =0;1315}1316return0;1317}13181319static intce_write(git_SHA_CTX *context,int fd,void*data,unsigned int len)1320{1321while(len) {1322unsigned int buffered = write_buffer_len;1323unsigned int partial = WRITE_BUFFER_SIZE - buffered;1324if(partial > len)1325 partial = len;1326memcpy(write_buffer + buffered, data, partial);1327 buffered += partial;1328if(buffered == WRITE_BUFFER_SIZE) {1329 write_buffer_len = buffered;1330if(ce_write_flush(context, fd))1331return-1;1332 buffered =0;1333}1334 write_buffer_len = buffered;1335 len -= partial;1336 data = (char*) data + partial;1337}1338return0;1339}13401341static intwrite_index_ext_header(git_SHA_CTX *context,int fd,1342unsigned int ext,unsigned int sz)1343{1344 ext =htonl(ext);1345 sz =htonl(sz);1346return((ce_write(context, fd, &ext,4) <0) ||1347(ce_write(context, fd, &sz,4) <0)) ? -1:0;1348}13491350static intce_flush(git_SHA_CTX *context,int fd)1351{1352unsigned int left = write_buffer_len;13531354if(left) {1355 write_buffer_len =0;1356git_SHA1_Update(context, write_buffer, left);1357}13581359/* Flush first if not enough space for SHA1 signature */1360if(left +20> WRITE_BUFFER_SIZE) {1361if(write_in_full(fd, write_buffer, left) != left)1362return-1;1363 left =0;1364}13651366/* Append the SHA1 signature at the end */1367git_SHA1_Final(write_buffer + left, context);1368 left +=20;1369return(write_in_full(fd, write_buffer, left) != left) ? -1:0;1370}13711372static voidce_smudge_racily_clean_entry(struct cache_entry *ce)1373{1374/*1375 * The only thing we care about in this function is to smudge the1376 * falsely clean entry due to touch-update-touch race, so we leave1377 * everything else as they are. We are called for entries whose1378 * ce_mtime match the index file mtime.1379 *1380 * Note that this actually does not do much for gitlinks, for1381 * which ce_match_stat_basic() always goes to the actual1382 * contents. The caller checks with is_racy_timestamp() which1383 * always says "no" for gitlinks, so we are not called for them ;-)1384 */1385struct stat st;13861387if(lstat(ce->name, &st) <0)1388return;1389if(ce_match_stat_basic(ce, &st))1390return;1391if(ce_modified_check_fs(ce, &st)) {1392/* This is "racily clean"; smudge it. Note that this1393 * is a tricky code. At first glance, it may appear1394 * that it can break with this sequence:1395 *1396 * $ echo xyzzy >frotz1397 * $ git-update-index --add frotz1398 * $ : >frotz1399 * $ sleep 31400 * $ echo filfre >nitfol1401 * $ git-update-index --add nitfol1402 *1403 * but it does not. When the second update-index runs,1404 * it notices that the entry "frotz" has the same timestamp1405 * as index, and if we were to smudge it by resetting its1406 * size to zero here, then the object name recorded1407 * in index is the 6-byte file but the cached stat information1408 * becomes zero --- which would then match what we would1409 * obtain from the filesystem next time we stat("frotz").1410 *1411 * However, the second update-index, before calling1412 * this function, notices that the cached size is 61413 * bytes and what is on the filesystem is an empty1414 * file, and never calls us, so the cached size information1415 * for "frotz" stays 6 which does not match the filesystem.1416 */1417 ce->ce_size =0;1418}1419}14201421static intce_write_entry(git_SHA_CTX *c,int fd,struct cache_entry *ce)1422{1423int size =ondisk_ce_size(ce);1424struct ondisk_cache_entry *ondisk =xcalloc(1, size);14251426 ondisk->ctime.sec =htonl(ce->ce_ctime);1427 ondisk->ctime.nsec =0;1428 ondisk->mtime.sec =htonl(ce->ce_mtime);1429 ondisk->mtime.nsec =0;1430 ondisk->dev =htonl(ce->ce_dev);1431 ondisk->ino =htonl(ce->ce_ino);1432 ondisk->mode =htonl(ce->ce_mode);1433 ondisk->uid =htonl(ce->ce_uid);1434 ondisk->gid =htonl(ce->ce_gid);1435 ondisk->size =htonl(ce->ce_size);1436hashcpy(ondisk->sha1, ce->sha1);1437 ondisk->flags =htons(ce->ce_flags);1438memcpy(ondisk->name, ce->name,ce_namelen(ce));14391440returnce_write(c, fd, ondisk, size);1441}14421443intwrite_index(const struct index_state *istate,int newfd)1444{1445 git_SHA_CTX c;1446struct cache_header hdr;1447int i, err, removed;1448struct cache_entry **cache = istate->cache;1449int entries = istate->cache_nr;14501451for(i = removed =0; i < entries; i++)1452if(cache[i]->ce_flags & CE_REMOVE)1453 removed++;14541455 hdr.hdr_signature =htonl(CACHE_SIGNATURE);1456 hdr.hdr_version =htonl(2);1457 hdr.hdr_entries =htonl(entries - removed);14581459git_SHA1_Init(&c);1460if(ce_write(&c, newfd, &hdr,sizeof(hdr)) <0)1461return-1;14621463for(i =0; i < entries; i++) {1464struct cache_entry *ce = cache[i];1465if(ce->ce_flags & CE_REMOVE)1466continue;1467if(!ce_uptodate(ce) &&is_racy_timestamp(istate, ce))1468ce_smudge_racily_clean_entry(ce);1469if(ce_write_entry(&c, newfd, ce) <0)1470return-1;1471}14721473/* Write extension data here */1474if(istate->cache_tree) {1475struct strbuf sb = STRBUF_INIT;14761477cache_tree_write(&sb, istate->cache_tree);1478 err =write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) <01479||ce_write(&c, newfd, sb.buf, sb.len) <0;1480strbuf_release(&sb);1481if(err)1482return-1;1483}1484returnce_flush(&c, newfd);1485}14861487/*1488 * Read the index file that is potentially unmerged into given1489 * index_state, dropping any unmerged entries. Returns true is1490 * the index is unmerged. Callers who want to refuse to work1491 * from an unmerged state can call this and check its return value,1492 * instead of calling read_cache().1493 */1494intread_index_unmerged(struct index_state *istate)1495{1496int i;1497int unmerged =0;14981499read_index(istate);1500for(i =0; i < istate->cache_nr; i++) {1501struct cache_entry *ce = istate->cache[i];1502struct cache_entry *new_ce;1503int size, len;15041505if(!ce_stage(ce))1506continue;1507 unmerged =1;1508 len =strlen(ce->name);1509 size =cache_entry_size(len);1510 new_ce =xcalloc(1, size);1511hashcpy(new_ce->sha1, ce->sha1);1512memcpy(new_ce->name, ce->name, len);1513 new_ce->ce_flags =create_ce_flags(len,0);1514 new_ce->ce_mode = ce->ce_mode;1515if(add_index_entry(istate, new_ce,0))1516returnerror("%s: cannot drop to stage #0",1517 ce->name);1518 i =index_name_pos(istate, new_ce->name, len);1519}1520return unmerged;1521}15221523struct update_callback_data1524{1525int flags;1526int add_errors;1527};15281529static voidupdate_callback(struct diff_queue_struct *q,1530struct diff_options *opt,void*cbdata)1531{1532int i;1533struct update_callback_data *data = cbdata;15341535for(i =0; i < q->nr; i++) {1536struct diff_filepair *p = q->queue[i];1537const char*path = p->one->path;1538switch(p->status) {1539default:1540die("unexpected diff status%c", p->status);1541case DIFF_STATUS_UNMERGED:1542case DIFF_STATUS_MODIFIED:1543case DIFF_STATUS_TYPE_CHANGED:1544if(add_file_to_index(&the_index, path, data->flags)) {1545if(!(data->flags & ADD_CACHE_IGNORE_ERRORS))1546die("updating files failed");1547 data->add_errors++;1548}1549break;1550case DIFF_STATUS_DELETED:1551if(data->flags & ADD_CACHE_IGNORE_REMOVAL)1552break;1553if(!(data->flags & ADD_CACHE_PRETEND))1554remove_file_from_index(&the_index, path);1555if(data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))1556printf("remove '%s'\n", path);1557break;1558}1559}1560}15611562intadd_files_to_cache(const char*prefix,const char**pathspec,int flags)1563{1564struct update_callback_data data;1565struct rev_info rev;1566init_revisions(&rev, prefix);1567setup_revisions(0, NULL, &rev, NULL);1568 rev.prune_data = pathspec;1569 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;1570 rev.diffopt.format_callback = update_callback;1571 data.flags = flags;1572 data.add_errors =0;1573 rev.diffopt.format_callback_data = &data;1574run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);1575return!!data.add_errors;1576}15771578/*1579 * Returns 1 if the path is an "other" path with respect to1580 * the index; that is, the path is not mentioned in the index at all,1581 * either as a file, a directory with some files in the index,1582 * or as an unmerged entry.1583 *1584 * We helpfully remove a trailing "/" from directories so that1585 * the output of read_directory can be used as-is.1586 */1587intindex_name_is_other(const struct index_state *istate,const char*name,1588int namelen)1589{1590int pos;1591if(namelen && name[namelen -1] =='/')1592 namelen--;1593 pos =index_name_pos(istate, name, namelen);1594if(0<= pos)1595return0;/* exact match */1596 pos = -pos -1;1597if(pos < istate->cache_nr) {1598struct cache_entry *ce = istate->cache[pos];1599if(ce_namelen(ce) == namelen &&1600!memcmp(ce->name, name, namelen))1601return0;/* Yup, this one exists unmerged */1602}1603return1;1604}