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"lockfile.h" 9#include"cache-tree.h" 10#include"refs.h" 11#include"dir.h" 12#include"tree.h" 13#include"commit.h" 14#include"blob.h" 15#include"resolve-undo.h" 16#include"strbuf.h" 17#include"varint.h" 18#include"split-index.h" 19#include"sigchain.h" 20#include"utf8.h" 21 22static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, 23unsigned int options); 24 25/* Mask for the name length in ce_flags in the on-disk index */ 26 27#define CE_NAMEMASK (0x0fff) 28 29/* Index extensions. 30 * 31 * The first letter should be 'A'..'Z' for extensions that are not 32 * necessary for a correct operation (i.e. optimization data). 33 * When new extensions are added that _needs_ to be understood in 34 * order to correctly interpret the index file, pick character that 35 * is outside the range, to cause the reader to abort. 36 */ 37 38#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) ) 39#define CACHE_EXT_TREE 0x54524545/* "TREE" */ 40#define CACHE_EXT_RESOLVE_UNDO 0x52455543/* "REUC" */ 41#define CACHE_EXT_LINK 0x6c696e6b/* "link" */ 42#define CACHE_EXT_UNTRACKED 0x554E5452/* "UNTR" */ 43 44/* changes that can be kept in $GIT_DIR/index (basically all extensions) */ 45#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \ 46 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \ 47 SPLIT_INDEX_ORDERED) 48 49struct index_state the_index; 50static const char*alternate_index_output; 51 52static voidset_index_entry(struct index_state *istate,int nr,struct cache_entry *ce) 53{ 54 istate->cache[nr] = ce; 55add_name_hash(istate, ce); 56} 57 58static voidreplace_index_entry(struct index_state *istate,int nr,struct cache_entry *ce) 59{ 60struct cache_entry *old = istate->cache[nr]; 61 62replace_index_entry_in_base(istate, old, ce); 63remove_name_hash(istate, old); 64free(old); 65set_index_entry(istate, nr, ce); 66 ce->ce_flags |= CE_UPDATE_IN_BASE; 67 istate->cache_changed |= CE_ENTRY_CHANGED; 68} 69 70voidrename_index_entry_at(struct index_state *istate,int nr,const char*new_name) 71{ 72struct cache_entry *old = istate->cache[nr], *new; 73int namelen =strlen(new_name); 74 75new=xmalloc(cache_entry_size(namelen)); 76copy_cache_entry(new, old); 77new->ce_flags &= ~CE_HASHED; 78new->ce_namelen = namelen; 79new->index =0; 80memcpy(new->name, new_name, namelen +1); 81 82cache_tree_invalidate_path(istate, old->name); 83untracked_cache_remove_from_index(istate, old->name); 84remove_index_entry_at(istate, nr); 85add_index_entry(istate,new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); 86} 87 88voidfill_stat_data(struct stat_data *sd,struct stat *st) 89{ 90 sd->sd_ctime.sec = (unsigned int)st->st_ctime; 91 sd->sd_mtime.sec = (unsigned int)st->st_mtime; 92 sd->sd_ctime.nsec =ST_CTIME_NSEC(*st); 93 sd->sd_mtime.nsec =ST_MTIME_NSEC(*st); 94 sd->sd_dev = st->st_dev; 95 sd->sd_ino = st->st_ino; 96 sd->sd_uid = st->st_uid; 97 sd->sd_gid = st->st_gid; 98 sd->sd_size = st->st_size; 99} 100 101intmatch_stat_data(const struct stat_data *sd,struct stat *st) 102{ 103int changed =0; 104 105if(sd->sd_mtime.sec != (unsigned int)st->st_mtime) 106 changed |= MTIME_CHANGED; 107if(trust_ctime && check_stat && 108 sd->sd_ctime.sec != (unsigned int)st->st_ctime) 109 changed |= CTIME_CHANGED; 110 111#ifdef USE_NSEC 112if(check_stat && sd->sd_mtime.nsec !=ST_MTIME_NSEC(*st)) 113 changed |= MTIME_CHANGED; 114if(trust_ctime && check_stat && 115 sd->sd_ctime.nsec !=ST_CTIME_NSEC(*st)) 116 changed |= CTIME_CHANGED; 117#endif 118 119if(check_stat) { 120if(sd->sd_uid != (unsigned int) st->st_uid || 121 sd->sd_gid != (unsigned int) st->st_gid) 122 changed |= OWNER_CHANGED; 123if(sd->sd_ino != (unsigned int) st->st_ino) 124 changed |= INODE_CHANGED; 125} 126 127#ifdef USE_STDEV 128/* 129 * st_dev breaks on network filesystems where different 130 * clients will have different views of what "device" 131 * the filesystem is on 132 */ 133if(check_stat && sd->sd_dev != (unsigned int) st->st_dev) 134 changed |= INODE_CHANGED; 135#endif 136 137if(sd->sd_size != (unsigned int) st->st_size) 138 changed |= DATA_CHANGED; 139 140return changed; 141} 142 143/* 144 * This only updates the "non-critical" parts of the directory 145 * cache, ie the parts that aren't tracked by GIT, and only used 146 * to validate the cache. 147 */ 148voidfill_stat_cache_info(struct cache_entry *ce,struct stat *st) 149{ 150fill_stat_data(&ce->ce_stat_data, st); 151 152if(assume_unchanged) 153 ce->ce_flags |= CE_VALID; 154 155if(S_ISREG(st->st_mode)) 156ce_mark_uptodate(ce); 157} 158 159static intce_compare_data(const struct cache_entry *ce,struct stat *st) 160{ 161int match = -1; 162int fd =open(ce->name, O_RDONLY); 163 164if(fd >=0) { 165unsigned char sha1[20]; 166if(!index_fd(sha1, fd, st, OBJ_BLOB, ce->name,0)) 167 match =hashcmp(sha1, ce->sha1); 168/* index_fd() closed the file descriptor already */ 169} 170return match; 171} 172 173static intce_compare_link(const struct cache_entry *ce,size_t expected_size) 174{ 175int match = -1; 176void*buffer; 177unsigned long size; 178enum object_type type; 179struct strbuf sb = STRBUF_INIT; 180 181if(strbuf_readlink(&sb, ce->name, expected_size)) 182return-1; 183 184 buffer =read_sha1_file(ce->sha1, &type, &size); 185if(buffer) { 186if(size == sb.len) 187 match =memcmp(buffer, sb.buf, size); 188free(buffer); 189} 190strbuf_release(&sb); 191return match; 192} 193 194static intce_compare_gitlink(const struct cache_entry *ce) 195{ 196unsigned char sha1[20]; 197 198/* 199 * We don't actually require that the .git directory 200 * under GITLINK directory be a valid git directory. It 201 * might even be missing (in case nobody populated that 202 * sub-project). 203 * 204 * If so, we consider it always to match. 205 */ 206if(resolve_gitlink_ref(ce->name,"HEAD", sha1) <0) 207return0; 208returnhashcmp(sha1, ce->sha1); 209} 210 211static intce_modified_check_fs(const struct cache_entry *ce,struct stat *st) 212{ 213switch(st->st_mode & S_IFMT) { 214case S_IFREG: 215if(ce_compare_data(ce, st)) 216return DATA_CHANGED; 217break; 218case S_IFLNK: 219if(ce_compare_link(ce,xsize_t(st->st_size))) 220return DATA_CHANGED; 221break; 222case S_IFDIR: 223if(S_ISGITLINK(ce->ce_mode)) 224returnce_compare_gitlink(ce) ? DATA_CHANGED :0; 225default: 226return TYPE_CHANGED; 227} 228return0; 229} 230 231static intce_match_stat_basic(const struct cache_entry *ce,struct stat *st) 232{ 233unsigned int changed =0; 234 235if(ce->ce_flags & CE_REMOVE) 236return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED; 237 238switch(ce->ce_mode & S_IFMT) { 239case S_IFREG: 240 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED :0; 241/* We consider only the owner x bit to be relevant for 242 * "mode changes" 243 */ 244if(trust_executable_bit && 245(0100& (ce->ce_mode ^ st->st_mode))) 246 changed |= MODE_CHANGED; 247break; 248case S_IFLNK: 249if(!S_ISLNK(st->st_mode) && 250(has_symlinks || !S_ISREG(st->st_mode))) 251 changed |= TYPE_CHANGED; 252break; 253case S_IFGITLINK: 254/* We ignore most of the st_xxx fields for gitlinks */ 255if(!S_ISDIR(st->st_mode)) 256 changed |= TYPE_CHANGED; 257else if(ce_compare_gitlink(ce)) 258 changed |= DATA_CHANGED; 259return changed; 260default: 261die("internal error: ce_mode is%o", ce->ce_mode); 262} 263 264 changed |=match_stat_data(&ce->ce_stat_data, st); 265 266/* Racily smudged entry? */ 267if(!ce->ce_stat_data.sd_size) { 268if(!is_empty_blob_sha1(ce->sha1)) 269 changed |= DATA_CHANGED; 270} 271 272return changed; 273} 274 275static intis_racy_timestamp(const struct index_state *istate, 276const struct cache_entry *ce) 277{ 278return(!S_ISGITLINK(ce->ce_mode) && 279 istate->timestamp.sec && 280#ifdef USE_NSEC 281/* nanosecond timestamped files can also be racy! */ 282(istate->timestamp.sec < ce->ce_stat_data.sd_mtime.sec || 283(istate->timestamp.sec == ce->ce_stat_data.sd_mtime.sec && 284 istate->timestamp.nsec <= ce->ce_stat_data.sd_mtime.nsec)) 285#else 286 istate->timestamp.sec <= ce->ce_stat_data.sd_mtime.sec 287#endif 288); 289} 290 291intie_match_stat(const struct index_state *istate, 292const struct cache_entry *ce,struct stat *st, 293unsigned int options) 294{ 295unsigned int changed; 296int ignore_valid = options & CE_MATCH_IGNORE_VALID; 297int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE; 298int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY; 299 300/* 301 * If it's marked as always valid in the index, it's 302 * valid whatever the checked-out copy says. 303 * 304 * skip-worktree has the same effect with higher precedence 305 */ 306if(!ignore_skip_worktree &&ce_skip_worktree(ce)) 307return0; 308if(!ignore_valid && (ce->ce_flags & CE_VALID)) 309return0; 310 311/* 312 * Intent-to-add entries have not been added, so the index entry 313 * by definition never matches what is in the work tree until it 314 * actually gets added. 315 */ 316if(ce->ce_flags & CE_INTENT_TO_ADD) 317return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED; 318 319 changed =ce_match_stat_basic(ce, st); 320 321/* 322 * Within 1 second of this sequence: 323 * echo xyzzy >file && git-update-index --add file 324 * running this command: 325 * echo frotz >file 326 * would give a falsely clean cache entry. The mtime and 327 * length match the cache, and other stat fields do not change. 328 * 329 * We could detect this at update-index time (the cache entry 330 * being registered/updated records the same time as "now") 331 * and delay the return from git-update-index, but that would 332 * effectively mean we can make at most one commit per second, 333 * which is not acceptable. Instead, we check cache entries 334 * whose mtime are the same as the index file timestamp more 335 * carefully than others. 336 */ 337if(!changed &&is_racy_timestamp(istate, ce)) { 338if(assume_racy_is_modified) 339 changed |= DATA_CHANGED; 340else 341 changed |=ce_modified_check_fs(ce, st); 342} 343 344return changed; 345} 346 347intie_modified(const struct index_state *istate, 348const struct cache_entry *ce, 349struct stat *st,unsigned int options) 350{ 351int changed, changed_fs; 352 353 changed =ie_match_stat(istate, ce, st, options); 354if(!changed) 355return0; 356/* 357 * If the mode or type has changed, there's no point in trying 358 * to refresh the entry - it's not going to match 359 */ 360if(changed & (MODE_CHANGED | TYPE_CHANGED)) 361return changed; 362 363/* 364 * Immediately after read-tree or update-index --cacheinfo, 365 * the length field is zero, as we have never even read the 366 * lstat(2) information once, and we cannot trust DATA_CHANGED 367 * returned by ie_match_stat() which in turn was returned by 368 * ce_match_stat_basic() to signal that the filesize of the 369 * blob changed. We have to actually go to the filesystem to 370 * see if the contents match, and if so, should answer "unchanged". 371 * 372 * The logic does not apply to gitlinks, as ce_match_stat_basic() 373 * already has checked the actual HEAD from the filesystem in the 374 * subproject. If ie_match_stat() already said it is different, 375 * then we know it is. 376 */ 377if((changed & DATA_CHANGED) && 378(S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size !=0)) 379return changed; 380 381 changed_fs =ce_modified_check_fs(ce, st); 382if(changed_fs) 383return changed | changed_fs; 384return0; 385} 386 387intbase_name_compare(const char*name1,int len1,int mode1, 388const char*name2,int len2,int mode2) 389{ 390unsigned char c1, c2; 391int len = len1 < len2 ? len1 : len2; 392int cmp; 393 394 cmp =memcmp(name1, name2, len); 395if(cmp) 396return cmp; 397 c1 = name1[len]; 398 c2 = name2[len]; 399if(!c1 &&S_ISDIR(mode1)) 400 c1 ='/'; 401if(!c2 &&S_ISDIR(mode2)) 402 c2 ='/'; 403return(c1 < c2) ? -1: (c1 > c2) ?1:0; 404} 405 406/* 407 * df_name_compare() is identical to base_name_compare(), except it 408 * compares conflicting directory/file entries as equal. Note that 409 * while a directory name compares as equal to a regular file, they 410 * then individually compare _differently_ to a filename that has 411 * a dot after the basename (because '\0' < '.' < '/'). 412 * 413 * This is used by routines that want to traverse the git namespace 414 * but then handle conflicting entries together when possible. 415 */ 416intdf_name_compare(const char*name1,int len1,int mode1, 417const char*name2,int len2,int mode2) 418{ 419int len = len1 < len2 ? len1 : len2, cmp; 420unsigned char c1, c2; 421 422 cmp =memcmp(name1, name2, len); 423if(cmp) 424return cmp; 425/* Directories and files compare equal (same length, same name) */ 426if(len1 == len2) 427return0; 428 c1 = name1[len]; 429if(!c1 &&S_ISDIR(mode1)) 430 c1 ='/'; 431 c2 = name2[len]; 432if(!c2 &&S_ISDIR(mode2)) 433 c2 ='/'; 434if(c1 =='/'&& !c2) 435return0; 436if(c2 =='/'&& !c1) 437return0; 438return c1 - c2; 439} 440 441intname_compare(const char*name1,size_t len1,const char*name2,size_t len2) 442{ 443size_t min_len = (len1 < len2) ? len1 : len2; 444int cmp =memcmp(name1, name2, min_len); 445if(cmp) 446return cmp; 447if(len1 < len2) 448return-1; 449if(len1 > len2) 450return1; 451return0; 452} 453 454intcache_name_stage_compare(const char*name1,int len1,int stage1,const char*name2,int len2,int stage2) 455{ 456int cmp; 457 458 cmp =name_compare(name1, len1, name2, len2); 459if(cmp) 460return cmp; 461 462if(stage1 < stage2) 463return-1; 464if(stage1 > stage2) 465return1; 466return0; 467} 468 469static intindex_name_stage_pos(const struct index_state *istate,const char*name,int namelen,int stage) 470{ 471int first, last; 472 473 first =0; 474 last = istate->cache_nr; 475while(last > first) { 476int next = (last + first) >>1; 477struct cache_entry *ce = istate->cache[next]; 478int cmp =cache_name_stage_compare(name, namelen, stage, ce->name,ce_namelen(ce),ce_stage(ce)); 479if(!cmp) 480return next; 481if(cmp <0) { 482 last = next; 483continue; 484} 485 first = next+1; 486} 487return-first-1; 488} 489 490intindex_name_pos(const struct index_state *istate,const char*name,int namelen) 491{ 492returnindex_name_stage_pos(istate, name, namelen,0); 493} 494 495/* Remove entry, return true if there are more entries to go.. */ 496intremove_index_entry_at(struct index_state *istate,int pos) 497{ 498struct cache_entry *ce = istate->cache[pos]; 499 500record_resolve_undo(istate, ce); 501remove_name_hash(istate, ce); 502save_or_free_index_entry(istate, ce); 503 istate->cache_changed |= CE_ENTRY_REMOVED; 504 istate->cache_nr--; 505if(pos >= istate->cache_nr) 506return0; 507memmove(istate->cache + pos, 508 istate->cache + pos +1, 509(istate->cache_nr - pos) *sizeof(struct cache_entry *)); 510return1; 511} 512 513/* 514 * Remove all cache entries marked for removal, that is where 515 * CE_REMOVE is set in ce_flags. This is much more effective than 516 * calling remove_index_entry_at() for each entry to be removed. 517 */ 518voidremove_marked_cache_entries(struct index_state *istate) 519{ 520struct cache_entry **ce_array = istate->cache; 521unsigned int i, j; 522 523for(i = j =0; i < istate->cache_nr; i++) { 524if(ce_array[i]->ce_flags & CE_REMOVE) { 525remove_name_hash(istate, ce_array[i]); 526save_or_free_index_entry(istate, ce_array[i]); 527} 528else 529 ce_array[j++] = ce_array[i]; 530} 531if(j == istate->cache_nr) 532return; 533 istate->cache_changed |= CE_ENTRY_REMOVED; 534 istate->cache_nr = j; 535} 536 537intremove_file_from_index(struct index_state *istate,const char*path) 538{ 539int pos =index_name_pos(istate, path,strlen(path)); 540if(pos <0) 541 pos = -pos-1; 542cache_tree_invalidate_path(istate, path); 543untracked_cache_remove_from_index(istate, path); 544while(pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path)) 545remove_index_entry_at(istate, pos); 546return0; 547} 548 549static intcompare_name(struct cache_entry *ce,const char*path,int namelen) 550{ 551return namelen !=ce_namelen(ce) ||memcmp(path, ce->name, namelen); 552} 553 554static intindex_name_pos_also_unmerged(struct index_state *istate, 555const char*path,int namelen) 556{ 557int pos =index_name_pos(istate, path, namelen); 558struct cache_entry *ce; 559 560if(pos >=0) 561return pos; 562 563/* maybe unmerged? */ 564 pos = -1- pos; 565if(pos >= istate->cache_nr || 566compare_name((ce = istate->cache[pos]), path, namelen)) 567return-1; 568 569/* order of preference: stage 2, 1, 3 */ 570if(ce_stage(ce) ==1&& pos +1< istate->cache_nr && 571ce_stage((ce = istate->cache[pos +1])) ==2&& 572!compare_name(ce, path, namelen)) 573 pos++; 574return pos; 575} 576 577static intdifferent_name(struct cache_entry *ce,struct cache_entry *alias) 578{ 579int len =ce_namelen(ce); 580returnce_namelen(alias) != len ||memcmp(ce->name, alias->name, len); 581} 582 583/* 584 * If we add a filename that aliases in the cache, we will use the 585 * name that we already have - but we don't want to update the same 586 * alias twice, because that implies that there were actually two 587 * different files with aliasing names! 588 * 589 * So we use the CE_ADDED flag to verify that the alias was an old 590 * one before we accept it as 591 */ 592static struct cache_entry *create_alias_ce(struct index_state *istate, 593struct cache_entry *ce, 594struct cache_entry *alias) 595{ 596int len; 597struct cache_entry *new; 598 599if(alias->ce_flags & CE_ADDED) 600die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name); 601 602/* Ok, create the new entry using the name of the existing alias */ 603 len =ce_namelen(alias); 604new=xcalloc(1,cache_entry_size(len)); 605memcpy(new->name, alias->name, len); 606copy_cache_entry(new, ce); 607save_or_free_index_entry(istate, ce); 608return new; 609} 610 611voidset_object_name_for_intent_to_add_entry(struct cache_entry *ce) 612{ 613unsigned char sha1[20]; 614if(write_sha1_file("",0, blob_type, sha1)) 615die("cannot create an empty blob in the object database"); 616hashcpy(ce->sha1, sha1); 617} 618 619intadd_to_index(struct index_state *istate,const char*path,struct stat *st,int flags) 620{ 621int size, namelen, was_same; 622 mode_t st_mode = st->st_mode; 623struct cache_entry *ce, *alias; 624unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY; 625int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND); 626int pretend = flags & ADD_CACHE_PRETEND; 627int intent_only = flags & ADD_CACHE_INTENT; 628int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE| 629(intent_only ? ADD_CACHE_NEW_ONLY :0)); 630 631if(!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode)) 632returnerror("%s: can only add regular files, symbolic links or git-directories", path); 633 634 namelen =strlen(path); 635if(S_ISDIR(st_mode)) { 636while(namelen && path[namelen-1] =='/') 637 namelen--; 638} 639 size =cache_entry_size(namelen); 640 ce =xcalloc(1, size); 641memcpy(ce->name, path, namelen); 642 ce->ce_namelen = namelen; 643if(!intent_only) 644fill_stat_cache_info(ce, st); 645else 646 ce->ce_flags |= CE_INTENT_TO_ADD; 647 648if(trust_executable_bit && has_symlinks) 649 ce->ce_mode =create_ce_mode(st_mode); 650else{ 651/* If there is an existing entry, pick the mode bits and type 652 * from it, otherwise assume unexecutable regular file. 653 */ 654struct cache_entry *ent; 655int pos =index_name_pos_also_unmerged(istate, path, namelen); 656 657 ent = (0<= pos) ? istate->cache[pos] : NULL; 658 ce->ce_mode =ce_mode_from_stat(ent, st_mode); 659} 660 661/* When core.ignorecase=true, determine if a directory of the same name but differing 662 * case already exists within the Git repository. If it does, ensure the directory 663 * case of the file being added to the repository matches (is folded into) the existing 664 * entry's directory case. 665 */ 666if(ignore_case) { 667const char*startPtr = ce->name; 668const char*ptr = startPtr; 669while(*ptr) { 670while(*ptr && *ptr !='/') 671++ptr; 672if(*ptr =='/') { 673struct cache_entry *foundce; 674++ptr; 675 foundce =index_dir_exists(istate, ce->name, ptr - ce->name -1); 676if(foundce) { 677memcpy((void*)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr); 678 startPtr = ptr; 679} 680} 681} 682} 683 684 alias =index_file_exists(istate, ce->name,ce_namelen(ce), ignore_case); 685if(alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) { 686/* Nothing changed, really */ 687free(ce); 688if(!S_ISGITLINK(alias->ce_mode)) 689ce_mark_uptodate(alias); 690 alias->ce_flags |= CE_ADDED; 691return0; 692} 693if(!intent_only) { 694if(index_path(ce->sha1, path, st, HASH_WRITE_OBJECT)) 695returnerror("unable to index file%s", path); 696}else 697set_object_name_for_intent_to_add_entry(ce); 698 699if(ignore_case && alias &&different_name(ce, alias)) 700 ce =create_alias_ce(istate, ce, alias); 701 ce->ce_flags |= CE_ADDED; 702 703/* It was suspected to be racily clean, but it turns out to be Ok */ 704 was_same = (alias && 705!ce_stage(alias) && 706!hashcmp(alias->sha1, ce->sha1) && 707 ce->ce_mode == alias->ce_mode); 708 709if(pretend) 710; 711else if(add_index_entry(istate, ce, add_option)) 712returnerror("unable to add%sto index",path); 713if(verbose && !was_same) 714printf("add '%s'\n", path); 715return0; 716} 717 718intadd_file_to_index(struct index_state *istate,const char*path,int flags) 719{ 720struct stat st; 721if(lstat(path, &st)) 722die_errno("unable to stat '%s'", path); 723returnadd_to_index(istate, path, &st, flags); 724} 725 726struct cache_entry *make_cache_entry(unsigned int mode, 727const unsigned char*sha1,const char*path,int stage, 728unsigned int refresh_options) 729{ 730int size, len; 731struct cache_entry *ce, *ret; 732 733if(!verify_path(path)) { 734error("Invalid path '%s'", path); 735return NULL; 736} 737 738 len =strlen(path); 739 size =cache_entry_size(len); 740 ce =xcalloc(1, size); 741 742hashcpy(ce->sha1, sha1); 743memcpy(ce->name, path, len); 744 ce->ce_flags =create_ce_flags(stage); 745 ce->ce_namelen = len; 746 ce->ce_mode =create_ce_mode(mode); 747 748 ret =refresh_cache_entry(ce, refresh_options); 749if(!ret) { 750free(ce); 751return NULL; 752}else{ 753return ret; 754} 755} 756 757intce_same_name(const struct cache_entry *a,const struct cache_entry *b) 758{ 759int len =ce_namelen(a); 760returnce_namelen(b) == len && !memcmp(a->name, b->name, len); 761} 762 763/* 764 * We fundamentally don't like some paths: we don't want 765 * dot or dot-dot anywhere, and for obvious reasons don't 766 * want to recurse into ".git" either. 767 * 768 * Also, we don't want double slashes or slashes at the 769 * end that can make pathnames ambiguous. 770 */ 771static intverify_dotfile(const char*rest) 772{ 773/* 774 * The first character was '.', but that 775 * has already been discarded, we now test 776 * the rest. 777 */ 778 779/* "." is not allowed */ 780if(*rest =='\0'||is_dir_sep(*rest)) 781return0; 782 783switch(*rest) { 784/* 785 * ".git" followed by NUL or slash is bad. This 786 * shares the path end test with the ".." case. 787 */ 788case'g': 789case'G': 790if(rest[1] !='i'&& rest[1] !='I') 791break; 792if(rest[2] !='t'&& rest[2] !='T') 793break; 794 rest +=2; 795/* fallthrough */ 796case'.': 797if(rest[1] =='\0'||is_dir_sep(rest[1])) 798return0; 799} 800return1; 801} 802 803intverify_path(const char*path) 804{ 805char c; 806 807if(has_dos_drive_prefix(path)) 808return0; 809 810goto inside; 811for(;;) { 812if(!c) 813return1; 814if(is_dir_sep(c)) { 815inside: 816if(protect_hfs &&is_hfs_dotgit(path)) 817return0; 818if(protect_ntfs &&is_ntfs_dotgit(path)) 819return0; 820 c = *path++; 821if((c =='.'&& !verify_dotfile(path)) || 822is_dir_sep(c) || c =='\0') 823return0; 824} 825 c = *path++; 826} 827} 828 829/* 830 * Do we have another file that has the beginning components being a 831 * proper superset of the name we're trying to add? 832 */ 833static inthas_file_name(struct index_state *istate, 834const struct cache_entry *ce,int pos,int ok_to_replace) 835{ 836int retval =0; 837int len =ce_namelen(ce); 838int stage =ce_stage(ce); 839const char*name = ce->name; 840 841while(pos < istate->cache_nr) { 842struct cache_entry *p = istate->cache[pos++]; 843 844if(len >=ce_namelen(p)) 845break; 846if(memcmp(name, p->name, len)) 847break; 848if(ce_stage(p) != stage) 849continue; 850if(p->name[len] !='/') 851continue; 852if(p->ce_flags & CE_REMOVE) 853continue; 854 retval = -1; 855if(!ok_to_replace) 856break; 857remove_index_entry_at(istate, --pos); 858} 859return retval; 860} 861 862/* 863 * Do we have another file with a pathname that is a proper 864 * subset of the name we're trying to add? 865 */ 866static inthas_dir_name(struct index_state *istate, 867const struct cache_entry *ce,int pos,int ok_to_replace) 868{ 869int retval =0; 870int stage =ce_stage(ce); 871const char*name = ce->name; 872const char*slash = name +ce_namelen(ce); 873 874for(;;) { 875int len; 876 877for(;;) { 878if(*--slash =='/') 879break; 880if(slash <= ce->name) 881return retval; 882} 883 len = slash - name; 884 885 pos =index_name_stage_pos(istate, name, len, stage); 886if(pos >=0) { 887/* 888 * Found one, but not so fast. This could 889 * be a marker that says "I was here, but 890 * I am being removed". Such an entry is 891 * not a part of the resulting tree, and 892 * it is Ok to have a directory at the same 893 * path. 894 */ 895if(!(istate->cache[pos]->ce_flags & CE_REMOVE)) { 896 retval = -1; 897if(!ok_to_replace) 898break; 899remove_index_entry_at(istate, pos); 900continue; 901} 902} 903else 904 pos = -pos-1; 905 906/* 907 * Trivial optimization: if we find an entry that 908 * already matches the sub-directory, then we know 909 * we're ok, and we can exit. 910 */ 911while(pos < istate->cache_nr) { 912struct cache_entry *p = istate->cache[pos]; 913if((ce_namelen(p) <= len) || 914(p->name[len] !='/') || 915memcmp(p->name, name, len)) 916break;/* not our subdirectory */ 917if(ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) 918/* 919 * p is at the same stage as our entry, and 920 * is a subdirectory of what we are looking 921 * at, so we cannot have conflicts at our 922 * level or anything shorter. 923 */ 924return retval; 925 pos++; 926} 927} 928return retval; 929} 930 931/* We may be in a situation where we already have path/file and path 932 * is being added, or we already have path and path/file is being 933 * added. Either one would result in a nonsense tree that has path 934 * twice when git-write-tree tries to write it out. Prevent it. 935 * 936 * If ok-to-replace is specified, we remove the conflicting entries 937 * from the cache so the caller should recompute the insert position. 938 * When this happens, we return non-zero. 939 */ 940static intcheck_file_directory_conflict(struct index_state *istate, 941const struct cache_entry *ce, 942int pos,int ok_to_replace) 943{ 944int retval; 945 946/* 947 * When ce is an "I am going away" entry, we allow it to be added 948 */ 949if(ce->ce_flags & CE_REMOVE) 950return0; 951 952/* 953 * We check if the path is a sub-path of a subsequent pathname 954 * first, since removing those will not change the position 955 * in the array. 956 */ 957 retval =has_file_name(istate, ce, pos, ok_to_replace); 958 959/* 960 * Then check if the path might have a clashing sub-directory 961 * before it. 962 */ 963return retval +has_dir_name(istate, ce, pos, ok_to_replace); 964} 965 966static intadd_index_entry_with_check(struct index_state *istate,struct cache_entry *ce,int option) 967{ 968int pos; 969int ok_to_add = option & ADD_CACHE_OK_TO_ADD; 970int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; 971int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; 972int new_only = option & ADD_CACHE_NEW_ONLY; 973 974if(!(option & ADD_CACHE_KEEP_CACHE_TREE)) 975cache_tree_invalidate_path(istate, ce->name); 976 pos =index_name_stage_pos(istate, ce->name,ce_namelen(ce),ce_stage(ce)); 977 978/* existing match? Just replace it. */ 979if(pos >=0) { 980if(!new_only) 981replace_index_entry(istate, pos, ce); 982return0; 983} 984 pos = -pos-1; 985 986untracked_cache_add_to_index(istate, ce->name); 987 988/* 989 * Inserting a merged entry ("stage 0") into the index 990 * will always replace all non-merged entries.. 991 */ 992if(pos < istate->cache_nr &&ce_stage(ce) ==0) { 993while(ce_same_name(istate->cache[pos], ce)) { 994 ok_to_add =1; 995if(!remove_index_entry_at(istate, pos)) 996break; 997} 998} 9991000if(!ok_to_add)1001return-1;1002if(!verify_path(ce->name))1003returnerror("Invalid path '%s'", ce->name);10041005if(!skip_df_check &&1006check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {1007if(!ok_to_replace)1008returnerror("'%s' appears as both a file and as a directory",1009 ce->name);1010 pos =index_name_stage_pos(istate, ce->name,ce_namelen(ce),ce_stage(ce));1011 pos = -pos-1;1012}1013return pos +1;1014}10151016intadd_index_entry(struct index_state *istate,struct cache_entry *ce,int option)1017{1018int pos;10191020if(option & ADD_CACHE_JUST_APPEND)1021 pos = istate->cache_nr;1022else{1023int ret;1024 ret =add_index_entry_with_check(istate, ce, option);1025if(ret <=0)1026return ret;1027 pos = ret -1;1028}10291030/* Make sure the array is big enough .. */1031ALLOC_GROW(istate->cache, istate->cache_nr +1, istate->cache_alloc);10321033/* Add it in.. */1034 istate->cache_nr++;1035if(istate->cache_nr > pos +1)1036memmove(istate->cache + pos +1,1037 istate->cache + pos,1038(istate->cache_nr - pos -1) *sizeof(ce));1039set_index_entry(istate, pos, ce);1040 istate->cache_changed |= CE_ENTRY_ADDED;1041return0;1042}10431044/*1045 * "refresh" does not calculate a new sha1 file or bring the1046 * cache up-to-date for mode/content changes. But what it1047 * _does_ do is to "re-match" the stat information of a file1048 * with the cache, so that you can refresh the cache for a1049 * file that hasn't been changed but where the stat entry is1050 * out of date.1051 *1052 * For example, you'd want to do this after doing a "git-read-tree",1053 * to link up the stat cache details with the proper files.1054 */1055static struct cache_entry *refresh_cache_ent(struct index_state *istate,1056struct cache_entry *ce,1057unsigned int options,int*err,1058int*changed_ret)1059{1060struct stat st;1061struct cache_entry *updated;1062int changed, size;1063int refresh = options & CE_MATCH_REFRESH;1064int ignore_valid = options & CE_MATCH_IGNORE_VALID;1065int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;1066int ignore_missing = options & CE_MATCH_IGNORE_MISSING;10671068if(!refresh ||ce_uptodate(ce))1069return ce;10701071/*1072 * CE_VALID or CE_SKIP_WORKTREE means the user promised us1073 * that the change to the work tree does not matter and told1074 * us not to worry.1075 */1076if(!ignore_skip_worktree &&ce_skip_worktree(ce)) {1077ce_mark_uptodate(ce);1078return ce;1079}1080if(!ignore_valid && (ce->ce_flags & CE_VALID)) {1081ce_mark_uptodate(ce);1082return ce;1083}10841085if(has_symlink_leading_path(ce->name,ce_namelen(ce))) {1086if(ignore_missing)1087return ce;1088if(err)1089*err = ENOENT;1090return NULL;1091}10921093if(lstat(ce->name, &st) <0) {1094if(ignore_missing && errno == ENOENT)1095return ce;1096if(err)1097*err = errno;1098return NULL;1099}11001101 changed =ie_match_stat(istate, ce, &st, options);1102if(changed_ret)1103*changed_ret = changed;1104if(!changed) {1105/*1106 * The path is unchanged. If we were told to ignore1107 * valid bit, then we did the actual stat check and1108 * found that the entry is unmodified. If the entry1109 * is not marked VALID, this is the place to mark it1110 * valid again, under "assume unchanged" mode.1111 */1112if(ignore_valid && assume_unchanged &&1113!(ce->ce_flags & CE_VALID))1114;/* mark this one VALID again */1115else{1116/*1117 * We do not mark the index itself "modified"1118 * because CE_UPTODATE flag is in-core only;1119 * we are not going to write this change out.1120 */1121if(!S_ISGITLINK(ce->ce_mode))1122ce_mark_uptodate(ce);1123return ce;1124}1125}11261127if(ie_modified(istate, ce, &st, options)) {1128if(err)1129*err = EINVAL;1130return NULL;1131}11321133 size =ce_size(ce);1134 updated =xmalloc(size);1135memcpy(updated, ce, size);1136fill_stat_cache_info(updated, &st);1137/*1138 * If ignore_valid is not set, we should leave CE_VALID bit1139 * alone. Otherwise, paths marked with --no-assume-unchanged1140 * (i.e. things to be edited) will reacquire CE_VALID bit1141 * automatically, which is not really what we want.1142 */1143if(!ignore_valid && assume_unchanged &&1144!(ce->ce_flags & CE_VALID))1145 updated->ce_flags &= ~CE_VALID;11461147/* istate->cache_changed is updated in the caller */1148return updated;1149}11501151static voidshow_file(const char* fmt,const char* name,int in_porcelain,1152int* first,const char*header_msg)1153{1154if(in_porcelain && *first && header_msg) {1155printf("%s\n", header_msg);1156*first =0;1157}1158printf(fmt, name);1159}11601161intrefresh_index(struct index_state *istate,unsigned int flags,1162const struct pathspec *pathspec,1163char*seen,const char*header_msg)1164{1165int i;1166int has_errors =0;1167int really = (flags & REFRESH_REALLY) !=0;1168int allow_unmerged = (flags & REFRESH_UNMERGED) !=0;1169int quiet = (flags & REFRESH_QUIET) !=0;1170int not_new = (flags & REFRESH_IGNORE_MISSING) !=0;1171int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) !=0;1172int first =1;1173int in_porcelain = (flags & REFRESH_IN_PORCELAIN);1174unsigned int options = (CE_MATCH_REFRESH |1175(really ? CE_MATCH_IGNORE_VALID :0) |1176(not_new ? CE_MATCH_IGNORE_MISSING :0));1177const char*modified_fmt;1178const char*deleted_fmt;1179const char*typechange_fmt;1180const char*added_fmt;1181const char*unmerged_fmt;11821183 modified_fmt = (in_porcelain ?"M\t%s\n":"%s: needs update\n");1184 deleted_fmt = (in_porcelain ?"D\t%s\n":"%s: needs update\n");1185 typechange_fmt = (in_porcelain ?"T\t%s\n":"%sneeds update\n");1186 added_fmt = (in_porcelain ?"A\t%s\n":"%sneeds update\n");1187 unmerged_fmt = (in_porcelain ?"U\t%s\n":"%s: needs merge\n");1188for(i =0; i < istate->cache_nr; i++) {1189struct cache_entry *ce, *new;1190int cache_errno =0;1191int changed =0;1192int filtered =0;11931194 ce = istate->cache[i];1195if(ignore_submodules &&S_ISGITLINK(ce->ce_mode))1196continue;11971198if(pathspec && !ce_path_match(ce, pathspec, seen))1199 filtered =1;12001201if(ce_stage(ce)) {1202while((i < istate->cache_nr) &&1203!strcmp(istate->cache[i]->name, ce->name))1204 i++;1205 i--;1206if(allow_unmerged)1207continue;1208if(!filtered)1209show_file(unmerged_fmt, ce->name, in_porcelain,1210&first, header_msg);1211 has_errors =1;1212continue;1213}12141215if(filtered)1216continue;12171218new=refresh_cache_ent(istate, ce, options, &cache_errno, &changed);1219if(new== ce)1220continue;1221if(!new) {1222const char*fmt;12231224if(really && cache_errno == EINVAL) {1225/* If we are doing --really-refresh that1226 * means the index is not valid anymore.1227 */1228 ce->ce_flags &= ~CE_VALID;1229 ce->ce_flags |= CE_UPDATE_IN_BASE;1230 istate->cache_changed |= CE_ENTRY_CHANGED;1231}1232if(quiet)1233continue;12341235if(cache_errno == ENOENT)1236 fmt = deleted_fmt;1237else if(ce->ce_flags & CE_INTENT_TO_ADD)1238 fmt = added_fmt;/* must be before other checks */1239else if(changed & TYPE_CHANGED)1240 fmt = typechange_fmt;1241else1242 fmt = modified_fmt;1243show_file(fmt,1244 ce->name, in_porcelain, &first, header_msg);1245 has_errors =1;1246continue;1247}12481249replace_index_entry(istate, i,new);1250}1251return has_errors;1252}12531254static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,1255unsigned int options)1256{1257returnrefresh_cache_ent(&the_index, ce, options, NULL, NULL);1258}125912601261/*****************************************************************1262 * Index File I/O1263 *****************************************************************/12641265#define INDEX_FORMAT_DEFAULT 312661267static unsigned intget_index_format_default(void)1268{1269char*envversion =getenv("GIT_INDEX_VERSION");1270char*endp;1271int value;1272unsigned int version = INDEX_FORMAT_DEFAULT;12731274if(!envversion) {1275if(!git_config_get_int("index.version", &value))1276 version = value;1277if(version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {1278warning(_("index.version set, but the value is invalid.\n"1279"Using version%i"), INDEX_FORMAT_DEFAULT);1280return INDEX_FORMAT_DEFAULT;1281}1282return version;1283}12841285 version =strtoul(envversion, &endp,10);1286if(*endp ||1287 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {1288warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"1289"Using version%i"), INDEX_FORMAT_DEFAULT);1290 version = INDEX_FORMAT_DEFAULT;1291}1292return version;1293}12941295/*1296 * dev/ino/uid/gid/size are also just tracked to the low 32 bits1297 * Again - this is just a (very strong in practice) heuristic that1298 * the inode hasn't changed.1299 *1300 * We save the fields in big-endian order to allow using the1301 * index file over NFS transparently.1302 */1303struct ondisk_cache_entry {1304struct cache_time ctime;1305struct cache_time mtime;1306uint32_t dev;1307uint32_t ino;1308uint32_t mode;1309uint32_t uid;1310uint32_t gid;1311uint32_t size;1312unsigned char sha1[20];1313uint16_t flags;1314char name[FLEX_ARRAY];/* more */1315};13161317/*1318 * This struct is used when CE_EXTENDED bit is 11319 * The struct must match ondisk_cache_entry exactly from1320 * ctime till flags1321 */1322struct ondisk_cache_entry_extended {1323struct cache_time ctime;1324struct cache_time mtime;1325uint32_t dev;1326uint32_t ino;1327uint32_t mode;1328uint32_t uid;1329uint32_t gid;1330uint32_t size;1331unsigned char sha1[20];1332uint16_t flags;1333uint16_t flags2;1334char name[FLEX_ARRAY];/* more */1335};13361337/* These are only used for v3 or lower */1338#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)1339#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)1340#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)1341#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \1342 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \1343 ondisk_cache_entry_size(ce_namelen(ce)))13441345static intverify_hdr(struct cache_header *hdr,unsigned long size)1346{1347 git_SHA_CTX c;1348unsigned char sha1[20];1349int hdr_version;13501351if(hdr->hdr_signature !=htonl(CACHE_SIGNATURE))1352returnerror("bad signature");1353 hdr_version =ntohl(hdr->hdr_version);1354if(hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)1355returnerror("bad index version%d", hdr_version);1356git_SHA1_Init(&c);1357git_SHA1_Update(&c, hdr, size -20);1358git_SHA1_Final(sha1, &c);1359if(hashcmp(sha1, (unsigned char*)hdr + size -20))1360returnerror("bad index file sha1 signature");1361return0;1362}13631364static intread_index_extension(struct index_state *istate,1365const char*ext,void*data,unsigned long sz)1366{1367switch(CACHE_EXT(ext)) {1368case CACHE_EXT_TREE:1369 istate->cache_tree =cache_tree_read(data, sz);1370break;1371case CACHE_EXT_RESOLVE_UNDO:1372 istate->resolve_undo =resolve_undo_read(data, sz);1373break;1374case CACHE_EXT_LINK:1375if(read_link_extension(istate, data, sz))1376return-1;1377break;1378case CACHE_EXT_UNTRACKED:1379 istate->untracked =read_untracked_extension(data, sz);1380break;1381default:1382if(*ext <'A'||'Z'< *ext)1383returnerror("index uses %.4s extension, which we do not understand",1384 ext);1385fprintf(stderr,"ignoring %.4s extension\n", ext);1386break;1387}1388return0;1389}13901391inthold_locked_index(struct lock_file *lk,int die_on_error)1392{1393returnhold_lock_file_for_update(lk,get_index_file(),1394 die_on_error1395? LOCK_DIE_ON_ERROR1396:0);1397}13981399intread_index(struct index_state *istate)1400{1401returnread_index_from(istate,get_index_file());1402}14031404static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,1405unsigned int flags,1406const char*name,1407size_t len)1408{1409struct cache_entry *ce =xmalloc(cache_entry_size(len));14101411 ce->ce_stat_data.sd_ctime.sec =get_be32(&ondisk->ctime.sec);1412 ce->ce_stat_data.sd_mtime.sec =get_be32(&ondisk->mtime.sec);1413 ce->ce_stat_data.sd_ctime.nsec =get_be32(&ondisk->ctime.nsec);1414 ce->ce_stat_data.sd_mtime.nsec =get_be32(&ondisk->mtime.nsec);1415 ce->ce_stat_data.sd_dev =get_be32(&ondisk->dev);1416 ce->ce_stat_data.sd_ino =get_be32(&ondisk->ino);1417 ce->ce_mode =get_be32(&ondisk->mode);1418 ce->ce_stat_data.sd_uid =get_be32(&ondisk->uid);1419 ce->ce_stat_data.sd_gid =get_be32(&ondisk->gid);1420 ce->ce_stat_data.sd_size =get_be32(&ondisk->size);1421 ce->ce_flags = flags & ~CE_NAMEMASK;1422 ce->ce_namelen = len;1423 ce->index =0;1424hashcpy(ce->sha1, ondisk->sha1);1425memcpy(ce->name, name, len);1426 ce->name[len] ='\0';1427return ce;1428}14291430/*1431 * Adjacent cache entries tend to share the leading paths, so it makes1432 * sense to only store the differences in later entries. In the v41433 * on-disk format of the index, each on-disk cache entry stores the1434 * number of bytes to be stripped from the end of the previous name,1435 * and the bytes to append to the result, to come up with its name.1436 */1437static unsigned longexpand_name_field(struct strbuf *name,const char*cp_)1438{1439const unsigned char*ep, *cp = (const unsigned char*)cp_;1440size_t len =decode_varint(&cp);14411442if(name->len < len)1443die("malformed name field in the index");1444strbuf_remove(name, name->len - len, len);1445for(ep = cp; *ep; ep++)1446;/* find the end */1447strbuf_add(name, cp, ep - cp);1448return(const char*)ep +1- cp_;1449}14501451static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,1452unsigned long*ent_size,1453struct strbuf *previous_name)1454{1455struct cache_entry *ce;1456size_t len;1457const char*name;1458unsigned int flags;14591460/* On-disk flags are just 16 bits */1461 flags =get_be16(&ondisk->flags);1462 len = flags & CE_NAMEMASK;14631464if(flags & CE_EXTENDED) {1465struct ondisk_cache_entry_extended *ondisk2;1466int extended_flags;1467 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1468 extended_flags =get_be16(&ondisk2->flags2) <<16;1469/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */1470if(extended_flags & ~CE_EXTENDED_FLAGS)1471die("Unknown index entry format%08x", extended_flags);1472 flags |= extended_flags;1473 name = ondisk2->name;1474}1475else1476 name = ondisk->name;14771478if(!previous_name) {1479/* v3 and earlier */1480if(len == CE_NAMEMASK)1481 len =strlen(name);1482 ce =cache_entry_from_ondisk(ondisk, flags, name, len);14831484*ent_size =ondisk_ce_size(ce);1485}else{1486unsigned long consumed;1487 consumed =expand_name_field(previous_name, name);1488 ce =cache_entry_from_ondisk(ondisk, flags,1489 previous_name->buf,1490 previous_name->len);14911492*ent_size = (name - ((char*)ondisk)) + consumed;1493}1494return ce;1495}14961497static voidcheck_ce_order(struct cache_entry *ce,struct cache_entry *next_ce)1498{1499int name_compare =strcmp(ce->name, next_ce->name);1500if(0< name_compare)1501die("unordered stage entries in index");1502if(!name_compare) {1503if(!ce_stage(ce))1504die("multiple stage entries for merged file '%s'",1505 ce->name);1506if(ce_stage(ce) >ce_stage(next_ce))1507die("unordered stage entries for '%s'",1508 ce->name);1509}1510}15111512/* remember to discard_cache() before reading a different cache! */1513intdo_read_index(struct index_state *istate,const char*path,int must_exist)1514{1515int fd, i;1516struct stat st;1517unsigned long src_offset;1518struct cache_header *hdr;1519void*mmap;1520size_t mmap_size;1521struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;15221523if(istate->initialized)1524return istate->cache_nr;15251526 istate->timestamp.sec =0;1527 istate->timestamp.nsec =0;1528 fd =open(path, O_RDONLY);1529if(fd <0) {1530if(!must_exist && errno == ENOENT)1531return0;1532die_errno("%s: index file open failed", path);1533}15341535if(fstat(fd, &st))1536die_errno("cannot stat the open index");15371538 mmap_size =xsize_t(st.st_size);1539if(mmap_size <sizeof(struct cache_header) +20)1540die("index file smaller than expected");15411542 mmap =xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,0);1543if(mmap == MAP_FAILED)1544die_errno("unable to map index file");1545close(fd);15461547 hdr = mmap;1548if(verify_hdr(hdr, mmap_size) <0)1549goto unmap;15501551hashcpy(istate->sha1, (const unsigned char*)hdr + mmap_size -20);1552 istate->version =ntohl(hdr->hdr_version);1553 istate->cache_nr =ntohl(hdr->hdr_entries);1554 istate->cache_alloc =alloc_nr(istate->cache_nr);1555 istate->cache =xcalloc(istate->cache_alloc,sizeof(*istate->cache));1556 istate->initialized =1;15571558if(istate->version ==4)1559 previous_name = &previous_name_buf;1560else1561 previous_name = NULL;15621563 src_offset =sizeof(*hdr);1564for(i =0; i < istate->cache_nr; i++) {1565struct ondisk_cache_entry *disk_ce;1566struct cache_entry *ce;1567unsigned long consumed;15681569 disk_ce = (struct ondisk_cache_entry *)((char*)mmap + src_offset);1570 ce =create_from_disk(disk_ce, &consumed, previous_name);1571set_index_entry(istate, i, ce);15721573if(i >0)1574check_ce_order(istate->cache[i -1], ce);15751576 src_offset += consumed;1577}1578strbuf_release(&previous_name_buf);1579 istate->timestamp.sec = st.st_mtime;1580 istate->timestamp.nsec =ST_MTIME_NSEC(st);15811582while(src_offset <= mmap_size -20-8) {1583/* After an array of active_nr index entries,1584 * there can be arbitrary number of extended1585 * sections, each of which is prefixed with1586 * extension name (4-byte) and section length1587 * in 4-byte network byte order.1588 */1589uint32_t extsize;1590memcpy(&extsize, (char*)mmap + src_offset +4,4);1591 extsize =ntohl(extsize);1592if(read_index_extension(istate,1593(const char*) mmap + src_offset,1594(char*) mmap + src_offset +8,1595 extsize) <0)1596goto unmap;1597 src_offset +=8;1598 src_offset += extsize;1599}1600munmap(mmap, mmap_size);1601return istate->cache_nr;16021603unmap:1604munmap(mmap, mmap_size);1605die("index file corrupt");1606}16071608intread_index_from(struct index_state *istate,const char*path)1609{1610struct split_index *split_index;1611int ret;16121613/* istate->initialized covers both .git/index and .git/sharedindex.xxx */1614if(istate->initialized)1615return istate->cache_nr;16161617 ret =do_read_index(istate, path,0);1618 split_index = istate->split_index;1619if(!split_index)1620return ret;16211622if(is_null_sha1(split_index->base_sha1))1623return ret;16241625if(split_index->base)1626discard_index(split_index->base);1627else1628 split_index->base =xcalloc(1,sizeof(*split_index->base));1629 ret =do_read_index(split_index->base,1630git_path("sharedindex.%s",1631sha1_to_hex(split_index->base_sha1)),1);1632if(hashcmp(split_index->base_sha1, split_index->base->sha1))1633die("broken index, expect%sin%s, got%s",1634sha1_to_hex(split_index->base_sha1),1635git_path("sharedindex.%s",1636sha1_to_hex(split_index->base_sha1)),1637sha1_to_hex(split_index->base->sha1));1638merge_base_index(istate);1639return ret;1640}16411642intis_index_unborn(struct index_state *istate)1643{1644return(!istate->cache_nr && !istate->timestamp.sec);1645}16461647intdiscard_index(struct index_state *istate)1648{1649int i;16501651for(i =0; i < istate->cache_nr; i++) {1652if(istate->cache[i]->index &&1653 istate->split_index &&1654 istate->split_index->base &&1655 istate->cache[i]->index <= istate->split_index->base->cache_nr &&1656 istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index -1])1657continue;1658free(istate->cache[i]);1659}1660resolve_undo_clear_index(istate);1661 istate->cache_nr =0;1662 istate->cache_changed =0;1663 istate->timestamp.sec =0;1664 istate->timestamp.nsec =0;1665free_name_hash(istate);1666cache_tree_free(&(istate->cache_tree));1667 istate->initialized =0;1668free(istate->cache);1669 istate->cache = NULL;1670 istate->cache_alloc =0;1671discard_split_index(istate);1672free_untracked_cache(istate->untracked);1673 istate->untracked = NULL;1674return0;1675}16761677intunmerged_index(const struct index_state *istate)1678{1679int i;1680for(i =0; i < istate->cache_nr; i++) {1681if(ce_stage(istate->cache[i]))1682return1;1683}1684return0;1685}16861687#define WRITE_BUFFER_SIZE 81921688static unsigned char write_buffer[WRITE_BUFFER_SIZE];1689static unsigned long write_buffer_len;16901691static intce_write_flush(git_SHA_CTX *context,int fd)1692{1693unsigned int buffered = write_buffer_len;1694if(buffered) {1695git_SHA1_Update(context, write_buffer, buffered);1696if(write_in_full(fd, write_buffer, buffered) != buffered)1697return-1;1698 write_buffer_len =0;1699}1700return0;1701}17021703static intce_write(git_SHA_CTX *context,int fd,void*data,unsigned int len)1704{1705while(len) {1706unsigned int buffered = write_buffer_len;1707unsigned int partial = WRITE_BUFFER_SIZE - buffered;1708if(partial > len)1709 partial = len;1710memcpy(write_buffer + buffered, data, partial);1711 buffered += partial;1712if(buffered == WRITE_BUFFER_SIZE) {1713 write_buffer_len = buffered;1714if(ce_write_flush(context, fd))1715return-1;1716 buffered =0;1717}1718 write_buffer_len = buffered;1719 len -= partial;1720 data = (char*) data + partial;1721}1722return0;1723}17241725static intwrite_index_ext_header(git_SHA_CTX *context,int fd,1726unsigned int ext,unsigned int sz)1727{1728 ext =htonl(ext);1729 sz =htonl(sz);1730return((ce_write(context, fd, &ext,4) <0) ||1731(ce_write(context, fd, &sz,4) <0)) ? -1:0;1732}17331734static intce_flush(git_SHA_CTX *context,int fd,unsigned char*sha1)1735{1736unsigned int left = write_buffer_len;17371738if(left) {1739 write_buffer_len =0;1740git_SHA1_Update(context, write_buffer, left);1741}17421743/* Flush first if not enough space for SHA1 signature */1744if(left +20> WRITE_BUFFER_SIZE) {1745if(write_in_full(fd, write_buffer, left) != left)1746return-1;1747 left =0;1748}17491750/* Append the SHA1 signature at the end */1751git_SHA1_Final(write_buffer + left, context);1752hashcpy(sha1, write_buffer + left);1753 left +=20;1754return(write_in_full(fd, write_buffer, left) != left) ? -1:0;1755}17561757static voidce_smudge_racily_clean_entry(struct cache_entry *ce)1758{1759/*1760 * The only thing we care about in this function is to smudge the1761 * falsely clean entry due to touch-update-touch race, so we leave1762 * everything else as they are. We are called for entries whose1763 * ce_stat_data.sd_mtime match the index file mtime.1764 *1765 * Note that this actually does not do much for gitlinks, for1766 * which ce_match_stat_basic() always goes to the actual1767 * contents. The caller checks with is_racy_timestamp() which1768 * always says "no" for gitlinks, so we are not called for them ;-)1769 */1770struct stat st;17711772if(lstat(ce->name, &st) <0)1773return;1774if(ce_match_stat_basic(ce, &st))1775return;1776if(ce_modified_check_fs(ce, &st)) {1777/* This is "racily clean"; smudge it. Note that this1778 * is a tricky code. At first glance, it may appear1779 * that it can break with this sequence:1780 *1781 * $ echo xyzzy >frotz1782 * $ git-update-index --add frotz1783 * $ : >frotz1784 * $ sleep 31785 * $ echo filfre >nitfol1786 * $ git-update-index --add nitfol1787 *1788 * but it does not. When the second update-index runs,1789 * it notices that the entry "frotz" has the same timestamp1790 * as index, and if we were to smudge it by resetting its1791 * size to zero here, then the object name recorded1792 * in index is the 6-byte file but the cached stat information1793 * becomes zero --- which would then match what we would1794 * obtain from the filesystem next time we stat("frotz").1795 *1796 * However, the second update-index, before calling1797 * this function, notices that the cached size is 61798 * bytes and what is on the filesystem is an empty1799 * file, and never calls us, so the cached size information1800 * for "frotz" stays 6 which does not match the filesystem.1801 */1802 ce->ce_stat_data.sd_size =0;1803}1804}18051806/* Copy miscellaneous fields but not the name */1807static char*copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,1808struct cache_entry *ce)1809{1810short flags;18111812 ondisk->ctime.sec =htonl(ce->ce_stat_data.sd_ctime.sec);1813 ondisk->mtime.sec =htonl(ce->ce_stat_data.sd_mtime.sec);1814 ondisk->ctime.nsec =htonl(ce->ce_stat_data.sd_ctime.nsec);1815 ondisk->mtime.nsec =htonl(ce->ce_stat_data.sd_mtime.nsec);1816 ondisk->dev =htonl(ce->ce_stat_data.sd_dev);1817 ondisk->ino =htonl(ce->ce_stat_data.sd_ino);1818 ondisk->mode =htonl(ce->ce_mode);1819 ondisk->uid =htonl(ce->ce_stat_data.sd_uid);1820 ondisk->gid =htonl(ce->ce_stat_data.sd_gid);1821 ondisk->size =htonl(ce->ce_stat_data.sd_size);1822hashcpy(ondisk->sha1, ce->sha1);18231824 flags = ce->ce_flags & ~CE_NAMEMASK;1825 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK :ce_namelen(ce));1826 ondisk->flags =htons(flags);1827if(ce->ce_flags & CE_EXTENDED) {1828struct ondisk_cache_entry_extended *ondisk2;1829 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1830 ondisk2->flags2 =htons((ce->ce_flags & CE_EXTENDED_FLAGS) >>16);1831return ondisk2->name;1832}1833else{1834return ondisk->name;1835}1836}18371838static intce_write_entry(git_SHA_CTX *c,int fd,struct cache_entry *ce,1839struct strbuf *previous_name)1840{1841int size;1842struct ondisk_cache_entry *ondisk;1843int saved_namelen = saved_namelen;/* compiler workaround */1844char*name;1845int result;18461847if(ce->ce_flags & CE_STRIP_NAME) {1848 saved_namelen =ce_namelen(ce);1849 ce->ce_namelen =0;1850}18511852if(!previous_name) {1853 size =ondisk_ce_size(ce);1854 ondisk =xcalloc(1, size);1855 name =copy_cache_entry_to_ondisk(ondisk, ce);1856memcpy(name, ce->name,ce_namelen(ce));1857}else{1858int common, to_remove, prefix_size;1859unsigned char to_remove_vi[16];1860for(common =0;1861(ce->name[common] &&1862 common < previous_name->len &&1863 ce->name[common] == previous_name->buf[common]);1864 common++)1865;/* still matching */1866 to_remove = previous_name->len - common;1867 prefix_size =encode_varint(to_remove, to_remove_vi);18681869if(ce->ce_flags & CE_EXTENDED)1870 size =offsetof(struct ondisk_cache_entry_extended, name);1871else1872 size =offsetof(struct ondisk_cache_entry, name);1873 size += prefix_size + (ce_namelen(ce) - common +1);18741875 ondisk =xcalloc(1, size);1876 name =copy_cache_entry_to_ondisk(ondisk, ce);1877memcpy(name, to_remove_vi, prefix_size);1878memcpy(name + prefix_size, ce->name + common,ce_namelen(ce) - common);18791880strbuf_splice(previous_name, common, to_remove,1881 ce->name + common,ce_namelen(ce) - common);1882}1883if(ce->ce_flags & CE_STRIP_NAME) {1884 ce->ce_namelen = saved_namelen;1885 ce->ce_flags &= ~CE_STRIP_NAME;1886}18871888 result =ce_write(c, fd, ondisk, size);1889free(ondisk);1890return result;1891}18921893/*1894 * This function verifies if index_state has the correct sha1 of the1895 * index file. Don't die if we have any other failure, just return 0.1896 */1897static intverify_index_from(const struct index_state *istate,const char*path)1898{1899int fd;1900 ssize_t n;1901struct stat st;1902unsigned char sha1[20];19031904if(!istate->initialized)1905return0;19061907 fd =open(path, O_RDONLY);1908if(fd <0)1909return0;19101911if(fstat(fd, &st))1912goto out;19131914if(st.st_size <sizeof(struct cache_header) +20)1915goto out;19161917 n =pread_in_full(fd, sha1,20, st.st_size -20);1918if(n !=20)1919goto out;19201921if(hashcmp(istate->sha1, sha1))1922goto out;19231924close(fd);1925return1;19261927out:1928close(fd);1929return0;1930}19311932static intverify_index(const struct index_state *istate)1933{1934returnverify_index_from(istate,get_index_file());1935}19361937static inthas_racy_timestamp(struct index_state *istate)1938{1939int entries = istate->cache_nr;1940int i;19411942for(i =0; i < entries; i++) {1943struct cache_entry *ce = istate->cache[i];1944if(is_racy_timestamp(istate, ce))1945return1;1946}1947return0;1948}19491950/*1951 * Opportunistically update the index but do not complain if we can't1952 */1953voidupdate_index_if_able(struct index_state *istate,struct lock_file *lockfile)1954{1955if((istate->cache_changed ||has_racy_timestamp(istate)) &&1956verify_index(istate) &&1957write_locked_index(istate, lockfile, COMMIT_LOCK))1958rollback_lock_file(lockfile);1959}19601961static intdo_write_index(struct index_state *istate,int newfd,1962int strip_extensions)1963{1964 git_SHA_CTX c;1965struct cache_header hdr;1966int i, err, removed, extended, hdr_version;1967struct cache_entry **cache = istate->cache;1968int entries = istate->cache_nr;1969struct stat st;1970struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;19711972for(i = removed = extended =0; i < entries; i++) {1973if(cache[i]->ce_flags & CE_REMOVE)1974 removed++;19751976/* reduce extended entries if possible */1977 cache[i]->ce_flags &= ~CE_EXTENDED;1978if(cache[i]->ce_flags & CE_EXTENDED_FLAGS) {1979 extended++;1980 cache[i]->ce_flags |= CE_EXTENDED;1981}1982}19831984if(!istate->version) {1985 istate->version =get_index_format_default();1986if(getenv("GIT_TEST_SPLIT_INDEX"))1987init_split_index(istate);1988}19891990/* demote version 3 to version 2 when the latter suffices */1991if(istate->version ==3|| istate->version ==2)1992 istate->version = extended ?3:2;19931994 hdr_version = istate->version;19951996 hdr.hdr_signature =htonl(CACHE_SIGNATURE);1997 hdr.hdr_version =htonl(hdr_version);1998 hdr.hdr_entries =htonl(entries - removed);19992000git_SHA1_Init(&c);2001if(ce_write(&c, newfd, &hdr,sizeof(hdr)) <0)2002return-1;20032004 previous_name = (hdr_version ==4) ? &previous_name_buf : NULL;2005for(i =0; i < entries; i++) {2006struct cache_entry *ce = cache[i];2007if(ce->ce_flags & CE_REMOVE)2008continue;2009if(!ce_uptodate(ce) &&is_racy_timestamp(istate, ce))2010ce_smudge_racily_clean_entry(ce);2011if(is_null_sha1(ce->sha1)) {2012static const char msg[] ="cache entry has null sha1:%s";2013static int allow = -1;20142015if(allow <0)2016 allow =git_env_bool("GIT_ALLOW_NULL_SHA1",0);2017if(allow)2018warning(msg, ce->name);2019else2020returnerror(msg, ce->name);2021}2022if(ce_write_entry(&c, newfd, ce, previous_name) <0)2023return-1;2024}2025strbuf_release(&previous_name_buf);20262027/* Write extension data here */2028if(!strip_extensions && istate->split_index) {2029struct strbuf sb = STRBUF_INIT;20302031 err =write_link_extension(&sb, istate) <0||2032write_index_ext_header(&c, newfd, CACHE_EXT_LINK,2033 sb.len) <0||2034ce_write(&c, newfd, sb.buf, sb.len) <0;2035strbuf_release(&sb);2036if(err)2037return-1;2038}2039if(!strip_extensions && istate->cache_tree) {2040struct strbuf sb = STRBUF_INIT;20412042cache_tree_write(&sb, istate->cache_tree);2043 err =write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) <02044||ce_write(&c, newfd, sb.buf, sb.len) <0;2045strbuf_release(&sb);2046if(err)2047return-1;2048}2049if(!strip_extensions && istate->resolve_undo) {2050struct strbuf sb = STRBUF_INIT;20512052resolve_undo_write(&sb, istate->resolve_undo);2053 err =write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,2054 sb.len) <02055||ce_write(&c, newfd, sb.buf, sb.len) <0;2056strbuf_release(&sb);2057if(err)2058return-1;2059}2060if(!strip_extensions && istate->untracked) {2061struct strbuf sb = STRBUF_INIT;20622063write_untracked_extension(&sb, istate->untracked);2064 err =write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED,2065 sb.len) <0||2066ce_write(&c, newfd, sb.buf, sb.len) <0;2067strbuf_release(&sb);2068if(err)2069return-1;2070}20712072if(ce_flush(&c, newfd, istate->sha1) ||fstat(newfd, &st))2073return-1;2074 istate->timestamp.sec = (unsigned int)st.st_mtime;2075 istate->timestamp.nsec =ST_MTIME_NSEC(st);2076return0;2077}20782079voidset_alternate_index_output(const char*name)2080{2081 alternate_index_output = name;2082}20832084static intcommit_locked_index(struct lock_file *lk)2085{2086if(alternate_index_output)2087returncommit_lock_file_to(lk, alternate_index_output);2088else2089returncommit_lock_file(lk);2090}20912092static intdo_write_locked_index(struct index_state *istate,struct lock_file *lock,2093unsigned flags)2094{2095int ret =do_write_index(istate, lock->fd,0);2096if(ret)2097return ret;2098assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=2099(COMMIT_LOCK | CLOSE_LOCK));2100if(flags & COMMIT_LOCK)2101returncommit_locked_index(lock);2102else if(flags & CLOSE_LOCK)2103returnclose_lock_file(lock);2104else2105return ret;2106}21072108static intwrite_split_index(struct index_state *istate,2109struct lock_file *lock,2110unsigned flags)2111{2112int ret;2113prepare_to_write_split_index(istate);2114 ret =do_write_locked_index(istate, lock, flags);2115finish_writing_split_index(istate);2116return ret;2117}21182119static char*temporary_sharedindex;21202121static voidremove_temporary_sharedindex(void)2122{2123if(temporary_sharedindex) {2124unlink_or_warn(temporary_sharedindex);2125free(temporary_sharedindex);2126 temporary_sharedindex = NULL;2127}2128}21292130static voidremove_temporary_sharedindex_on_signal(int signo)2131{2132remove_temporary_sharedindex();2133sigchain_pop(signo);2134raise(signo);2135}21362137static intwrite_shared_index(struct index_state *istate,2138struct lock_file *lock,unsigned flags)2139{2140struct split_index *si = istate->split_index;2141static int installed_handler;2142int fd, ret;21432144 temporary_sharedindex =git_pathdup("sharedindex_XXXXXX");2145 fd =mkstemp(temporary_sharedindex);2146if(fd <0) {2147free(temporary_sharedindex);2148 temporary_sharedindex = NULL;2149hashclr(si->base_sha1);2150returndo_write_locked_index(istate, lock, flags);2151}2152if(!installed_handler) {2153atexit(remove_temporary_sharedindex);2154sigchain_push_common(remove_temporary_sharedindex_on_signal);2155}2156move_cache_to_base_index(istate);2157 ret =do_write_index(si->base, fd,1);2158close(fd);2159if(ret) {2160remove_temporary_sharedindex();2161return ret;2162}2163 ret =rename(temporary_sharedindex,2164git_path("sharedindex.%s",sha1_to_hex(si->base->sha1)));2165free(temporary_sharedindex);2166 temporary_sharedindex = NULL;2167if(!ret)2168hashcpy(si->base_sha1, si->base->sha1);2169return ret;2170}21712172intwrite_locked_index(struct index_state *istate,struct lock_file *lock,2173unsigned flags)2174{2175struct split_index *si = istate->split_index;21762177if(!si || alternate_index_output ||2178(istate->cache_changed & ~EXTMASK)) {2179if(si)2180hashclr(si->base_sha1);2181returndo_write_locked_index(istate, lock, flags);2182}21832184if(getenv("GIT_TEST_SPLIT_INDEX")) {2185int v = si->base_sha1[0];2186if((v &15) <6)2187 istate->cache_changed |= SPLIT_INDEX_ORDERED;2188}2189if(istate->cache_changed & SPLIT_INDEX_ORDERED) {2190int ret =write_shared_index(istate, lock, flags);2191if(ret)2192return ret;2193}21942195returnwrite_split_index(istate, lock, flags);2196}21972198/*2199 * Read the index file that is potentially unmerged into given2200 * index_state, dropping any unmerged entries. Returns true if2201 * the index is unmerged. Callers who want to refuse to work2202 * from an unmerged state can call this and check its return value,2203 * instead of calling read_cache().2204 */2205intread_index_unmerged(struct index_state *istate)2206{2207int i;2208int unmerged =0;22092210read_index(istate);2211for(i =0; i < istate->cache_nr; i++) {2212struct cache_entry *ce = istate->cache[i];2213struct cache_entry *new_ce;2214int size, len;22152216if(!ce_stage(ce))2217continue;2218 unmerged =1;2219 len =ce_namelen(ce);2220 size =cache_entry_size(len);2221 new_ce =xcalloc(1, size);2222memcpy(new_ce->name, ce->name, len);2223 new_ce->ce_flags =create_ce_flags(0) | CE_CONFLICTED;2224 new_ce->ce_namelen = len;2225 new_ce->ce_mode = ce->ce_mode;2226if(add_index_entry(istate, new_ce,0))2227returnerror("%s: cannot drop to stage #0",2228 new_ce->name);2229}2230return unmerged;2231}22322233/*2234 * Returns 1 if the path is an "other" path with respect to2235 * the index; that is, the path is not mentioned in the index at all,2236 * either as a file, a directory with some files in the index,2237 * or as an unmerged entry.2238 *2239 * We helpfully remove a trailing "/" from directories so that2240 * the output of read_directory can be used as-is.2241 */2242intindex_name_is_other(const struct index_state *istate,const char*name,2243int namelen)2244{2245int pos;2246if(namelen && name[namelen -1] =='/')2247 namelen--;2248 pos =index_name_pos(istate, name, namelen);2249if(0<= pos)2250return0;/* exact match */2251 pos = -pos -1;2252if(pos < istate->cache_nr) {2253struct cache_entry *ce = istate->cache[pos];2254if(ce_namelen(ce) == namelen &&2255!memcmp(ce->name, name, namelen))2256return0;/* Yup, this one exists unmerged */2257}2258return1;2259}22602261void*read_blob_data_from_index(struct index_state *istate,const char*path,unsigned long*size)2262{2263int pos, len;2264unsigned long sz;2265enum object_type type;2266void*data;22672268 len =strlen(path);2269 pos =index_name_pos(istate, path, len);2270if(pos <0) {2271/*2272 * We might be in the middle of a merge, in which2273 * case we would read stage #2 (ours).2274 */2275int i;2276for(i = -pos -1;2277(pos <0&& i < istate->cache_nr &&2278!strcmp(istate->cache[i]->name, path));2279 i++)2280if(ce_stage(istate->cache[i]) ==2)2281 pos = i;2282}2283if(pos <0)2284return NULL;2285 data =read_sha1_file(istate->cache[pos]->sha1, &type, &sz);2286if(!data || type != OBJ_BLOB) {2287free(data);2288return NULL;2289}2290if(size)2291*size = sz;2292return data;2293}22942295voidstat_validity_clear(struct stat_validity *sv)2296{2297free(sv->sd);2298 sv->sd = NULL;2299}23002301intstat_validity_check(struct stat_validity *sv,const char*path)2302{2303struct stat st;23042305if(stat(path, &st) <0)2306return sv->sd == NULL;2307if(!sv->sd)2308return0;2309returnS_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);2310}23112312voidstat_validity_update(struct stat_validity *sv,int fd)2313{2314struct stat st;23152316if(fstat(fd, &st) <0|| !S_ISREG(st.st_mode))2317stat_validity_clear(sv);2318else{2319if(!sv->sd)2320 sv->sd =xcalloc(1,sizeof(struct stat_data));2321fill_stat_data(sv->sd, &st);2322}2323}