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_stat(const struct index_state *istate, 276const struct stat_data *sd) 277{ 278return(istate->timestamp.sec && 279#ifdef USE_NSEC 280/* nanosecond timestamped files can also be racy! */ 281(istate->timestamp.sec < sd->sd_mtime.sec || 282(istate->timestamp.sec == sd->sd_mtime.sec && 283 istate->timestamp.nsec <= sd->sd_mtime.nsec)) 284#else 285 istate->timestamp.sec <= sd->sd_mtime.sec 286#endif 287); 288} 289 290static intis_racy_timestamp(const struct index_state *istate, 291const struct cache_entry *ce) 292{ 293return(!S_ISGITLINK(ce->ce_mode) && 294is_racy_stat(istate, &ce->ce_stat_data)); 295} 296 297intie_match_stat(const struct index_state *istate, 298const struct cache_entry *ce,struct stat *st, 299unsigned int options) 300{ 301unsigned int changed; 302int ignore_valid = options & CE_MATCH_IGNORE_VALID; 303int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE; 304int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY; 305 306/* 307 * If it's marked as always valid in the index, it's 308 * valid whatever the checked-out copy says. 309 * 310 * skip-worktree has the same effect with higher precedence 311 */ 312if(!ignore_skip_worktree &&ce_skip_worktree(ce)) 313return0; 314if(!ignore_valid && (ce->ce_flags & CE_VALID)) 315return0; 316 317/* 318 * Intent-to-add entries have not been added, so the index entry 319 * by definition never matches what is in the work tree until it 320 * actually gets added. 321 */ 322if(ce->ce_flags & CE_INTENT_TO_ADD) 323return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED; 324 325 changed =ce_match_stat_basic(ce, st); 326 327/* 328 * Within 1 second of this sequence: 329 * echo xyzzy >file && git-update-index --add file 330 * running this command: 331 * echo frotz >file 332 * would give a falsely clean cache entry. The mtime and 333 * length match the cache, and other stat fields do not change. 334 * 335 * We could detect this at update-index time (the cache entry 336 * being registered/updated records the same time as "now") 337 * and delay the return from git-update-index, but that would 338 * effectively mean we can make at most one commit per second, 339 * which is not acceptable. Instead, we check cache entries 340 * whose mtime are the same as the index file timestamp more 341 * carefully than others. 342 */ 343if(!changed &&is_racy_timestamp(istate, ce)) { 344if(assume_racy_is_modified) 345 changed |= DATA_CHANGED; 346else 347 changed |=ce_modified_check_fs(ce, st); 348} 349 350return changed; 351} 352 353intie_modified(const struct index_state *istate, 354const struct cache_entry *ce, 355struct stat *st,unsigned int options) 356{ 357int changed, changed_fs; 358 359 changed =ie_match_stat(istate, ce, st, options); 360if(!changed) 361return0; 362/* 363 * If the mode or type has changed, there's no point in trying 364 * to refresh the entry - it's not going to match 365 */ 366if(changed & (MODE_CHANGED | TYPE_CHANGED)) 367return changed; 368 369/* 370 * Immediately after read-tree or update-index --cacheinfo, 371 * the length field is zero, as we have never even read the 372 * lstat(2) information once, and we cannot trust DATA_CHANGED 373 * returned by ie_match_stat() which in turn was returned by 374 * ce_match_stat_basic() to signal that the filesize of the 375 * blob changed. We have to actually go to the filesystem to 376 * see if the contents match, and if so, should answer "unchanged". 377 * 378 * The logic does not apply to gitlinks, as ce_match_stat_basic() 379 * already has checked the actual HEAD from the filesystem in the 380 * subproject. If ie_match_stat() already said it is different, 381 * then we know it is. 382 */ 383if((changed & DATA_CHANGED) && 384(S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size !=0)) 385return changed; 386 387 changed_fs =ce_modified_check_fs(ce, st); 388if(changed_fs) 389return changed | changed_fs; 390return0; 391} 392 393intbase_name_compare(const char*name1,int len1,int mode1, 394const char*name2,int len2,int mode2) 395{ 396unsigned char c1, c2; 397int len = len1 < len2 ? len1 : len2; 398int cmp; 399 400 cmp =memcmp(name1, name2, len); 401if(cmp) 402return cmp; 403 c1 = name1[len]; 404 c2 = name2[len]; 405if(!c1 &&S_ISDIR(mode1)) 406 c1 ='/'; 407if(!c2 &&S_ISDIR(mode2)) 408 c2 ='/'; 409return(c1 < c2) ? -1: (c1 > c2) ?1:0; 410} 411 412/* 413 * df_name_compare() is identical to base_name_compare(), except it 414 * compares conflicting directory/file entries as equal. Note that 415 * while a directory name compares as equal to a regular file, they 416 * then individually compare _differently_ to a filename that has 417 * a dot after the basename (because '\0' < '.' < '/'). 418 * 419 * This is used by routines that want to traverse the git namespace 420 * but then handle conflicting entries together when possible. 421 */ 422intdf_name_compare(const char*name1,int len1,int mode1, 423const char*name2,int len2,int mode2) 424{ 425int len = len1 < len2 ? len1 : len2, cmp; 426unsigned char c1, c2; 427 428 cmp =memcmp(name1, name2, len); 429if(cmp) 430return cmp; 431/* Directories and files compare equal (same length, same name) */ 432if(len1 == len2) 433return0; 434 c1 = name1[len]; 435if(!c1 &&S_ISDIR(mode1)) 436 c1 ='/'; 437 c2 = name2[len]; 438if(!c2 &&S_ISDIR(mode2)) 439 c2 ='/'; 440if(c1 =='/'&& !c2) 441return0; 442if(c2 =='/'&& !c1) 443return0; 444return c1 - c2; 445} 446 447intname_compare(const char*name1,size_t len1,const char*name2,size_t len2) 448{ 449size_t min_len = (len1 < len2) ? len1 : len2; 450int cmp =memcmp(name1, name2, min_len); 451if(cmp) 452return cmp; 453if(len1 < len2) 454return-1; 455if(len1 > len2) 456return1; 457return0; 458} 459 460intcache_name_stage_compare(const char*name1,int len1,int stage1,const char*name2,int len2,int stage2) 461{ 462int cmp; 463 464 cmp =name_compare(name1, len1, name2, len2); 465if(cmp) 466return cmp; 467 468if(stage1 < stage2) 469return-1; 470if(stage1 > stage2) 471return1; 472return0; 473} 474 475static intindex_name_stage_pos(const struct index_state *istate,const char*name,int namelen,int stage) 476{ 477int first, last; 478 479 first =0; 480 last = istate->cache_nr; 481while(last > first) { 482int next = (last + first) >>1; 483struct cache_entry *ce = istate->cache[next]; 484int cmp =cache_name_stage_compare(name, namelen, stage, ce->name,ce_namelen(ce),ce_stage(ce)); 485if(!cmp) 486return next; 487if(cmp <0) { 488 last = next; 489continue; 490} 491 first = next+1; 492} 493return-first-1; 494} 495 496intindex_name_pos(const struct index_state *istate,const char*name,int namelen) 497{ 498returnindex_name_stage_pos(istate, name, namelen,0); 499} 500 501/* Remove entry, return true if there are more entries to go.. */ 502intremove_index_entry_at(struct index_state *istate,int pos) 503{ 504struct cache_entry *ce = istate->cache[pos]; 505 506record_resolve_undo(istate, ce); 507remove_name_hash(istate, ce); 508save_or_free_index_entry(istate, ce); 509 istate->cache_changed |= CE_ENTRY_REMOVED; 510 istate->cache_nr--; 511if(pos >= istate->cache_nr) 512return0; 513memmove(istate->cache + pos, 514 istate->cache + pos +1, 515(istate->cache_nr - pos) *sizeof(struct cache_entry *)); 516return1; 517} 518 519/* 520 * Remove all cache entries marked for removal, that is where 521 * CE_REMOVE is set in ce_flags. This is much more effective than 522 * calling remove_index_entry_at() for each entry to be removed. 523 */ 524voidremove_marked_cache_entries(struct index_state *istate) 525{ 526struct cache_entry **ce_array = istate->cache; 527unsigned int i, j; 528 529for(i = j =0; i < istate->cache_nr; i++) { 530if(ce_array[i]->ce_flags & CE_REMOVE) { 531remove_name_hash(istate, ce_array[i]); 532save_or_free_index_entry(istate, ce_array[i]); 533} 534else 535 ce_array[j++] = ce_array[i]; 536} 537if(j == istate->cache_nr) 538return; 539 istate->cache_changed |= CE_ENTRY_REMOVED; 540 istate->cache_nr = j; 541} 542 543intremove_file_from_index(struct index_state *istate,const char*path) 544{ 545int pos =index_name_pos(istate, path,strlen(path)); 546if(pos <0) 547 pos = -pos-1; 548cache_tree_invalidate_path(istate, path); 549untracked_cache_remove_from_index(istate, path); 550while(pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path)) 551remove_index_entry_at(istate, pos); 552return0; 553} 554 555static intcompare_name(struct cache_entry *ce,const char*path,int namelen) 556{ 557return namelen !=ce_namelen(ce) ||memcmp(path, ce->name, namelen); 558} 559 560static intindex_name_pos_also_unmerged(struct index_state *istate, 561const char*path,int namelen) 562{ 563int pos =index_name_pos(istate, path, namelen); 564struct cache_entry *ce; 565 566if(pos >=0) 567return pos; 568 569/* maybe unmerged? */ 570 pos = -1- pos; 571if(pos >= istate->cache_nr || 572compare_name((ce = istate->cache[pos]), path, namelen)) 573return-1; 574 575/* order of preference: stage 2, 1, 3 */ 576if(ce_stage(ce) ==1&& pos +1< istate->cache_nr && 577ce_stage((ce = istate->cache[pos +1])) ==2&& 578!compare_name(ce, path, namelen)) 579 pos++; 580return pos; 581} 582 583static intdifferent_name(struct cache_entry *ce,struct cache_entry *alias) 584{ 585int len =ce_namelen(ce); 586returnce_namelen(alias) != len ||memcmp(ce->name, alias->name, len); 587} 588 589/* 590 * If we add a filename that aliases in the cache, we will use the 591 * name that we already have - but we don't want to update the same 592 * alias twice, because that implies that there were actually two 593 * different files with aliasing names! 594 * 595 * So we use the CE_ADDED flag to verify that the alias was an old 596 * one before we accept it as 597 */ 598static struct cache_entry *create_alias_ce(struct index_state *istate, 599struct cache_entry *ce, 600struct cache_entry *alias) 601{ 602int len; 603struct cache_entry *new; 604 605if(alias->ce_flags & CE_ADDED) 606die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name); 607 608/* Ok, create the new entry using the name of the existing alias */ 609 len =ce_namelen(alias); 610new=xcalloc(1,cache_entry_size(len)); 611memcpy(new->name, alias->name, len); 612copy_cache_entry(new, ce); 613save_or_free_index_entry(istate, ce); 614return new; 615} 616 617voidset_object_name_for_intent_to_add_entry(struct cache_entry *ce) 618{ 619unsigned char sha1[20]; 620if(write_sha1_file("",0, blob_type, sha1)) 621die("cannot create an empty blob in the object database"); 622hashcpy(ce->sha1, sha1); 623} 624 625intadd_to_index(struct index_state *istate,const char*path,struct stat *st,int flags) 626{ 627int size, namelen, was_same; 628 mode_t st_mode = st->st_mode; 629struct cache_entry *ce, *alias; 630unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY; 631int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND); 632int pretend = flags & ADD_CACHE_PRETEND; 633int intent_only = flags & ADD_CACHE_INTENT; 634int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE| 635(intent_only ? ADD_CACHE_NEW_ONLY :0)); 636 637if(!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode)) 638returnerror("%s: can only add regular files, symbolic links or git-directories", path); 639 640 namelen =strlen(path); 641if(S_ISDIR(st_mode)) { 642while(namelen && path[namelen-1] =='/') 643 namelen--; 644} 645 size =cache_entry_size(namelen); 646 ce =xcalloc(1, size); 647memcpy(ce->name, path, namelen); 648 ce->ce_namelen = namelen; 649if(!intent_only) 650fill_stat_cache_info(ce, st); 651else 652 ce->ce_flags |= CE_INTENT_TO_ADD; 653 654if(trust_executable_bit && has_symlinks) 655 ce->ce_mode =create_ce_mode(st_mode); 656else{ 657/* If there is an existing entry, pick the mode bits and type 658 * from it, otherwise assume unexecutable regular file. 659 */ 660struct cache_entry *ent; 661int pos =index_name_pos_also_unmerged(istate, path, namelen); 662 663 ent = (0<= pos) ? istate->cache[pos] : NULL; 664 ce->ce_mode =ce_mode_from_stat(ent, st_mode); 665} 666 667/* When core.ignorecase=true, determine if a directory of the same name but differing 668 * case already exists within the Git repository. If it does, ensure the directory 669 * case of the file being added to the repository matches (is folded into) the existing 670 * entry's directory case. 671 */ 672if(ignore_case) { 673const char*startPtr = ce->name; 674const char*ptr = startPtr; 675while(*ptr) { 676while(*ptr && *ptr !='/') 677++ptr; 678if(*ptr =='/') { 679struct cache_entry *foundce; 680++ptr; 681 foundce =index_dir_exists(istate, ce->name, ptr - ce->name -1); 682if(foundce) { 683memcpy((void*)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr); 684 startPtr = ptr; 685} 686} 687} 688} 689 690 alias =index_file_exists(istate, ce->name,ce_namelen(ce), ignore_case); 691if(alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) { 692/* Nothing changed, really */ 693free(ce); 694if(!S_ISGITLINK(alias->ce_mode)) 695ce_mark_uptodate(alias); 696 alias->ce_flags |= CE_ADDED; 697return0; 698} 699if(!intent_only) { 700if(index_path(ce->sha1, path, st, HASH_WRITE_OBJECT)) 701returnerror("unable to index file%s", path); 702}else 703set_object_name_for_intent_to_add_entry(ce); 704 705if(ignore_case && alias &&different_name(ce, alias)) 706 ce =create_alias_ce(istate, ce, alias); 707 ce->ce_flags |= CE_ADDED; 708 709/* It was suspected to be racily clean, but it turns out to be Ok */ 710 was_same = (alias && 711!ce_stage(alias) && 712!hashcmp(alias->sha1, ce->sha1) && 713 ce->ce_mode == alias->ce_mode); 714 715if(pretend) 716; 717else if(add_index_entry(istate, ce, add_option)) 718returnerror("unable to add%sto index",path); 719if(verbose && !was_same) 720printf("add '%s'\n", path); 721return0; 722} 723 724intadd_file_to_index(struct index_state *istate,const char*path,int flags) 725{ 726struct stat st; 727if(lstat(path, &st)) 728die_errno("unable to stat '%s'", path); 729returnadd_to_index(istate, path, &st, flags); 730} 731 732struct cache_entry *make_cache_entry(unsigned int mode, 733const unsigned char*sha1,const char*path,int stage, 734unsigned int refresh_options) 735{ 736int size, len; 737struct cache_entry *ce, *ret; 738 739if(!verify_path(path)) { 740error("Invalid path '%s'", path); 741return NULL; 742} 743 744 len =strlen(path); 745 size =cache_entry_size(len); 746 ce =xcalloc(1, size); 747 748hashcpy(ce->sha1, sha1); 749memcpy(ce->name, path, len); 750 ce->ce_flags =create_ce_flags(stage); 751 ce->ce_namelen = len; 752 ce->ce_mode =create_ce_mode(mode); 753 754 ret =refresh_cache_entry(ce, refresh_options); 755if(!ret) { 756free(ce); 757return NULL; 758}else{ 759return ret; 760} 761} 762 763intce_same_name(const struct cache_entry *a,const struct cache_entry *b) 764{ 765int len =ce_namelen(a); 766returnce_namelen(b) == len && !memcmp(a->name, b->name, len); 767} 768 769/* 770 * We fundamentally don't like some paths: we don't want 771 * dot or dot-dot anywhere, and for obvious reasons don't 772 * want to recurse into ".git" either. 773 * 774 * Also, we don't want double slashes or slashes at the 775 * end that can make pathnames ambiguous. 776 */ 777static intverify_dotfile(const char*rest) 778{ 779/* 780 * The first character was '.', but that 781 * has already been discarded, we now test 782 * the rest. 783 */ 784 785/* "." is not allowed */ 786if(*rest =='\0'||is_dir_sep(*rest)) 787return0; 788 789switch(*rest) { 790/* 791 * ".git" followed by NUL or slash is bad. This 792 * shares the path end test with the ".." case. 793 */ 794case'g': 795case'G': 796if(rest[1] !='i'&& rest[1] !='I') 797break; 798if(rest[2] !='t'&& rest[2] !='T') 799break; 800 rest +=2; 801/* fallthrough */ 802case'.': 803if(rest[1] =='\0'||is_dir_sep(rest[1])) 804return0; 805} 806return1; 807} 808 809intverify_path(const char*path) 810{ 811char c; 812 813if(has_dos_drive_prefix(path)) 814return0; 815 816goto inside; 817for(;;) { 818if(!c) 819return1; 820if(is_dir_sep(c)) { 821inside: 822if(protect_hfs &&is_hfs_dotgit(path)) 823return0; 824if(protect_ntfs &&is_ntfs_dotgit(path)) 825return0; 826 c = *path++; 827if((c =='.'&& !verify_dotfile(path)) || 828is_dir_sep(c) || c =='\0') 829return0; 830} 831 c = *path++; 832} 833} 834 835/* 836 * Do we have another file that has the beginning components being a 837 * proper superset of the name we're trying to add? 838 */ 839static inthas_file_name(struct index_state *istate, 840const struct cache_entry *ce,int pos,int ok_to_replace) 841{ 842int retval =0; 843int len =ce_namelen(ce); 844int stage =ce_stage(ce); 845const char*name = ce->name; 846 847while(pos < istate->cache_nr) { 848struct cache_entry *p = istate->cache[pos++]; 849 850if(len >=ce_namelen(p)) 851break; 852if(memcmp(name, p->name, len)) 853break; 854if(ce_stage(p) != stage) 855continue; 856if(p->name[len] !='/') 857continue; 858if(p->ce_flags & CE_REMOVE) 859continue; 860 retval = -1; 861if(!ok_to_replace) 862break; 863remove_index_entry_at(istate, --pos); 864} 865return retval; 866} 867 868/* 869 * Do we have another file with a pathname that is a proper 870 * subset of the name we're trying to add? 871 */ 872static inthas_dir_name(struct index_state *istate, 873const struct cache_entry *ce,int pos,int ok_to_replace) 874{ 875int retval =0; 876int stage =ce_stage(ce); 877const char*name = ce->name; 878const char*slash = name +ce_namelen(ce); 879 880for(;;) { 881int len; 882 883for(;;) { 884if(*--slash =='/') 885break; 886if(slash <= ce->name) 887return retval; 888} 889 len = slash - name; 890 891 pos =index_name_stage_pos(istate, name, len, stage); 892if(pos >=0) { 893/* 894 * Found one, but not so fast. This could 895 * be a marker that says "I was here, but 896 * I am being removed". Such an entry is 897 * not a part of the resulting tree, and 898 * it is Ok to have a directory at the same 899 * path. 900 */ 901if(!(istate->cache[pos]->ce_flags & CE_REMOVE)) { 902 retval = -1; 903if(!ok_to_replace) 904break; 905remove_index_entry_at(istate, pos); 906continue; 907} 908} 909else 910 pos = -pos-1; 911 912/* 913 * Trivial optimization: if we find an entry that 914 * already matches the sub-directory, then we know 915 * we're ok, and we can exit. 916 */ 917while(pos < istate->cache_nr) { 918struct cache_entry *p = istate->cache[pos]; 919if((ce_namelen(p) <= len) || 920(p->name[len] !='/') || 921memcmp(p->name, name, len)) 922break;/* not our subdirectory */ 923if(ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) 924/* 925 * p is at the same stage as our entry, and 926 * is a subdirectory of what we are looking 927 * at, so we cannot have conflicts at our 928 * level or anything shorter. 929 */ 930return retval; 931 pos++; 932} 933} 934return retval; 935} 936 937/* We may be in a situation where we already have path/file and path 938 * is being added, or we already have path and path/file is being 939 * added. Either one would result in a nonsense tree that has path 940 * twice when git-write-tree tries to write it out. Prevent it. 941 * 942 * If ok-to-replace is specified, we remove the conflicting entries 943 * from the cache so the caller should recompute the insert position. 944 * When this happens, we return non-zero. 945 */ 946static intcheck_file_directory_conflict(struct index_state *istate, 947const struct cache_entry *ce, 948int pos,int ok_to_replace) 949{ 950int retval; 951 952/* 953 * When ce is an "I am going away" entry, we allow it to be added 954 */ 955if(ce->ce_flags & CE_REMOVE) 956return0; 957 958/* 959 * We check if the path is a sub-path of a subsequent pathname 960 * first, since removing those will not change the position 961 * in the array. 962 */ 963 retval =has_file_name(istate, ce, pos, ok_to_replace); 964 965/* 966 * Then check if the path might have a clashing sub-directory 967 * before it. 968 */ 969return retval +has_dir_name(istate, ce, pos, ok_to_replace); 970} 971 972static intadd_index_entry_with_check(struct index_state *istate,struct cache_entry *ce,int option) 973{ 974int pos; 975int ok_to_add = option & ADD_CACHE_OK_TO_ADD; 976int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; 977int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; 978int new_only = option & ADD_CACHE_NEW_ONLY; 979 980if(!(option & ADD_CACHE_KEEP_CACHE_TREE)) 981cache_tree_invalidate_path(istate, ce->name); 982 pos =index_name_stage_pos(istate, ce->name,ce_namelen(ce),ce_stage(ce)); 983 984/* existing match? Just replace it. */ 985if(pos >=0) { 986if(!new_only) 987replace_index_entry(istate, pos, ce); 988return0; 989} 990 pos = -pos-1; 991 992untracked_cache_add_to_index(istate, ce->name); 993 994/* 995 * Inserting a merged entry ("stage 0") into the index 996 * will always replace all non-merged entries.. 997 */ 998if(pos < istate->cache_nr &&ce_stage(ce) ==0) { 999while(ce_same_name(istate->cache[pos], ce)) {1000 ok_to_add =1;1001if(!remove_index_entry_at(istate, pos))1002break;1003}1004}10051006if(!ok_to_add)1007return-1;1008if(!verify_path(ce->name))1009returnerror("Invalid path '%s'", ce->name);10101011if(!skip_df_check &&1012check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {1013if(!ok_to_replace)1014returnerror("'%s' appears as both a file and as a directory",1015 ce->name);1016 pos =index_name_stage_pos(istate, ce->name,ce_namelen(ce),ce_stage(ce));1017 pos = -pos-1;1018}1019return pos +1;1020}10211022intadd_index_entry(struct index_state *istate,struct cache_entry *ce,int option)1023{1024int pos;10251026if(option & ADD_CACHE_JUST_APPEND)1027 pos = istate->cache_nr;1028else{1029int ret;1030 ret =add_index_entry_with_check(istate, ce, option);1031if(ret <=0)1032return ret;1033 pos = ret -1;1034}10351036/* Make sure the array is big enough .. */1037ALLOC_GROW(istate->cache, istate->cache_nr +1, istate->cache_alloc);10381039/* Add it in.. */1040 istate->cache_nr++;1041if(istate->cache_nr > pos +1)1042memmove(istate->cache + pos +1,1043 istate->cache + pos,1044(istate->cache_nr - pos -1) *sizeof(ce));1045set_index_entry(istate, pos, ce);1046 istate->cache_changed |= CE_ENTRY_ADDED;1047return0;1048}10491050/*1051 * "refresh" does not calculate a new sha1 file or bring the1052 * cache up-to-date for mode/content changes. But what it1053 * _does_ do is to "re-match" the stat information of a file1054 * with the cache, so that you can refresh the cache for a1055 * file that hasn't been changed but where the stat entry is1056 * out of date.1057 *1058 * For example, you'd want to do this after doing a "git-read-tree",1059 * to link up the stat cache details with the proper files.1060 */1061static struct cache_entry *refresh_cache_ent(struct index_state *istate,1062struct cache_entry *ce,1063unsigned int options,int*err,1064int*changed_ret)1065{1066struct stat st;1067struct cache_entry *updated;1068int changed, size;1069int refresh = options & CE_MATCH_REFRESH;1070int ignore_valid = options & CE_MATCH_IGNORE_VALID;1071int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;1072int ignore_missing = options & CE_MATCH_IGNORE_MISSING;10731074if(!refresh ||ce_uptodate(ce))1075return ce;10761077/*1078 * CE_VALID or CE_SKIP_WORKTREE means the user promised us1079 * that the change to the work tree does not matter and told1080 * us not to worry.1081 */1082if(!ignore_skip_worktree &&ce_skip_worktree(ce)) {1083ce_mark_uptodate(ce);1084return ce;1085}1086if(!ignore_valid && (ce->ce_flags & CE_VALID)) {1087ce_mark_uptodate(ce);1088return ce;1089}10901091if(has_symlink_leading_path(ce->name,ce_namelen(ce))) {1092if(ignore_missing)1093return ce;1094if(err)1095*err = ENOENT;1096return NULL;1097}10981099if(lstat(ce->name, &st) <0) {1100if(ignore_missing && errno == ENOENT)1101return ce;1102if(err)1103*err = errno;1104return NULL;1105}11061107 changed =ie_match_stat(istate, ce, &st, options);1108if(changed_ret)1109*changed_ret = changed;1110if(!changed) {1111/*1112 * The path is unchanged. If we were told to ignore1113 * valid bit, then we did the actual stat check and1114 * found that the entry is unmodified. If the entry1115 * is not marked VALID, this is the place to mark it1116 * valid again, under "assume unchanged" mode.1117 */1118if(ignore_valid && assume_unchanged &&1119!(ce->ce_flags & CE_VALID))1120;/* mark this one VALID again */1121else{1122/*1123 * We do not mark the index itself "modified"1124 * because CE_UPTODATE flag is in-core only;1125 * we are not going to write this change out.1126 */1127if(!S_ISGITLINK(ce->ce_mode))1128ce_mark_uptodate(ce);1129return ce;1130}1131}11321133if(ie_modified(istate, ce, &st, options)) {1134if(err)1135*err = EINVAL;1136return NULL;1137}11381139 size =ce_size(ce);1140 updated =xmalloc(size);1141memcpy(updated, ce, size);1142fill_stat_cache_info(updated, &st);1143/*1144 * If ignore_valid is not set, we should leave CE_VALID bit1145 * alone. Otherwise, paths marked with --no-assume-unchanged1146 * (i.e. things to be edited) will reacquire CE_VALID bit1147 * automatically, which is not really what we want.1148 */1149if(!ignore_valid && assume_unchanged &&1150!(ce->ce_flags & CE_VALID))1151 updated->ce_flags &= ~CE_VALID;11521153/* istate->cache_changed is updated in the caller */1154return updated;1155}11561157static voidshow_file(const char* fmt,const char* name,int in_porcelain,1158int* first,const char*header_msg)1159{1160if(in_porcelain && *first && header_msg) {1161printf("%s\n", header_msg);1162*first =0;1163}1164printf(fmt, name);1165}11661167intrefresh_index(struct index_state *istate,unsigned int flags,1168const struct pathspec *pathspec,1169char*seen,const char*header_msg)1170{1171int i;1172int has_errors =0;1173int really = (flags & REFRESH_REALLY) !=0;1174int allow_unmerged = (flags & REFRESH_UNMERGED) !=0;1175int quiet = (flags & REFRESH_QUIET) !=0;1176int not_new = (flags & REFRESH_IGNORE_MISSING) !=0;1177int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) !=0;1178int first =1;1179int in_porcelain = (flags & REFRESH_IN_PORCELAIN);1180unsigned int options = (CE_MATCH_REFRESH |1181(really ? CE_MATCH_IGNORE_VALID :0) |1182(not_new ? CE_MATCH_IGNORE_MISSING :0));1183const char*modified_fmt;1184const char*deleted_fmt;1185const char*typechange_fmt;1186const char*added_fmt;1187const char*unmerged_fmt;11881189 modified_fmt = (in_porcelain ?"M\t%s\n":"%s: needs update\n");1190 deleted_fmt = (in_porcelain ?"D\t%s\n":"%s: needs update\n");1191 typechange_fmt = (in_porcelain ?"T\t%s\n":"%sneeds update\n");1192 added_fmt = (in_porcelain ?"A\t%s\n":"%sneeds update\n");1193 unmerged_fmt = (in_porcelain ?"U\t%s\n":"%s: needs merge\n");1194for(i =0; i < istate->cache_nr; i++) {1195struct cache_entry *ce, *new;1196int cache_errno =0;1197int changed =0;1198int filtered =0;11991200 ce = istate->cache[i];1201if(ignore_submodules &&S_ISGITLINK(ce->ce_mode))1202continue;12031204if(pathspec && !ce_path_match(ce, pathspec, seen))1205 filtered =1;12061207if(ce_stage(ce)) {1208while((i < istate->cache_nr) &&1209!strcmp(istate->cache[i]->name, ce->name))1210 i++;1211 i--;1212if(allow_unmerged)1213continue;1214if(!filtered)1215show_file(unmerged_fmt, ce->name, in_porcelain,1216&first, header_msg);1217 has_errors =1;1218continue;1219}12201221if(filtered)1222continue;12231224new=refresh_cache_ent(istate, ce, options, &cache_errno, &changed);1225if(new== ce)1226continue;1227if(!new) {1228const char*fmt;12291230if(really && cache_errno == EINVAL) {1231/* If we are doing --really-refresh that1232 * means the index is not valid anymore.1233 */1234 ce->ce_flags &= ~CE_VALID;1235 ce->ce_flags |= CE_UPDATE_IN_BASE;1236 istate->cache_changed |= CE_ENTRY_CHANGED;1237}1238if(quiet)1239continue;12401241if(cache_errno == ENOENT)1242 fmt = deleted_fmt;1243else if(ce->ce_flags & CE_INTENT_TO_ADD)1244 fmt = added_fmt;/* must be before other checks */1245else if(changed & TYPE_CHANGED)1246 fmt = typechange_fmt;1247else1248 fmt = modified_fmt;1249show_file(fmt,1250 ce->name, in_porcelain, &first, header_msg);1251 has_errors =1;1252continue;1253}12541255replace_index_entry(istate, i,new);1256}1257return has_errors;1258}12591260static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,1261unsigned int options)1262{1263returnrefresh_cache_ent(&the_index, ce, options, NULL, NULL);1264}126512661267/*****************************************************************1268 * Index File I/O1269 *****************************************************************/12701271#define INDEX_FORMAT_DEFAULT 312721273static unsigned intget_index_format_default(void)1274{1275char*envversion =getenv("GIT_INDEX_VERSION");1276char*endp;1277int value;1278unsigned int version = INDEX_FORMAT_DEFAULT;12791280if(!envversion) {1281if(!git_config_get_int("index.version", &value))1282 version = value;1283if(version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {1284warning(_("index.version set, but the value is invalid.\n"1285"Using version%i"), INDEX_FORMAT_DEFAULT);1286return INDEX_FORMAT_DEFAULT;1287}1288return version;1289}12901291 version =strtoul(envversion, &endp,10);1292if(*endp ||1293 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {1294warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"1295"Using version%i"), INDEX_FORMAT_DEFAULT);1296 version = INDEX_FORMAT_DEFAULT;1297}1298return version;1299}13001301/*1302 * dev/ino/uid/gid/size are also just tracked to the low 32 bits1303 * Again - this is just a (very strong in practice) heuristic that1304 * the inode hasn't changed.1305 *1306 * We save the fields in big-endian order to allow using the1307 * index file over NFS transparently.1308 */1309struct ondisk_cache_entry {1310struct cache_time ctime;1311struct cache_time mtime;1312uint32_t dev;1313uint32_t ino;1314uint32_t mode;1315uint32_t uid;1316uint32_t gid;1317uint32_t size;1318unsigned char sha1[20];1319uint16_t flags;1320char name[FLEX_ARRAY];/* more */1321};13221323/*1324 * This struct is used when CE_EXTENDED bit is 11325 * The struct must match ondisk_cache_entry exactly from1326 * ctime till flags1327 */1328struct ondisk_cache_entry_extended {1329struct cache_time ctime;1330struct cache_time mtime;1331uint32_t dev;1332uint32_t ino;1333uint32_t mode;1334uint32_t uid;1335uint32_t gid;1336uint32_t size;1337unsigned char sha1[20];1338uint16_t flags;1339uint16_t flags2;1340char name[FLEX_ARRAY];/* more */1341};13421343/* These are only used for v3 or lower */1344#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)1345#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)1346#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)1347#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \1348 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \1349 ondisk_cache_entry_size(ce_namelen(ce)))13501351static intverify_hdr(struct cache_header *hdr,unsigned long size)1352{1353 git_SHA_CTX c;1354unsigned char sha1[20];1355int hdr_version;13561357if(hdr->hdr_signature !=htonl(CACHE_SIGNATURE))1358returnerror("bad signature");1359 hdr_version =ntohl(hdr->hdr_version);1360if(hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)1361returnerror("bad index version%d", hdr_version);1362git_SHA1_Init(&c);1363git_SHA1_Update(&c, hdr, size -20);1364git_SHA1_Final(sha1, &c);1365if(hashcmp(sha1, (unsigned char*)hdr + size -20))1366returnerror("bad index file sha1 signature");1367return0;1368}13691370static intread_index_extension(struct index_state *istate,1371const char*ext,void*data,unsigned long sz)1372{1373switch(CACHE_EXT(ext)) {1374case CACHE_EXT_TREE:1375 istate->cache_tree =cache_tree_read(data, sz);1376break;1377case CACHE_EXT_RESOLVE_UNDO:1378 istate->resolve_undo =resolve_undo_read(data, sz);1379break;1380case CACHE_EXT_LINK:1381if(read_link_extension(istate, data, sz))1382return-1;1383break;1384case CACHE_EXT_UNTRACKED:1385 istate->untracked =read_untracked_extension(data, sz);1386break;1387default:1388if(*ext <'A'||'Z'< *ext)1389returnerror("index uses %.4s extension, which we do not understand",1390 ext);1391fprintf(stderr,"ignoring %.4s extension\n", ext);1392break;1393}1394return0;1395}13961397inthold_locked_index(struct lock_file *lk,int die_on_error)1398{1399returnhold_lock_file_for_update(lk,get_index_file(),1400 die_on_error1401? LOCK_DIE_ON_ERROR1402:0);1403}14041405intread_index(struct index_state *istate)1406{1407returnread_index_from(istate,get_index_file());1408}14091410static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,1411unsigned int flags,1412const char*name,1413size_t len)1414{1415struct cache_entry *ce =xmalloc(cache_entry_size(len));14161417 ce->ce_stat_data.sd_ctime.sec =get_be32(&ondisk->ctime.sec);1418 ce->ce_stat_data.sd_mtime.sec =get_be32(&ondisk->mtime.sec);1419 ce->ce_stat_data.sd_ctime.nsec =get_be32(&ondisk->ctime.nsec);1420 ce->ce_stat_data.sd_mtime.nsec =get_be32(&ondisk->mtime.nsec);1421 ce->ce_stat_data.sd_dev =get_be32(&ondisk->dev);1422 ce->ce_stat_data.sd_ino =get_be32(&ondisk->ino);1423 ce->ce_mode =get_be32(&ondisk->mode);1424 ce->ce_stat_data.sd_uid =get_be32(&ondisk->uid);1425 ce->ce_stat_data.sd_gid =get_be32(&ondisk->gid);1426 ce->ce_stat_data.sd_size =get_be32(&ondisk->size);1427 ce->ce_flags = flags & ~CE_NAMEMASK;1428 ce->ce_namelen = len;1429 ce->index =0;1430hashcpy(ce->sha1, ondisk->sha1);1431memcpy(ce->name, name, len);1432 ce->name[len] ='\0';1433return ce;1434}14351436/*1437 * Adjacent cache entries tend to share the leading paths, so it makes1438 * sense to only store the differences in later entries. In the v41439 * on-disk format of the index, each on-disk cache entry stores the1440 * number of bytes to be stripped from the end of the previous name,1441 * and the bytes to append to the result, to come up with its name.1442 */1443static unsigned longexpand_name_field(struct strbuf *name,const char*cp_)1444{1445const unsigned char*ep, *cp = (const unsigned char*)cp_;1446size_t len =decode_varint(&cp);14471448if(name->len < len)1449die("malformed name field in the index");1450strbuf_remove(name, name->len - len, len);1451for(ep = cp; *ep; ep++)1452;/* find the end */1453strbuf_add(name, cp, ep - cp);1454return(const char*)ep +1- cp_;1455}14561457static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,1458unsigned long*ent_size,1459struct strbuf *previous_name)1460{1461struct cache_entry *ce;1462size_t len;1463const char*name;1464unsigned int flags;14651466/* On-disk flags are just 16 bits */1467 flags =get_be16(&ondisk->flags);1468 len = flags & CE_NAMEMASK;14691470if(flags & CE_EXTENDED) {1471struct ondisk_cache_entry_extended *ondisk2;1472int extended_flags;1473 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1474 extended_flags =get_be16(&ondisk2->flags2) <<16;1475/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */1476if(extended_flags & ~CE_EXTENDED_FLAGS)1477die("Unknown index entry format%08x", extended_flags);1478 flags |= extended_flags;1479 name = ondisk2->name;1480}1481else1482 name = ondisk->name;14831484if(!previous_name) {1485/* v3 and earlier */1486if(len == CE_NAMEMASK)1487 len =strlen(name);1488 ce =cache_entry_from_ondisk(ondisk, flags, name, len);14891490*ent_size =ondisk_ce_size(ce);1491}else{1492unsigned long consumed;1493 consumed =expand_name_field(previous_name, name);1494 ce =cache_entry_from_ondisk(ondisk, flags,1495 previous_name->buf,1496 previous_name->len);14971498*ent_size = (name - ((char*)ondisk)) + consumed;1499}1500return ce;1501}15021503static voidcheck_ce_order(struct cache_entry *ce,struct cache_entry *next_ce)1504{1505int name_compare =strcmp(ce->name, next_ce->name);1506if(0< name_compare)1507die("unordered stage entries in index");1508if(!name_compare) {1509if(!ce_stage(ce))1510die("multiple stage entries for merged file '%s'",1511 ce->name);1512if(ce_stage(ce) >ce_stage(next_ce))1513die("unordered stage entries for '%s'",1514 ce->name);1515}1516}15171518/* remember to discard_cache() before reading a different cache! */1519intdo_read_index(struct index_state *istate,const char*path,int must_exist)1520{1521int fd, i;1522struct stat st;1523unsigned long src_offset;1524struct cache_header *hdr;1525void*mmap;1526size_t mmap_size;1527struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;15281529if(istate->initialized)1530return istate->cache_nr;15311532 istate->timestamp.sec =0;1533 istate->timestamp.nsec =0;1534 fd =open(path, O_RDONLY);1535if(fd <0) {1536if(!must_exist && errno == ENOENT)1537return0;1538die_errno("%s: index file open failed", path);1539}15401541if(fstat(fd, &st))1542die_errno("cannot stat the open index");15431544 mmap_size =xsize_t(st.st_size);1545if(mmap_size <sizeof(struct cache_header) +20)1546die("index file smaller than expected");15471548 mmap =xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,0);1549if(mmap == MAP_FAILED)1550die_errno("unable to map index file");1551close(fd);15521553 hdr = mmap;1554if(verify_hdr(hdr, mmap_size) <0)1555goto unmap;15561557hashcpy(istate->sha1, (const unsigned char*)hdr + mmap_size -20);1558 istate->version =ntohl(hdr->hdr_version);1559 istate->cache_nr =ntohl(hdr->hdr_entries);1560 istate->cache_alloc =alloc_nr(istate->cache_nr);1561 istate->cache =xcalloc(istate->cache_alloc,sizeof(*istate->cache));1562 istate->initialized =1;15631564if(istate->version ==4)1565 previous_name = &previous_name_buf;1566else1567 previous_name = NULL;15681569 src_offset =sizeof(*hdr);1570for(i =0; i < istate->cache_nr; i++) {1571struct ondisk_cache_entry *disk_ce;1572struct cache_entry *ce;1573unsigned long consumed;15741575 disk_ce = (struct ondisk_cache_entry *)((char*)mmap + src_offset);1576 ce =create_from_disk(disk_ce, &consumed, previous_name);1577set_index_entry(istate, i, ce);15781579if(i >0)1580check_ce_order(istate->cache[i -1], ce);15811582 src_offset += consumed;1583}1584strbuf_release(&previous_name_buf);1585 istate->timestamp.sec = st.st_mtime;1586 istate->timestamp.nsec =ST_MTIME_NSEC(st);15871588while(src_offset <= mmap_size -20-8) {1589/* After an array of active_nr index entries,1590 * there can be arbitrary number of extended1591 * sections, each of which is prefixed with1592 * extension name (4-byte) and section length1593 * in 4-byte network byte order.1594 */1595uint32_t extsize;1596memcpy(&extsize, (char*)mmap + src_offset +4,4);1597 extsize =ntohl(extsize);1598if(read_index_extension(istate,1599(const char*) mmap + src_offset,1600(char*) mmap + src_offset +8,1601 extsize) <0)1602goto unmap;1603 src_offset +=8;1604 src_offset += extsize;1605}1606munmap(mmap, mmap_size);1607return istate->cache_nr;16081609unmap:1610munmap(mmap, mmap_size);1611die("index file corrupt");1612}16131614intread_index_from(struct index_state *istate,const char*path)1615{1616struct split_index *split_index;1617int ret;16181619/* istate->initialized covers both .git/index and .git/sharedindex.xxx */1620if(istate->initialized)1621return istate->cache_nr;16221623 ret =do_read_index(istate, path,0);1624 split_index = istate->split_index;1625if(!split_index)1626return ret;16271628if(is_null_sha1(split_index->base_sha1))1629return ret;16301631if(split_index->base)1632discard_index(split_index->base);1633else1634 split_index->base =xcalloc(1,sizeof(*split_index->base));1635 ret =do_read_index(split_index->base,1636git_path("sharedindex.%s",1637sha1_to_hex(split_index->base_sha1)),1);1638if(hashcmp(split_index->base_sha1, split_index->base->sha1))1639die("broken index, expect%sin%s, got%s",1640sha1_to_hex(split_index->base_sha1),1641git_path("sharedindex.%s",1642sha1_to_hex(split_index->base_sha1)),1643sha1_to_hex(split_index->base->sha1));1644merge_base_index(istate);1645return ret;1646}16471648intis_index_unborn(struct index_state *istate)1649{1650return(!istate->cache_nr && !istate->timestamp.sec);1651}16521653intdiscard_index(struct index_state *istate)1654{1655int i;16561657for(i =0; i < istate->cache_nr; i++) {1658if(istate->cache[i]->index &&1659 istate->split_index &&1660 istate->split_index->base &&1661 istate->cache[i]->index <= istate->split_index->base->cache_nr &&1662 istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index -1])1663continue;1664free(istate->cache[i]);1665}1666resolve_undo_clear_index(istate);1667 istate->cache_nr =0;1668 istate->cache_changed =0;1669 istate->timestamp.sec =0;1670 istate->timestamp.nsec =0;1671free_name_hash(istate);1672cache_tree_free(&(istate->cache_tree));1673 istate->initialized =0;1674free(istate->cache);1675 istate->cache = NULL;1676 istate->cache_alloc =0;1677discard_split_index(istate);1678free_untracked_cache(istate->untracked);1679 istate->untracked = NULL;1680return0;1681}16821683intunmerged_index(const struct index_state *istate)1684{1685int i;1686for(i =0; i < istate->cache_nr; i++) {1687if(ce_stage(istate->cache[i]))1688return1;1689}1690return0;1691}16921693#define WRITE_BUFFER_SIZE 81921694static unsigned char write_buffer[WRITE_BUFFER_SIZE];1695static unsigned long write_buffer_len;16961697static intce_write_flush(git_SHA_CTX *context,int fd)1698{1699unsigned int buffered = write_buffer_len;1700if(buffered) {1701git_SHA1_Update(context, write_buffer, buffered);1702if(write_in_full(fd, write_buffer, buffered) != buffered)1703return-1;1704 write_buffer_len =0;1705}1706return0;1707}17081709static intce_write(git_SHA_CTX *context,int fd,void*data,unsigned int len)1710{1711while(len) {1712unsigned int buffered = write_buffer_len;1713unsigned int partial = WRITE_BUFFER_SIZE - buffered;1714if(partial > len)1715 partial = len;1716memcpy(write_buffer + buffered, data, partial);1717 buffered += partial;1718if(buffered == WRITE_BUFFER_SIZE) {1719 write_buffer_len = buffered;1720if(ce_write_flush(context, fd))1721return-1;1722 buffered =0;1723}1724 write_buffer_len = buffered;1725 len -= partial;1726 data = (char*) data + partial;1727}1728return0;1729}17301731static intwrite_index_ext_header(git_SHA_CTX *context,int fd,1732unsigned int ext,unsigned int sz)1733{1734 ext =htonl(ext);1735 sz =htonl(sz);1736return((ce_write(context, fd, &ext,4) <0) ||1737(ce_write(context, fd, &sz,4) <0)) ? -1:0;1738}17391740static intce_flush(git_SHA_CTX *context,int fd,unsigned char*sha1)1741{1742unsigned int left = write_buffer_len;17431744if(left) {1745 write_buffer_len =0;1746git_SHA1_Update(context, write_buffer, left);1747}17481749/* Flush first if not enough space for SHA1 signature */1750if(left +20> WRITE_BUFFER_SIZE) {1751if(write_in_full(fd, write_buffer, left) != left)1752return-1;1753 left =0;1754}17551756/* Append the SHA1 signature at the end */1757git_SHA1_Final(write_buffer + left, context);1758hashcpy(sha1, write_buffer + left);1759 left +=20;1760return(write_in_full(fd, write_buffer, left) != left) ? -1:0;1761}17621763static voidce_smudge_racily_clean_entry(struct cache_entry *ce)1764{1765/*1766 * The only thing we care about in this function is to smudge the1767 * falsely clean entry due to touch-update-touch race, so we leave1768 * everything else as they are. We are called for entries whose1769 * ce_stat_data.sd_mtime match the index file mtime.1770 *1771 * Note that this actually does not do much for gitlinks, for1772 * which ce_match_stat_basic() always goes to the actual1773 * contents. The caller checks with is_racy_timestamp() which1774 * always says "no" for gitlinks, so we are not called for them ;-)1775 */1776struct stat st;17771778if(lstat(ce->name, &st) <0)1779return;1780if(ce_match_stat_basic(ce, &st))1781return;1782if(ce_modified_check_fs(ce, &st)) {1783/* This is "racily clean"; smudge it. Note that this1784 * is a tricky code. At first glance, it may appear1785 * that it can break with this sequence:1786 *1787 * $ echo xyzzy >frotz1788 * $ git-update-index --add frotz1789 * $ : >frotz1790 * $ sleep 31791 * $ echo filfre >nitfol1792 * $ git-update-index --add nitfol1793 *1794 * but it does not. When the second update-index runs,1795 * it notices that the entry "frotz" has the same timestamp1796 * as index, and if we were to smudge it by resetting its1797 * size to zero here, then the object name recorded1798 * in index is the 6-byte file but the cached stat information1799 * becomes zero --- which would then match what we would1800 * obtain from the filesystem next time we stat("frotz").1801 *1802 * However, the second update-index, before calling1803 * this function, notices that the cached size is 61804 * bytes and what is on the filesystem is an empty1805 * file, and never calls us, so the cached size information1806 * for "frotz" stays 6 which does not match the filesystem.1807 */1808 ce->ce_stat_data.sd_size =0;1809}1810}18111812/* Copy miscellaneous fields but not the name */1813static char*copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,1814struct cache_entry *ce)1815{1816short flags;18171818 ondisk->ctime.sec =htonl(ce->ce_stat_data.sd_ctime.sec);1819 ondisk->mtime.sec =htonl(ce->ce_stat_data.sd_mtime.sec);1820 ondisk->ctime.nsec =htonl(ce->ce_stat_data.sd_ctime.nsec);1821 ondisk->mtime.nsec =htonl(ce->ce_stat_data.sd_mtime.nsec);1822 ondisk->dev =htonl(ce->ce_stat_data.sd_dev);1823 ondisk->ino =htonl(ce->ce_stat_data.sd_ino);1824 ondisk->mode =htonl(ce->ce_mode);1825 ondisk->uid =htonl(ce->ce_stat_data.sd_uid);1826 ondisk->gid =htonl(ce->ce_stat_data.sd_gid);1827 ondisk->size =htonl(ce->ce_stat_data.sd_size);1828hashcpy(ondisk->sha1, ce->sha1);18291830 flags = ce->ce_flags & ~CE_NAMEMASK;1831 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK :ce_namelen(ce));1832 ondisk->flags =htons(flags);1833if(ce->ce_flags & CE_EXTENDED) {1834struct ondisk_cache_entry_extended *ondisk2;1835 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1836 ondisk2->flags2 =htons((ce->ce_flags & CE_EXTENDED_FLAGS) >>16);1837return ondisk2->name;1838}1839else{1840return ondisk->name;1841}1842}18431844static intce_write_entry(git_SHA_CTX *c,int fd,struct cache_entry *ce,1845struct strbuf *previous_name)1846{1847int size;1848struct ondisk_cache_entry *ondisk;1849int saved_namelen = saved_namelen;/* compiler workaround */1850char*name;1851int result;18521853if(ce->ce_flags & CE_STRIP_NAME) {1854 saved_namelen =ce_namelen(ce);1855 ce->ce_namelen =0;1856}18571858if(!previous_name) {1859 size =ondisk_ce_size(ce);1860 ondisk =xcalloc(1, size);1861 name =copy_cache_entry_to_ondisk(ondisk, ce);1862memcpy(name, ce->name,ce_namelen(ce));1863}else{1864int common, to_remove, prefix_size;1865unsigned char to_remove_vi[16];1866for(common =0;1867(ce->name[common] &&1868 common < previous_name->len &&1869 ce->name[common] == previous_name->buf[common]);1870 common++)1871;/* still matching */1872 to_remove = previous_name->len - common;1873 prefix_size =encode_varint(to_remove, to_remove_vi);18741875if(ce->ce_flags & CE_EXTENDED)1876 size =offsetof(struct ondisk_cache_entry_extended, name);1877else1878 size =offsetof(struct ondisk_cache_entry, name);1879 size += prefix_size + (ce_namelen(ce) - common +1);18801881 ondisk =xcalloc(1, size);1882 name =copy_cache_entry_to_ondisk(ondisk, ce);1883memcpy(name, to_remove_vi, prefix_size);1884memcpy(name + prefix_size, ce->name + common,ce_namelen(ce) - common);18851886strbuf_splice(previous_name, common, to_remove,1887 ce->name + common,ce_namelen(ce) - common);1888}1889if(ce->ce_flags & CE_STRIP_NAME) {1890 ce->ce_namelen = saved_namelen;1891 ce->ce_flags &= ~CE_STRIP_NAME;1892}18931894 result =ce_write(c, fd, ondisk, size);1895free(ondisk);1896return result;1897}18981899/*1900 * This function verifies if index_state has the correct sha1 of the1901 * index file. Don't die if we have any other failure, just return 0.1902 */1903static intverify_index_from(const struct index_state *istate,const char*path)1904{1905int fd;1906 ssize_t n;1907struct stat st;1908unsigned char sha1[20];19091910if(!istate->initialized)1911return0;19121913 fd =open(path, O_RDONLY);1914if(fd <0)1915return0;19161917if(fstat(fd, &st))1918goto out;19191920if(st.st_size <sizeof(struct cache_header) +20)1921goto out;19221923 n =pread_in_full(fd, sha1,20, st.st_size -20);1924if(n !=20)1925goto out;19261927if(hashcmp(istate->sha1, sha1))1928goto out;19291930close(fd);1931return1;19321933out:1934close(fd);1935return0;1936}19371938static intverify_index(const struct index_state *istate)1939{1940returnverify_index_from(istate,get_index_file());1941}19421943static inthas_racy_timestamp(struct index_state *istate)1944{1945int entries = istate->cache_nr;1946int i;19471948for(i =0; i < entries; i++) {1949struct cache_entry *ce = istate->cache[i];1950if(is_racy_timestamp(istate, ce))1951return1;1952}1953return0;1954}19551956/*1957 * Opportunistically update the index but do not complain if we can't1958 */1959voidupdate_index_if_able(struct index_state *istate,struct lock_file *lockfile)1960{1961if((istate->cache_changed ||has_racy_timestamp(istate)) &&1962verify_index(istate) &&1963write_locked_index(istate, lockfile, COMMIT_LOCK))1964rollback_lock_file(lockfile);1965}19661967static intdo_write_index(struct index_state *istate,int newfd,1968int strip_extensions)1969{1970 git_SHA_CTX c;1971struct cache_header hdr;1972int i, err, removed, extended, hdr_version;1973struct cache_entry **cache = istate->cache;1974int entries = istate->cache_nr;1975struct stat st;1976struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;19771978for(i = removed = extended =0; i < entries; i++) {1979if(cache[i]->ce_flags & CE_REMOVE)1980 removed++;19811982/* reduce extended entries if possible */1983 cache[i]->ce_flags &= ~CE_EXTENDED;1984if(cache[i]->ce_flags & CE_EXTENDED_FLAGS) {1985 extended++;1986 cache[i]->ce_flags |= CE_EXTENDED;1987}1988}19891990if(!istate->version) {1991 istate->version =get_index_format_default();1992if(getenv("GIT_TEST_SPLIT_INDEX"))1993init_split_index(istate);1994}19951996/* demote version 3 to version 2 when the latter suffices */1997if(istate->version ==3|| istate->version ==2)1998 istate->version = extended ?3:2;19992000 hdr_version = istate->version;20012002 hdr.hdr_signature =htonl(CACHE_SIGNATURE);2003 hdr.hdr_version =htonl(hdr_version);2004 hdr.hdr_entries =htonl(entries - removed);20052006git_SHA1_Init(&c);2007if(ce_write(&c, newfd, &hdr,sizeof(hdr)) <0)2008return-1;20092010 previous_name = (hdr_version ==4) ? &previous_name_buf : NULL;2011for(i =0; i < entries; i++) {2012struct cache_entry *ce = cache[i];2013if(ce->ce_flags & CE_REMOVE)2014continue;2015if(!ce_uptodate(ce) &&is_racy_timestamp(istate, ce))2016ce_smudge_racily_clean_entry(ce);2017if(is_null_sha1(ce->sha1)) {2018static const char msg[] ="cache entry has null sha1:%s";2019static int allow = -1;20202021if(allow <0)2022 allow =git_env_bool("GIT_ALLOW_NULL_SHA1",0);2023if(allow)2024warning(msg, ce->name);2025else2026returnerror(msg, ce->name);2027}2028if(ce_write_entry(&c, newfd, ce, previous_name) <0)2029return-1;2030}2031strbuf_release(&previous_name_buf);20322033/* Write extension data here */2034if(!strip_extensions && istate->split_index) {2035struct strbuf sb = STRBUF_INIT;20362037 err =write_link_extension(&sb, istate) <0||2038write_index_ext_header(&c, newfd, CACHE_EXT_LINK,2039 sb.len) <0||2040ce_write(&c, newfd, sb.buf, sb.len) <0;2041strbuf_release(&sb);2042if(err)2043return-1;2044}2045if(!strip_extensions && istate->cache_tree) {2046struct strbuf sb = STRBUF_INIT;20472048cache_tree_write(&sb, istate->cache_tree);2049 err =write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) <02050||ce_write(&c, newfd, sb.buf, sb.len) <0;2051strbuf_release(&sb);2052if(err)2053return-1;2054}2055if(!strip_extensions && istate->resolve_undo) {2056struct strbuf sb = STRBUF_INIT;20572058resolve_undo_write(&sb, istate->resolve_undo);2059 err =write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,2060 sb.len) <02061||ce_write(&c, newfd, sb.buf, sb.len) <0;2062strbuf_release(&sb);2063if(err)2064return-1;2065}2066if(!strip_extensions && istate->untracked) {2067struct strbuf sb = STRBUF_INIT;20682069write_untracked_extension(&sb, istate->untracked);2070 err =write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED,2071 sb.len) <0||2072ce_write(&c, newfd, sb.buf, sb.len) <0;2073strbuf_release(&sb);2074if(err)2075return-1;2076}20772078if(ce_flush(&c, newfd, istate->sha1) ||fstat(newfd, &st))2079return-1;2080 istate->timestamp.sec = (unsigned int)st.st_mtime;2081 istate->timestamp.nsec =ST_MTIME_NSEC(st);2082return0;2083}20842085voidset_alternate_index_output(const char*name)2086{2087 alternate_index_output = name;2088}20892090static intcommit_locked_index(struct lock_file *lk)2091{2092if(alternate_index_output)2093returncommit_lock_file_to(lk, alternate_index_output);2094else2095returncommit_lock_file(lk);2096}20972098static intdo_write_locked_index(struct index_state *istate,struct lock_file *lock,2099unsigned flags)2100{2101int ret =do_write_index(istate, lock->fd,0);2102if(ret)2103return ret;2104assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=2105(COMMIT_LOCK | CLOSE_LOCK));2106if(flags & COMMIT_LOCK)2107returncommit_locked_index(lock);2108else if(flags & CLOSE_LOCK)2109returnclose_lock_file(lock);2110else2111return ret;2112}21132114static intwrite_split_index(struct index_state *istate,2115struct lock_file *lock,2116unsigned flags)2117{2118int ret;2119prepare_to_write_split_index(istate);2120 ret =do_write_locked_index(istate, lock, flags);2121finish_writing_split_index(istate);2122return ret;2123}21242125static char*temporary_sharedindex;21262127static voidremove_temporary_sharedindex(void)2128{2129if(temporary_sharedindex) {2130unlink_or_warn(temporary_sharedindex);2131free(temporary_sharedindex);2132 temporary_sharedindex = NULL;2133}2134}21352136static voidremove_temporary_sharedindex_on_signal(int signo)2137{2138remove_temporary_sharedindex();2139sigchain_pop(signo);2140raise(signo);2141}21422143static intwrite_shared_index(struct index_state *istate,2144struct lock_file *lock,unsigned flags)2145{2146struct split_index *si = istate->split_index;2147static int installed_handler;2148int fd, ret;21492150 temporary_sharedindex =git_pathdup("sharedindex_XXXXXX");2151 fd =mkstemp(temporary_sharedindex);2152if(fd <0) {2153free(temporary_sharedindex);2154 temporary_sharedindex = NULL;2155hashclr(si->base_sha1);2156returndo_write_locked_index(istate, lock, flags);2157}2158if(!installed_handler) {2159atexit(remove_temporary_sharedindex);2160sigchain_push_common(remove_temporary_sharedindex_on_signal);2161}2162move_cache_to_base_index(istate);2163 ret =do_write_index(si->base, fd,1);2164close(fd);2165if(ret) {2166remove_temporary_sharedindex();2167return ret;2168}2169 ret =rename(temporary_sharedindex,2170git_path("sharedindex.%s",sha1_to_hex(si->base->sha1)));2171free(temporary_sharedindex);2172 temporary_sharedindex = NULL;2173if(!ret)2174hashcpy(si->base_sha1, si->base->sha1);2175return ret;2176}21772178intwrite_locked_index(struct index_state *istate,struct lock_file *lock,2179unsigned flags)2180{2181struct split_index *si = istate->split_index;21822183if(!si || alternate_index_output ||2184(istate->cache_changed & ~EXTMASK)) {2185if(si)2186hashclr(si->base_sha1);2187returndo_write_locked_index(istate, lock, flags);2188}21892190if(getenv("GIT_TEST_SPLIT_INDEX")) {2191int v = si->base_sha1[0];2192if((v &15) <6)2193 istate->cache_changed |= SPLIT_INDEX_ORDERED;2194}2195if(istate->cache_changed & SPLIT_INDEX_ORDERED) {2196int ret =write_shared_index(istate, lock, flags);2197if(ret)2198return ret;2199}22002201returnwrite_split_index(istate, lock, flags);2202}22032204/*2205 * Read the index file that is potentially unmerged into given2206 * index_state, dropping any unmerged entries. Returns true if2207 * the index is unmerged. Callers who want to refuse to work2208 * from an unmerged state can call this and check its return value,2209 * instead of calling read_cache().2210 */2211intread_index_unmerged(struct index_state *istate)2212{2213int i;2214int unmerged =0;22152216read_index(istate);2217for(i =0; i < istate->cache_nr; i++) {2218struct cache_entry *ce = istate->cache[i];2219struct cache_entry *new_ce;2220int size, len;22212222if(!ce_stage(ce))2223continue;2224 unmerged =1;2225 len =ce_namelen(ce);2226 size =cache_entry_size(len);2227 new_ce =xcalloc(1, size);2228memcpy(new_ce->name, ce->name, len);2229 new_ce->ce_flags =create_ce_flags(0) | CE_CONFLICTED;2230 new_ce->ce_namelen = len;2231 new_ce->ce_mode = ce->ce_mode;2232if(add_index_entry(istate, new_ce,0))2233returnerror("%s: cannot drop to stage #0",2234 new_ce->name);2235}2236return unmerged;2237}22382239/*2240 * Returns 1 if the path is an "other" path with respect to2241 * the index; that is, the path is not mentioned in the index at all,2242 * either as a file, a directory with some files in the index,2243 * or as an unmerged entry.2244 *2245 * We helpfully remove a trailing "/" from directories so that2246 * the output of read_directory can be used as-is.2247 */2248intindex_name_is_other(const struct index_state *istate,const char*name,2249int namelen)2250{2251int pos;2252if(namelen && name[namelen -1] =='/')2253 namelen--;2254 pos =index_name_pos(istate, name, namelen);2255if(0<= pos)2256return0;/* exact match */2257 pos = -pos -1;2258if(pos < istate->cache_nr) {2259struct cache_entry *ce = istate->cache[pos];2260if(ce_namelen(ce) == namelen &&2261!memcmp(ce->name, name, namelen))2262return0;/* Yup, this one exists unmerged */2263}2264return1;2265}22662267void*read_blob_data_from_index(struct index_state *istate,const char*path,unsigned long*size)2268{2269int pos, len;2270unsigned long sz;2271enum object_type type;2272void*data;22732274 len =strlen(path);2275 pos =index_name_pos(istate, path, len);2276if(pos <0) {2277/*2278 * We might be in the middle of a merge, in which2279 * case we would read stage #2 (ours).2280 */2281int i;2282for(i = -pos -1;2283(pos <0&& i < istate->cache_nr &&2284!strcmp(istate->cache[i]->name, path));2285 i++)2286if(ce_stage(istate->cache[i]) ==2)2287 pos = i;2288}2289if(pos <0)2290return NULL;2291 data =read_sha1_file(istate->cache[pos]->sha1, &type, &sz);2292if(!data || type != OBJ_BLOB) {2293free(data);2294return NULL;2295}2296if(size)2297*size = sz;2298return data;2299}23002301voidstat_validity_clear(struct stat_validity *sv)2302{2303free(sv->sd);2304 sv->sd = NULL;2305}23062307intstat_validity_check(struct stat_validity *sv,const char*path)2308{2309struct stat st;23102311if(stat(path, &st) <0)2312return sv->sd == NULL;2313if(!sv->sd)2314return0;2315returnS_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);2316}23172318voidstat_validity_update(struct stat_validity *sv,int fd)2319{2320struct stat st;23212322if(fstat(fd, &st) <0|| !S_ISREG(st.st_mode))2323stat_validity_clear(sv);2324else{2325if(!sv->sd)2326 sv->sd =xcalloc(1,sizeof(struct stat_data));2327fill_stat_data(sv->sd, &st);2328}2329}