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 163static intis_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)) 612return NULL; 613 614 len =strlen(path); 615 size =cache_entry_size(len); 616 ce =xcalloc(1, size); 617 618hashcpy(ce->sha1, sha1); 619memcpy(ce->name, path, len); 620 ce->ce_flags =create_ce_flags(len, stage); 621 ce->ce_mode =create_ce_mode(mode); 622 623if(refresh) 624returnrefresh_cache_entry(ce,0); 625 626return ce; 627} 628 629intce_same_name(struct cache_entry *a,struct cache_entry *b) 630{ 631int len =ce_namelen(a); 632returnce_namelen(b) == len && !memcmp(a->name, b->name, len); 633} 634 635intce_path_match(const struct cache_entry *ce,const char**pathspec) 636{ 637const char*match, *name; 638int len; 639 640if(!pathspec) 641return1; 642 643 len =ce_namelen(ce); 644 name = ce->name; 645while((match = *pathspec++) != NULL) { 646int matchlen =strlen(match); 647if(matchlen > len) 648continue; 649if(memcmp(name, match, matchlen)) 650continue; 651if(matchlen && name[matchlen-1] =='/') 652return1; 653if(name[matchlen] =='/'|| !name[matchlen]) 654return1; 655if(!matchlen) 656return1; 657} 658return0; 659} 660 661/* 662 * We fundamentally don't like some paths: we don't want 663 * dot or dot-dot anywhere, and for obvious reasons don't 664 * want to recurse into ".git" either. 665 * 666 * Also, we don't want double slashes or slashes at the 667 * end that can make pathnames ambiguous. 668 */ 669static intverify_dotfile(const char*rest) 670{ 671/* 672 * The first character was '.', but that 673 * has already been discarded, we now test 674 * the rest. 675 */ 676switch(*rest) { 677/* "." is not allowed */ 678case'\0':case'/': 679return0; 680 681/* 682 * ".git" followed by NUL or slash is bad. This 683 * shares the path end test with the ".." case. 684 */ 685case'g': 686if(rest[1] !='i') 687break; 688if(rest[2] !='t') 689break; 690 rest +=2; 691/* fallthrough */ 692case'.': 693if(rest[1] =='\0'|| rest[1] =='/') 694return0; 695} 696return1; 697} 698 699intverify_path(const char*path) 700{ 701char c; 702 703goto inside; 704for(;;) { 705if(!c) 706return1; 707if(c =='/') { 708inside: 709 c = *path++; 710switch(c) { 711default: 712continue; 713case'/':case'\0': 714break; 715case'.': 716if(verify_dotfile(path)) 717continue; 718} 719return0; 720} 721 c = *path++; 722} 723} 724 725/* 726 * Do we have another file that has the beginning components being a 727 * proper superset of the name we're trying to add? 728 */ 729static inthas_file_name(struct index_state *istate, 730const struct cache_entry *ce,int pos,int ok_to_replace) 731{ 732int retval =0; 733int len =ce_namelen(ce); 734int stage =ce_stage(ce); 735const char*name = ce->name; 736 737while(pos < istate->cache_nr) { 738struct cache_entry *p = istate->cache[pos++]; 739 740if(len >=ce_namelen(p)) 741break; 742if(memcmp(name, p->name, len)) 743break; 744if(ce_stage(p) != stage) 745continue; 746if(p->name[len] !='/') 747continue; 748if(p->ce_flags & CE_REMOVE) 749continue; 750 retval = -1; 751if(!ok_to_replace) 752break; 753remove_index_entry_at(istate, --pos); 754} 755return retval; 756} 757 758/* 759 * Do we have another file with a pathname that is a proper 760 * subset of the name we're trying to add? 761 */ 762static inthas_dir_name(struct index_state *istate, 763const struct cache_entry *ce,int pos,int ok_to_replace) 764{ 765int retval =0; 766int stage =ce_stage(ce); 767const char*name = ce->name; 768const char*slash = name +ce_namelen(ce); 769 770for(;;) { 771int len; 772 773for(;;) { 774if(*--slash =='/') 775break; 776if(slash <= ce->name) 777return retval; 778} 779 len = slash - name; 780 781 pos =index_name_pos(istate, name,create_ce_flags(len, stage)); 782if(pos >=0) { 783/* 784 * Found one, but not so fast. This could 785 * be a marker that says "I was here, but 786 * I am being removed". Such an entry is 787 * not a part of the resulting tree, and 788 * it is Ok to have a directory at the same 789 * path. 790 */ 791if(!(istate->cache[pos]->ce_flags & CE_REMOVE)) { 792 retval = -1; 793if(!ok_to_replace) 794break; 795remove_index_entry_at(istate, pos); 796continue; 797} 798} 799else 800 pos = -pos-1; 801 802/* 803 * Trivial optimization: if we find an entry that 804 * already matches the sub-directory, then we know 805 * we're ok, and we can exit. 806 */ 807while(pos < istate->cache_nr) { 808struct cache_entry *p = istate->cache[pos]; 809if((ce_namelen(p) <= len) || 810(p->name[len] !='/') || 811memcmp(p->name, name, len)) 812break;/* not our subdirectory */ 813if(ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) 814/* 815 * p is at the same stage as our entry, and 816 * is a subdirectory of what we are looking 817 * at, so we cannot have conflicts at our 818 * level or anything shorter. 819 */ 820return retval; 821 pos++; 822} 823} 824return retval; 825} 826 827/* We may be in a situation where we already have path/file and path 828 * is being added, or we already have path and path/file is being 829 * added. Either one would result in a nonsense tree that has path 830 * twice when git-write-tree tries to write it out. Prevent it. 831 * 832 * If ok-to-replace is specified, we remove the conflicting entries 833 * from the cache so the caller should recompute the insert position. 834 * When this happens, we return non-zero. 835 */ 836static intcheck_file_directory_conflict(struct index_state *istate, 837const struct cache_entry *ce, 838int pos,int ok_to_replace) 839{ 840int retval; 841 842/* 843 * When ce is an "I am going away" entry, we allow it to be added 844 */ 845if(ce->ce_flags & CE_REMOVE) 846return0; 847 848/* 849 * We check if the path is a sub-path of a subsequent pathname 850 * first, since removing those will not change the position 851 * in the array. 852 */ 853 retval =has_file_name(istate, ce, pos, ok_to_replace); 854 855/* 856 * Then check if the path might have a clashing sub-directory 857 * before it. 858 */ 859return retval +has_dir_name(istate, ce, pos, ok_to_replace); 860} 861 862static intadd_index_entry_with_check(struct index_state *istate,struct cache_entry *ce,int option) 863{ 864int pos; 865int ok_to_add = option & ADD_CACHE_OK_TO_ADD; 866int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; 867int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; 868int new_only = option & ADD_CACHE_NEW_ONLY; 869 870cache_tree_invalidate_path(istate->cache_tree, ce->name); 871 pos =index_name_pos(istate, ce->name, ce->ce_flags); 872 873/* existing match? Just replace it. */ 874if(pos >=0) { 875if(!new_only) 876replace_index_entry(istate, pos, ce); 877return0; 878} 879 pos = -pos-1; 880 881/* 882 * Inserting a merged entry ("stage 0") into the index 883 * will always replace all non-merged entries.. 884 */ 885if(pos < istate->cache_nr &&ce_stage(ce) ==0) { 886while(ce_same_name(istate->cache[pos], ce)) { 887 ok_to_add =1; 888if(!remove_index_entry_at(istate, pos)) 889break; 890} 891} 892 893if(!ok_to_add) 894return-1; 895if(!verify_path(ce->name)) 896return-1; 897 898if(!skip_df_check && 899check_file_directory_conflict(istate, ce, pos, ok_to_replace)) { 900if(!ok_to_replace) 901returnerror("'%s' appears as both a file and as a directory", 902 ce->name); 903 pos =index_name_pos(istate, ce->name, ce->ce_flags); 904 pos = -pos-1; 905} 906return pos +1; 907} 908 909intadd_index_entry(struct index_state *istate,struct cache_entry *ce,int option) 910{ 911int pos; 912 913if(option & ADD_CACHE_JUST_APPEND) 914 pos = istate->cache_nr; 915else{ 916int ret; 917 ret =add_index_entry_with_check(istate, ce, option); 918if(ret <=0) 919return ret; 920 pos = ret -1; 921} 922 923/* Make sure the array is big enough .. */ 924if(istate->cache_nr == istate->cache_alloc) { 925 istate->cache_alloc =alloc_nr(istate->cache_alloc); 926 istate->cache =xrealloc(istate->cache, 927 istate->cache_alloc *sizeof(struct cache_entry *)); 928} 929 930/* Add it in.. */ 931 istate->cache_nr++; 932if(istate->cache_nr > pos +1) 933memmove(istate->cache + pos +1, 934 istate->cache + pos, 935(istate->cache_nr - pos -1) *sizeof(ce)); 936set_index_entry(istate, pos, ce); 937 istate->cache_changed =1; 938return0; 939} 940 941/* 942 * "refresh" does not calculate a new sha1 file or bring the 943 * cache up-to-date for mode/content changes. But what it 944 * _does_ do is to "re-match" the stat information of a file 945 * with the cache, so that you can refresh the cache for a 946 * file that hasn't been changed but where the stat entry is 947 * out of date. 948 * 949 * For example, you'd want to do this after doing a "git-read-tree", 950 * to link up the stat cache details with the proper files. 951 */ 952static struct cache_entry *refresh_cache_ent(struct index_state *istate, 953struct cache_entry *ce, 954unsigned int options,int*err) 955{ 956struct stat st; 957struct cache_entry *updated; 958int changed, size; 959int ignore_valid = options & CE_MATCH_IGNORE_VALID; 960 961if(ce_uptodate(ce)) 962return ce; 963 964/* 965 * CE_VALID means the user promised us that the change to 966 * the work tree does not matter and told us not to worry. 967 */ 968if(!ignore_valid && (ce->ce_flags & CE_VALID)) { 969ce_mark_uptodate(ce); 970return ce; 971} 972 973if(lstat(ce->name, &st) <0) { 974if(err) 975*err = errno; 976return NULL; 977} 978 979 changed =ie_match_stat(istate, ce, &st, options); 980if(!changed) { 981/* 982 * The path is unchanged. If we were told to ignore 983 * valid bit, then we did the actual stat check and 984 * found that the entry is unmodified. If the entry 985 * is not marked VALID, this is the place to mark it 986 * valid again, under "assume unchanged" mode. 987 */ 988if(ignore_valid && assume_unchanged && 989!(ce->ce_flags & CE_VALID)) 990;/* mark this one VALID again */ 991else{ 992/* 993 * We do not mark the index itself "modified" 994 * because CE_UPTODATE flag is in-core only; 995 * we are not going to write this change out. 996 */ 997ce_mark_uptodate(ce); 998return ce; 999}1000}10011002if(ie_modified(istate, ce, &st, options)) {1003if(err)1004*err = EINVAL;1005return NULL;1006}10071008 size =ce_size(ce);1009 updated =xmalloc(size);1010memcpy(updated, ce, size);1011fill_stat_cache_info(updated, &st);1012/*1013 * If ignore_valid is not set, we should leave CE_VALID bit1014 * alone. Otherwise, paths marked with --no-assume-unchanged1015 * (i.e. things to be edited) will reacquire CE_VALID bit1016 * automatically, which is not really what we want.1017 */1018if(!ignore_valid && assume_unchanged &&1019!(ce->ce_flags & CE_VALID))1020 updated->ce_flags &= ~CE_VALID;10211022return updated;1023}10241025intrefresh_index(struct index_state *istate,unsigned int flags,const char**pathspec,char*seen)1026{1027int i;1028int has_errors =0;1029int really = (flags & REFRESH_REALLY) !=0;1030int allow_unmerged = (flags & REFRESH_UNMERGED) !=0;1031int quiet = (flags & REFRESH_QUIET) !=0;1032int not_new = (flags & REFRESH_IGNORE_MISSING) !=0;1033int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) !=0;1034unsigned int options = really ? CE_MATCH_IGNORE_VALID :0;1035const char*needs_update_message;10361037 needs_update_message = ((flags & REFRESH_SAY_CHANGED)1038?"locally modified":"needs update");1039for(i =0; i < istate->cache_nr; i++) {1040struct cache_entry *ce, *new;1041int cache_errno =0;10421043 ce = istate->cache[i];1044if(ignore_submodules &&S_ISGITLINK(ce->ce_mode))1045continue;10461047if(ce_stage(ce)) {1048while((i < istate->cache_nr) &&1049!strcmp(istate->cache[i]->name, ce->name))1050 i++;1051 i--;1052if(allow_unmerged)1053continue;1054printf("%s: needs merge\n", ce->name);1055 has_errors =1;1056continue;1057}10581059if(pathspec && !match_pathspec(pathspec, ce->name,strlen(ce->name),0, seen))1060continue;10611062new=refresh_cache_ent(istate, ce, options, &cache_errno);1063if(new== ce)1064continue;1065if(!new) {1066if(not_new && cache_errno == ENOENT)1067continue;1068if(really && cache_errno == EINVAL) {1069/* If we are doing --really-refresh that1070 * means the index is not valid anymore.1071 */1072 ce->ce_flags &= ~CE_VALID;1073 istate->cache_changed =1;1074}1075if(quiet)1076continue;1077printf("%s:%s\n", ce->name, needs_update_message);1078 has_errors =1;1079continue;1080}10811082replace_index_entry(istate, i,new);1083}1084return has_errors;1085}10861087struct cache_entry *refresh_cache_entry(struct cache_entry *ce,int really)1088{1089returnrefresh_cache_ent(&the_index, ce, really, NULL);1090}10911092static intverify_hdr(struct cache_header *hdr,unsigned long size)1093{1094 git_SHA_CTX c;1095unsigned char sha1[20];10961097if(hdr->hdr_signature !=htonl(CACHE_SIGNATURE))1098returnerror("bad signature");1099if(hdr->hdr_version !=htonl(2))1100returnerror("bad index version");1101git_SHA1_Init(&c);1102git_SHA1_Update(&c, hdr, size -20);1103git_SHA1_Final(sha1, &c);1104if(hashcmp(sha1, (unsigned char*)hdr + size -20))1105returnerror("bad index file sha1 signature");1106return0;1107}11081109static intread_index_extension(struct index_state *istate,1110const char*ext,void*data,unsigned long sz)1111{1112switch(CACHE_EXT(ext)) {1113case CACHE_EXT_TREE:1114 istate->cache_tree =cache_tree_read(data, sz);1115break;1116default:1117if(*ext <'A'||'Z'< *ext)1118returnerror("index uses %.4s extension, which we do not understand",1119 ext);1120fprintf(stderr,"ignoring %.4s extension\n", ext);1121break;1122}1123return0;1124}11251126intread_index(struct index_state *istate)1127{1128returnread_index_from(istate,get_index_file());1129}11301131static voidconvert_from_disk(struct ondisk_cache_entry *ondisk,struct cache_entry *ce)1132{1133size_t len;11341135 ce->ce_ctime =ntohl(ondisk->ctime.sec);1136 ce->ce_mtime =ntohl(ondisk->mtime.sec);1137 ce->ce_dev =ntohl(ondisk->dev);1138 ce->ce_ino =ntohl(ondisk->ino);1139 ce->ce_mode =ntohl(ondisk->mode);1140 ce->ce_uid =ntohl(ondisk->uid);1141 ce->ce_gid =ntohl(ondisk->gid);1142 ce->ce_size =ntohl(ondisk->size);1143/* On-disk flags are just 16 bits */1144 ce->ce_flags =ntohs(ondisk->flags);11451146/* For future extension: we do not understand this entry yet */1147if(ce->ce_flags & CE_EXTENDED)1148die("Unknown index entry format");1149hashcpy(ce->sha1, ondisk->sha1);11501151 len = ce->ce_flags & CE_NAMEMASK;1152if(len == CE_NAMEMASK)1153 len =strlen(ondisk->name);1154/*1155 * NEEDSWORK: If the original index is crafted, this copy could1156 * go unchecked.1157 */1158memcpy(ce->name, ondisk->name, len +1);1159}11601161staticinlinesize_testimate_cache_size(size_t ondisk_size,unsigned int entries)1162{1163long per_entry;11641165 per_entry =sizeof(struct cache_entry) -sizeof(struct ondisk_cache_entry);11661167/*1168 * Alignment can cause differences. This should be "alignof", but1169 * since that's a gcc'ism, just use the size of a pointer.1170 */1171 per_entry +=sizeof(void*);1172return ondisk_size + entries*per_entry;1173}11741175/* remember to discard_cache() before reading a different cache! */1176intread_index_from(struct index_state *istate,const char*path)1177{1178int fd, i;1179struct stat st;1180unsigned long src_offset, dst_offset;1181struct cache_header *hdr;1182void*mmap;1183size_t mmap_size;11841185 errno = EBUSY;1186if(istate->initialized)1187return istate->cache_nr;11881189 errno = ENOENT;1190 istate->timestamp =0;1191 fd =open(path, O_RDONLY);1192if(fd <0) {1193if(errno == ENOENT)1194return0;1195die("index file open failed (%s)",strerror(errno));1196}11971198if(fstat(fd, &st))1199die("cannot stat the open index (%s)",strerror(errno));12001201 errno = EINVAL;1202 mmap_size =xsize_t(st.st_size);1203if(mmap_size <sizeof(struct cache_header) +20)1204die("index file smaller than expected");12051206 mmap =xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,0);1207close(fd);1208if(mmap == MAP_FAILED)1209die("unable to map index file");12101211 hdr = mmap;1212if(verify_hdr(hdr, mmap_size) <0)1213goto unmap;12141215 istate->cache_nr =ntohl(hdr->hdr_entries);1216 istate->cache_alloc =alloc_nr(istate->cache_nr);1217 istate->cache =xcalloc(istate->cache_alloc,sizeof(struct cache_entry *));12181219/*1220 * The disk format is actually larger than the in-memory format,1221 * due to space for nsec etc, so even though the in-memory one1222 * has room for a few more flags, we can allocate using the same1223 * index size1224 */1225 istate->alloc =xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));1226 istate->initialized =1;12271228 src_offset =sizeof(*hdr);1229 dst_offset =0;1230for(i =0; i < istate->cache_nr; i++) {1231struct ondisk_cache_entry *disk_ce;1232struct cache_entry *ce;12331234 disk_ce = (struct ondisk_cache_entry *)((char*)mmap + src_offset);1235 ce = (struct cache_entry *)((char*)istate->alloc + dst_offset);1236convert_from_disk(disk_ce, ce);1237set_index_entry(istate, i, ce);12381239 src_offset +=ondisk_ce_size(ce);1240 dst_offset +=ce_size(ce);1241}1242 istate->timestamp = st.st_mtime;1243while(src_offset <= mmap_size -20-8) {1244/* After an array of active_nr index entries,1245 * there can be arbitrary number of extended1246 * sections, each of which is prefixed with1247 * extension name (4-byte) and section length1248 * in 4-byte network byte order.1249 */1250unsigned long extsize;1251memcpy(&extsize, (char*)mmap + src_offset +4,4);1252 extsize =ntohl(extsize);1253if(read_index_extension(istate,1254(const char*) mmap + src_offset,1255(char*) mmap + src_offset +8,1256 extsize) <0)1257goto unmap;1258 src_offset +=8;1259 src_offset += extsize;1260}1261munmap(mmap, mmap_size);1262return istate->cache_nr;12631264unmap:1265munmap(mmap, mmap_size);1266 errno = EINVAL;1267die("index file corrupt");1268}12691270intdiscard_index(struct index_state *istate)1271{1272 istate->cache_nr =0;1273 istate->cache_changed =0;1274 istate->timestamp =0;1275 istate->name_hash_initialized =0;1276free_hash(&istate->name_hash);1277cache_tree_free(&(istate->cache_tree));1278free(istate->alloc);1279 istate->alloc = NULL;1280 istate->initialized =0;12811282/* no need to throw away allocated active_cache */1283return0;1284}12851286intunmerged_index(const struct index_state *istate)1287{1288int i;1289for(i =0; i < istate->cache_nr; i++) {1290if(ce_stage(istate->cache[i]))1291return1;1292}1293return0;1294}12951296#define WRITE_BUFFER_SIZE 81921297static unsigned char write_buffer[WRITE_BUFFER_SIZE];1298static unsigned long write_buffer_len;12991300static intce_write_flush(git_SHA_CTX *context,int fd)1301{1302unsigned int buffered = write_buffer_len;1303if(buffered) {1304git_SHA1_Update(context, write_buffer, buffered);1305if(write_in_full(fd, write_buffer, buffered) != buffered)1306return-1;1307 write_buffer_len =0;1308}1309return0;1310}13111312static intce_write(git_SHA_CTX *context,int fd,void*data,unsigned int len)1313{1314while(len) {1315unsigned int buffered = write_buffer_len;1316unsigned int partial = WRITE_BUFFER_SIZE - buffered;1317if(partial > len)1318 partial = len;1319memcpy(write_buffer + buffered, data, partial);1320 buffered += partial;1321if(buffered == WRITE_BUFFER_SIZE) {1322 write_buffer_len = buffered;1323if(ce_write_flush(context, fd))1324return-1;1325 buffered =0;1326}1327 write_buffer_len = buffered;1328 len -= partial;1329 data = (char*) data + partial;1330}1331return0;1332}13331334static intwrite_index_ext_header(git_SHA_CTX *context,int fd,1335unsigned int ext,unsigned int sz)1336{1337 ext =htonl(ext);1338 sz =htonl(sz);1339return((ce_write(context, fd, &ext,4) <0) ||1340(ce_write(context, fd, &sz,4) <0)) ? -1:0;1341}13421343static intce_flush(git_SHA_CTX *context,int fd)1344{1345unsigned int left = write_buffer_len;13461347if(left) {1348 write_buffer_len =0;1349git_SHA1_Update(context, write_buffer, left);1350}13511352/* Flush first if not enough space for SHA1 signature */1353if(left +20> WRITE_BUFFER_SIZE) {1354if(write_in_full(fd, write_buffer, left) != left)1355return-1;1356 left =0;1357}13581359/* Append the SHA1 signature at the end */1360git_SHA1_Final(write_buffer + left, context);1361 left +=20;1362return(write_in_full(fd, write_buffer, left) != left) ? -1:0;1363}13641365static voidce_smudge_racily_clean_entry(struct cache_entry *ce)1366{1367/*1368 * The only thing we care about in this function is to smudge the1369 * falsely clean entry due to touch-update-touch race, so we leave1370 * everything else as they are. We are called for entries whose1371 * ce_mtime match the index file mtime.1372 *1373 * Note that this actually does not do much for gitlinks, for1374 * which ce_match_stat_basic() always goes to the actual1375 * contents. The caller checks with is_racy_timestamp() which1376 * always says "no" for gitlinks, so we are not called for them ;-)1377 */1378struct stat st;13791380if(lstat(ce->name, &st) <0)1381return;1382if(ce_match_stat_basic(ce, &st))1383return;1384if(ce_modified_check_fs(ce, &st)) {1385/* This is "racily clean"; smudge it. Note that this1386 * is a tricky code. At first glance, it may appear1387 * that it can break with this sequence:1388 *1389 * $ echo xyzzy >frotz1390 * $ git-update-index --add frotz1391 * $ : >frotz1392 * $ sleep 31393 * $ echo filfre >nitfol1394 * $ git-update-index --add nitfol1395 *1396 * but it does not. When the second update-index runs,1397 * it notices that the entry "frotz" has the same timestamp1398 * as index, and if we were to smudge it by resetting its1399 * size to zero here, then the object name recorded1400 * in index is the 6-byte file but the cached stat information1401 * becomes zero --- which would then match what we would1402 * obtain from the filesystem next time we stat("frotz").1403 *1404 * However, the second update-index, before calling1405 * this function, notices that the cached size is 61406 * bytes and what is on the filesystem is an empty1407 * file, and never calls us, so the cached size information1408 * for "frotz" stays 6 which does not match the filesystem.1409 */1410 ce->ce_size =0;1411}1412}14131414static intce_write_entry(git_SHA_CTX *c,int fd,struct cache_entry *ce)1415{1416int size =ondisk_ce_size(ce);1417struct ondisk_cache_entry *ondisk =xcalloc(1, size);14181419 ondisk->ctime.sec =htonl(ce->ce_ctime);1420 ondisk->ctime.nsec =0;1421 ondisk->mtime.sec =htonl(ce->ce_mtime);1422 ondisk->mtime.nsec =0;1423 ondisk->dev =htonl(ce->ce_dev);1424 ondisk->ino =htonl(ce->ce_ino);1425 ondisk->mode =htonl(ce->ce_mode);1426 ondisk->uid =htonl(ce->ce_uid);1427 ondisk->gid =htonl(ce->ce_gid);1428 ondisk->size =htonl(ce->ce_size);1429hashcpy(ondisk->sha1, ce->sha1);1430 ondisk->flags =htons(ce->ce_flags);1431memcpy(ondisk->name, ce->name,ce_namelen(ce));14321433returnce_write(c, fd, ondisk, size);1434}14351436intwrite_index(const struct index_state *istate,int newfd)1437{1438 git_SHA_CTX c;1439struct cache_header hdr;1440int i, err, removed;1441struct cache_entry **cache = istate->cache;1442int entries = istate->cache_nr;14431444for(i = removed =0; i < entries; i++)1445if(cache[i]->ce_flags & CE_REMOVE)1446 removed++;14471448 hdr.hdr_signature =htonl(CACHE_SIGNATURE);1449 hdr.hdr_version =htonl(2);1450 hdr.hdr_entries =htonl(entries - removed);14511452git_SHA1_Init(&c);1453if(ce_write(&c, newfd, &hdr,sizeof(hdr)) <0)1454return-1;14551456for(i =0; i < entries; i++) {1457struct cache_entry *ce = cache[i];1458if(ce->ce_flags & CE_REMOVE)1459continue;1460if(!ce_uptodate(ce) &&is_racy_timestamp(istate, ce))1461ce_smudge_racily_clean_entry(ce);1462if(ce_write_entry(&c, newfd, ce) <0)1463return-1;1464}14651466/* Write extension data here */1467if(istate->cache_tree) {1468struct strbuf sb;14691470strbuf_init(&sb,0);1471cache_tree_write(&sb, istate->cache_tree);1472 err =write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) <01473||ce_write(&c, newfd, sb.buf, sb.len) <0;1474strbuf_release(&sb);1475if(err)1476return-1;1477}1478returnce_flush(&c, newfd);1479}14801481/*1482 * Read the index file that is potentially unmerged into given1483 * index_state, dropping any unmerged entries. Returns true is1484 * the index is unmerged. Callers who want to refuse to work1485 * from an unmerged state can call this and check its return value,1486 * instead of calling read_cache().1487 */1488intread_index_unmerged(struct index_state *istate)1489{1490int i;1491struct cache_entry **dst;1492struct cache_entry *last = NULL;14931494read_index(istate);1495 dst = istate->cache;1496for(i =0; i < istate->cache_nr; i++) {1497struct cache_entry *ce = istate->cache[i];1498if(ce_stage(ce)) {1499remove_name_hash(ce);1500if(last && !strcmp(ce->name, last->name))1501continue;1502cache_tree_invalidate_path(istate->cache_tree, ce->name);1503 last = ce;1504continue;1505}1506*dst++ = ce;1507}1508 istate->cache_nr = dst - istate->cache;1509return!!last;1510}15111512struct update_callback_data1513{1514int flags;1515int add_errors;1516};15171518static voidupdate_callback(struct diff_queue_struct *q,1519struct diff_options *opt,void*cbdata)1520{1521int i;1522struct update_callback_data *data = cbdata;15231524for(i =0; i < q->nr; i++) {1525struct diff_filepair *p = q->queue[i];1526const char*path = p->one->path;1527switch(p->status) {1528default:1529die("unexpected diff status%c", p->status);1530case DIFF_STATUS_UNMERGED:1531case DIFF_STATUS_MODIFIED:1532case DIFF_STATUS_TYPE_CHANGED:1533if(add_file_to_index(&the_index, path, data->flags)) {1534if(!(data->flags & ADD_CACHE_IGNORE_ERRORS))1535die("updating files failed");1536 data->add_errors++;1537}1538break;1539case DIFF_STATUS_DELETED:1540if(data->flags & ADD_CACHE_IGNORE_REMOVAL)1541break;1542if(!(data->flags & ADD_CACHE_PRETEND))1543remove_file_from_index(&the_index, path);1544if(data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))1545printf("remove '%s'\n", path);1546break;1547}1548}1549}15501551intadd_files_to_cache(const char*prefix,const char**pathspec,int flags)1552{1553struct update_callback_data data;1554struct rev_info rev;1555init_revisions(&rev, prefix);1556setup_revisions(0, NULL, &rev, NULL);1557 rev.prune_data = pathspec;1558 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;1559 rev.diffopt.format_callback = update_callback;1560 data.flags = flags;1561 data.add_errors =0;1562 rev.diffopt.format_callback_data = &data;1563run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);1564return!!data.add_errors;1565}1566