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 | UNTRACKED_CHANGED) 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 297intmatch_stat_data_racy(const struct index_state *istate, 298const struct stat_data *sd,struct stat *st) 299{ 300if(is_racy_stat(istate, sd)) 301return MTIME_CHANGED; 302returnmatch_stat_data(sd, st); 303} 304 305intie_match_stat(const struct index_state *istate, 306const struct cache_entry *ce,struct stat *st, 307unsigned int options) 308{ 309unsigned int changed; 310int ignore_valid = options & CE_MATCH_IGNORE_VALID; 311int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE; 312int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY; 313 314/* 315 * If it's marked as always valid in the index, it's 316 * valid whatever the checked-out copy says. 317 * 318 * skip-worktree has the same effect with higher precedence 319 */ 320if(!ignore_skip_worktree &&ce_skip_worktree(ce)) 321return0; 322if(!ignore_valid && (ce->ce_flags & CE_VALID)) 323return0; 324 325/* 326 * Intent-to-add entries have not been added, so the index entry 327 * by definition never matches what is in the work tree until it 328 * actually gets added. 329 */ 330if(ce->ce_flags & CE_INTENT_TO_ADD) 331return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED; 332 333 changed =ce_match_stat_basic(ce, st); 334 335/* 336 * Within 1 second of this sequence: 337 * echo xyzzy >file && git-update-index --add file 338 * running this command: 339 * echo frotz >file 340 * would give a falsely clean cache entry. The mtime and 341 * length match the cache, and other stat fields do not change. 342 * 343 * We could detect this at update-index time (the cache entry 344 * being registered/updated records the same time as "now") 345 * and delay the return from git-update-index, but that would 346 * effectively mean we can make at most one commit per second, 347 * which is not acceptable. Instead, we check cache entries 348 * whose mtime are the same as the index file timestamp more 349 * carefully than others. 350 */ 351if(!changed &&is_racy_timestamp(istate, ce)) { 352if(assume_racy_is_modified) 353 changed |= DATA_CHANGED; 354else 355 changed |=ce_modified_check_fs(ce, st); 356} 357 358return changed; 359} 360 361intie_modified(const struct index_state *istate, 362const struct cache_entry *ce, 363struct stat *st,unsigned int options) 364{ 365int changed, changed_fs; 366 367 changed =ie_match_stat(istate, ce, st, options); 368if(!changed) 369return0; 370/* 371 * If the mode or type has changed, there's no point in trying 372 * to refresh the entry - it's not going to match 373 */ 374if(changed & (MODE_CHANGED | TYPE_CHANGED)) 375return changed; 376 377/* 378 * Immediately after read-tree or update-index --cacheinfo, 379 * the length field is zero, as we have never even read the 380 * lstat(2) information once, and we cannot trust DATA_CHANGED 381 * returned by ie_match_stat() which in turn was returned by 382 * ce_match_stat_basic() to signal that the filesize of the 383 * blob changed. We have to actually go to the filesystem to 384 * see if the contents match, and if so, should answer "unchanged". 385 * 386 * The logic does not apply to gitlinks, as ce_match_stat_basic() 387 * already has checked the actual HEAD from the filesystem in the 388 * subproject. If ie_match_stat() already said it is different, 389 * then we know it is. 390 */ 391if((changed & DATA_CHANGED) && 392(S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size !=0)) 393return changed; 394 395 changed_fs =ce_modified_check_fs(ce, st); 396if(changed_fs) 397return changed | changed_fs; 398return0; 399} 400 401intbase_name_compare(const char*name1,int len1,int mode1, 402const char*name2,int len2,int mode2) 403{ 404unsigned char c1, c2; 405int len = len1 < len2 ? len1 : len2; 406int cmp; 407 408 cmp =memcmp(name1, name2, len); 409if(cmp) 410return cmp; 411 c1 = name1[len]; 412 c2 = name2[len]; 413if(!c1 &&S_ISDIR(mode1)) 414 c1 ='/'; 415if(!c2 &&S_ISDIR(mode2)) 416 c2 ='/'; 417return(c1 < c2) ? -1: (c1 > c2) ?1:0; 418} 419 420/* 421 * df_name_compare() is identical to base_name_compare(), except it 422 * compares conflicting directory/file entries as equal. Note that 423 * while a directory name compares as equal to a regular file, they 424 * then individually compare _differently_ to a filename that has 425 * a dot after the basename (because '\0' < '.' < '/'). 426 * 427 * This is used by routines that want to traverse the git namespace 428 * but then handle conflicting entries together when possible. 429 */ 430intdf_name_compare(const char*name1,int len1,int mode1, 431const char*name2,int len2,int mode2) 432{ 433int len = len1 < len2 ? len1 : len2, cmp; 434unsigned char c1, c2; 435 436 cmp =memcmp(name1, name2, len); 437if(cmp) 438return cmp; 439/* Directories and files compare equal (same length, same name) */ 440if(len1 == len2) 441return0; 442 c1 = name1[len]; 443if(!c1 &&S_ISDIR(mode1)) 444 c1 ='/'; 445 c2 = name2[len]; 446if(!c2 &&S_ISDIR(mode2)) 447 c2 ='/'; 448if(c1 =='/'&& !c2) 449return0; 450if(c2 =='/'&& !c1) 451return0; 452return c1 - c2; 453} 454 455intname_compare(const char*name1,size_t len1,const char*name2,size_t len2) 456{ 457size_t min_len = (len1 < len2) ? len1 : len2; 458int cmp =memcmp(name1, name2, min_len); 459if(cmp) 460return cmp; 461if(len1 < len2) 462return-1; 463if(len1 > len2) 464return1; 465return0; 466} 467 468intcache_name_stage_compare(const char*name1,int len1,int stage1,const char*name2,int len2,int stage2) 469{ 470int cmp; 471 472 cmp =name_compare(name1, len1, name2, len2); 473if(cmp) 474return cmp; 475 476if(stage1 < stage2) 477return-1; 478if(stage1 > stage2) 479return1; 480return0; 481} 482 483static intindex_name_stage_pos(const struct index_state *istate,const char*name,int namelen,int stage) 484{ 485int first, last; 486 487 first =0; 488 last = istate->cache_nr; 489while(last > first) { 490int next = (last + first) >>1; 491struct cache_entry *ce = istate->cache[next]; 492int cmp =cache_name_stage_compare(name, namelen, stage, ce->name,ce_namelen(ce),ce_stage(ce)); 493if(!cmp) 494return next; 495if(cmp <0) { 496 last = next; 497continue; 498} 499 first = next+1; 500} 501return-first-1; 502} 503 504intindex_name_pos(const struct index_state *istate,const char*name,int namelen) 505{ 506returnindex_name_stage_pos(istate, name, namelen,0); 507} 508 509/* Remove entry, return true if there are more entries to go.. */ 510intremove_index_entry_at(struct index_state *istate,int pos) 511{ 512struct cache_entry *ce = istate->cache[pos]; 513 514record_resolve_undo(istate, ce); 515remove_name_hash(istate, ce); 516save_or_free_index_entry(istate, ce); 517 istate->cache_changed |= CE_ENTRY_REMOVED; 518 istate->cache_nr--; 519if(pos >= istate->cache_nr) 520return0; 521memmove(istate->cache + pos, 522 istate->cache + pos +1, 523(istate->cache_nr - pos) *sizeof(struct cache_entry *)); 524return1; 525} 526 527/* 528 * Remove all cache entries marked for removal, that is where 529 * CE_REMOVE is set in ce_flags. This is much more effective than 530 * calling remove_index_entry_at() for each entry to be removed. 531 */ 532voidremove_marked_cache_entries(struct index_state *istate) 533{ 534struct cache_entry **ce_array = istate->cache; 535unsigned int i, j; 536 537for(i = j =0; i < istate->cache_nr; i++) { 538if(ce_array[i]->ce_flags & CE_REMOVE) { 539remove_name_hash(istate, ce_array[i]); 540save_or_free_index_entry(istate, ce_array[i]); 541} 542else 543 ce_array[j++] = ce_array[i]; 544} 545if(j == istate->cache_nr) 546return; 547 istate->cache_changed |= CE_ENTRY_REMOVED; 548 istate->cache_nr = j; 549} 550 551intremove_file_from_index(struct index_state *istate,const char*path) 552{ 553int pos =index_name_pos(istate, path,strlen(path)); 554if(pos <0) 555 pos = -pos-1; 556cache_tree_invalidate_path(istate, path); 557untracked_cache_remove_from_index(istate, path); 558while(pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path)) 559remove_index_entry_at(istate, pos); 560return0; 561} 562 563static intcompare_name(struct cache_entry *ce,const char*path,int namelen) 564{ 565return namelen !=ce_namelen(ce) ||memcmp(path, ce->name, namelen); 566} 567 568static intindex_name_pos_also_unmerged(struct index_state *istate, 569const char*path,int namelen) 570{ 571int pos =index_name_pos(istate, path, namelen); 572struct cache_entry *ce; 573 574if(pos >=0) 575return pos; 576 577/* maybe unmerged? */ 578 pos = -1- pos; 579if(pos >= istate->cache_nr || 580compare_name((ce = istate->cache[pos]), path, namelen)) 581return-1; 582 583/* order of preference: stage 2, 1, 3 */ 584if(ce_stage(ce) ==1&& pos +1< istate->cache_nr && 585ce_stage((ce = istate->cache[pos +1])) ==2&& 586!compare_name(ce, path, namelen)) 587 pos++; 588return pos; 589} 590 591static intdifferent_name(struct cache_entry *ce,struct cache_entry *alias) 592{ 593int len =ce_namelen(ce); 594returnce_namelen(alias) != len ||memcmp(ce->name, alias->name, len); 595} 596 597/* 598 * If we add a filename that aliases in the cache, we will use the 599 * name that we already have - but we don't want to update the same 600 * alias twice, because that implies that there were actually two 601 * different files with aliasing names! 602 * 603 * So we use the CE_ADDED flag to verify that the alias was an old 604 * one before we accept it as 605 */ 606static struct cache_entry *create_alias_ce(struct index_state *istate, 607struct cache_entry *ce, 608struct cache_entry *alias) 609{ 610int len; 611struct cache_entry *new; 612 613if(alias->ce_flags & CE_ADDED) 614die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name); 615 616/* Ok, create the new entry using the name of the existing alias */ 617 len =ce_namelen(alias); 618new=xcalloc(1,cache_entry_size(len)); 619memcpy(new->name, alias->name, len); 620copy_cache_entry(new, ce); 621save_or_free_index_entry(istate, ce); 622return new; 623} 624 625voidset_object_name_for_intent_to_add_entry(struct cache_entry *ce) 626{ 627unsigned char sha1[20]; 628if(write_sha1_file("",0, blob_type, sha1)) 629die("cannot create an empty blob in the object database"); 630hashcpy(ce->sha1, sha1); 631} 632 633intadd_to_index(struct index_state *istate,const char*path,struct stat *st,int flags) 634{ 635int size, namelen, was_same; 636 mode_t st_mode = st->st_mode; 637struct cache_entry *ce, *alias; 638unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY; 639int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND); 640int pretend = flags & ADD_CACHE_PRETEND; 641int intent_only = flags & ADD_CACHE_INTENT; 642int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE| 643(intent_only ? ADD_CACHE_NEW_ONLY :0)); 644 645if(!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode)) 646returnerror("%s: can only add regular files, symbolic links or git-directories", path); 647 648 namelen =strlen(path); 649if(S_ISDIR(st_mode)) { 650while(namelen && path[namelen-1] =='/') 651 namelen--; 652} 653 size =cache_entry_size(namelen); 654 ce =xcalloc(1, size); 655memcpy(ce->name, path, namelen); 656 ce->ce_namelen = namelen; 657if(!intent_only) 658fill_stat_cache_info(ce, st); 659else 660 ce->ce_flags |= CE_INTENT_TO_ADD; 661 662if(trust_executable_bit && has_symlinks) 663 ce->ce_mode =create_ce_mode(st_mode); 664else{ 665/* If there is an existing entry, pick the mode bits and type 666 * from it, otherwise assume unexecutable regular file. 667 */ 668struct cache_entry *ent; 669int pos =index_name_pos_also_unmerged(istate, path, namelen); 670 671 ent = (0<= pos) ? istate->cache[pos] : NULL; 672 ce->ce_mode =ce_mode_from_stat(ent, st_mode); 673} 674 675/* When core.ignorecase=true, determine if a directory of the same name but differing 676 * case already exists within the Git repository. If it does, ensure the directory 677 * case of the file being added to the repository matches (is folded into) the existing 678 * entry's directory case. 679 */ 680if(ignore_case) { 681const char*startPtr = ce->name; 682const char*ptr = startPtr; 683while(*ptr) { 684while(*ptr && *ptr !='/') 685++ptr; 686if(*ptr =='/') { 687struct cache_entry *foundce; 688++ptr; 689 foundce =index_dir_exists(istate, ce->name, ptr - ce->name -1); 690if(foundce) { 691memcpy((void*)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr); 692 startPtr = ptr; 693} 694} 695} 696} 697 698 alias =index_file_exists(istate, ce->name,ce_namelen(ce), ignore_case); 699if(alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) { 700/* Nothing changed, really */ 701free(ce); 702if(!S_ISGITLINK(alias->ce_mode)) 703ce_mark_uptodate(alias); 704 alias->ce_flags |= CE_ADDED; 705return0; 706} 707if(!intent_only) { 708if(index_path(ce->sha1, path, st, HASH_WRITE_OBJECT)) 709returnerror("unable to index file%s", path); 710}else 711set_object_name_for_intent_to_add_entry(ce); 712 713if(ignore_case && alias &&different_name(ce, alias)) 714 ce =create_alias_ce(istate, ce, alias); 715 ce->ce_flags |= CE_ADDED; 716 717/* It was suspected to be racily clean, but it turns out to be Ok */ 718 was_same = (alias && 719!ce_stage(alias) && 720!hashcmp(alias->sha1, ce->sha1) && 721 ce->ce_mode == alias->ce_mode); 722 723if(pretend) 724; 725else if(add_index_entry(istate, ce, add_option)) 726returnerror("unable to add%sto index",path); 727if(verbose && !was_same) 728printf("add '%s'\n", path); 729return0; 730} 731 732intadd_file_to_index(struct index_state *istate,const char*path,int flags) 733{ 734struct stat st; 735if(lstat(path, &st)) 736die_errno("unable to stat '%s'", path); 737returnadd_to_index(istate, path, &st, flags); 738} 739 740struct cache_entry *make_cache_entry(unsigned int mode, 741const unsigned char*sha1,const char*path,int stage, 742unsigned int refresh_options) 743{ 744int size, len; 745struct cache_entry *ce, *ret; 746 747if(!verify_path(path)) { 748error("Invalid path '%s'", path); 749return NULL; 750} 751 752 len =strlen(path); 753 size =cache_entry_size(len); 754 ce =xcalloc(1, size); 755 756hashcpy(ce->sha1, sha1); 757memcpy(ce->name, path, len); 758 ce->ce_flags =create_ce_flags(stage); 759 ce->ce_namelen = len; 760 ce->ce_mode =create_ce_mode(mode); 761 762 ret =refresh_cache_entry(ce, refresh_options); 763if(!ret) { 764free(ce); 765return NULL; 766}else{ 767return ret; 768} 769} 770 771intce_same_name(const struct cache_entry *a,const struct cache_entry *b) 772{ 773int len =ce_namelen(a); 774returnce_namelen(b) == len && !memcmp(a->name, b->name, len); 775} 776 777/* 778 * We fundamentally don't like some paths: we don't want 779 * dot or dot-dot anywhere, and for obvious reasons don't 780 * want to recurse into ".git" either. 781 * 782 * Also, we don't want double slashes or slashes at the 783 * end that can make pathnames ambiguous. 784 */ 785static intverify_dotfile(const char*rest) 786{ 787/* 788 * The first character was '.', but that 789 * has already been discarded, we now test 790 * the rest. 791 */ 792 793/* "." is not allowed */ 794if(*rest =='\0'||is_dir_sep(*rest)) 795return0; 796 797switch(*rest) { 798/* 799 * ".git" followed by NUL or slash is bad. This 800 * shares the path end test with the ".." case. 801 */ 802case'g': 803case'G': 804if(rest[1] !='i'&& rest[1] !='I') 805break; 806if(rest[2] !='t'&& rest[2] !='T') 807break; 808 rest +=2; 809/* fallthrough */ 810case'.': 811if(rest[1] =='\0'||is_dir_sep(rest[1])) 812return0; 813} 814return1; 815} 816 817intverify_path(const char*path) 818{ 819char c; 820 821if(has_dos_drive_prefix(path)) 822return0; 823 824goto inside; 825for(;;) { 826if(!c) 827return1; 828if(is_dir_sep(c)) { 829inside: 830if(protect_hfs &&is_hfs_dotgit(path)) 831return0; 832if(protect_ntfs &&is_ntfs_dotgit(path)) 833return0; 834 c = *path++; 835if((c =='.'&& !verify_dotfile(path)) || 836is_dir_sep(c) || c =='\0') 837return0; 838} 839 c = *path++; 840} 841} 842 843/* 844 * Do we have another file that has the beginning components being a 845 * proper superset of the name we're trying to add? 846 */ 847static inthas_file_name(struct index_state *istate, 848const struct cache_entry *ce,int pos,int ok_to_replace) 849{ 850int retval =0; 851int len =ce_namelen(ce); 852int stage =ce_stage(ce); 853const char*name = ce->name; 854 855while(pos < istate->cache_nr) { 856struct cache_entry *p = istate->cache[pos++]; 857 858if(len >=ce_namelen(p)) 859break; 860if(memcmp(name, p->name, len)) 861break; 862if(ce_stage(p) != stage) 863continue; 864if(p->name[len] !='/') 865continue; 866if(p->ce_flags & CE_REMOVE) 867continue; 868 retval = -1; 869if(!ok_to_replace) 870break; 871remove_index_entry_at(istate, --pos); 872} 873return retval; 874} 875 876/* 877 * Do we have another file with a pathname that is a proper 878 * subset of the name we're trying to add? 879 */ 880static inthas_dir_name(struct index_state *istate, 881const struct cache_entry *ce,int pos,int ok_to_replace) 882{ 883int retval =0; 884int stage =ce_stage(ce); 885const char*name = ce->name; 886const char*slash = name +ce_namelen(ce); 887 888for(;;) { 889int len; 890 891for(;;) { 892if(*--slash =='/') 893break; 894if(slash <= ce->name) 895return retval; 896} 897 len = slash - name; 898 899 pos =index_name_stage_pos(istate, name, len, stage); 900if(pos >=0) { 901/* 902 * Found one, but not so fast. This could 903 * be a marker that says "I was here, but 904 * I am being removed". Such an entry is 905 * not a part of the resulting tree, and 906 * it is Ok to have a directory at the same 907 * path. 908 */ 909if(!(istate->cache[pos]->ce_flags & CE_REMOVE)) { 910 retval = -1; 911if(!ok_to_replace) 912break; 913remove_index_entry_at(istate, pos); 914continue; 915} 916} 917else 918 pos = -pos-1; 919 920/* 921 * Trivial optimization: if we find an entry that 922 * already matches the sub-directory, then we know 923 * we're ok, and we can exit. 924 */ 925while(pos < istate->cache_nr) { 926struct cache_entry *p = istate->cache[pos]; 927if((ce_namelen(p) <= len) || 928(p->name[len] !='/') || 929memcmp(p->name, name, len)) 930break;/* not our subdirectory */ 931if(ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) 932/* 933 * p is at the same stage as our entry, and 934 * is a subdirectory of what we are looking 935 * at, so we cannot have conflicts at our 936 * level or anything shorter. 937 */ 938return retval; 939 pos++; 940} 941} 942return retval; 943} 944 945/* We may be in a situation where we already have path/file and path 946 * is being added, or we already have path and path/file is being 947 * added. Either one would result in a nonsense tree that has path 948 * twice when git-write-tree tries to write it out. Prevent it. 949 * 950 * If ok-to-replace is specified, we remove the conflicting entries 951 * from the cache so the caller should recompute the insert position. 952 * When this happens, we return non-zero. 953 */ 954static intcheck_file_directory_conflict(struct index_state *istate, 955const struct cache_entry *ce, 956int pos,int ok_to_replace) 957{ 958int retval; 959 960/* 961 * When ce is an "I am going away" entry, we allow it to be added 962 */ 963if(ce->ce_flags & CE_REMOVE) 964return0; 965 966/* 967 * We check if the path is a sub-path of a subsequent pathname 968 * first, since removing those will not change the position 969 * in the array. 970 */ 971 retval =has_file_name(istate, ce, pos, ok_to_replace); 972 973/* 974 * Then check if the path might have a clashing sub-directory 975 * before it. 976 */ 977return retval +has_dir_name(istate, ce, pos, ok_to_replace); 978} 979 980static intadd_index_entry_with_check(struct index_state *istate,struct cache_entry *ce,int option) 981{ 982int pos; 983int ok_to_add = option & ADD_CACHE_OK_TO_ADD; 984int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; 985int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; 986int new_only = option & ADD_CACHE_NEW_ONLY; 987 988if(!(option & ADD_CACHE_KEEP_CACHE_TREE)) 989cache_tree_invalidate_path(istate, ce->name); 990 pos =index_name_stage_pos(istate, ce->name,ce_namelen(ce),ce_stage(ce)); 991 992/* existing match? Just replace it. */ 993if(pos >=0) { 994if(!new_only) 995replace_index_entry(istate, pos, ce); 996return0; 997} 998 pos = -pos-1; 9991000untracked_cache_add_to_index(istate, ce->name);10011002/*1003 * Inserting a merged entry ("stage 0") into the index1004 * will always replace all non-merged entries..1005 */1006if(pos < istate->cache_nr &&ce_stage(ce) ==0) {1007while(ce_same_name(istate->cache[pos], ce)) {1008 ok_to_add =1;1009if(!remove_index_entry_at(istate, pos))1010break;1011}1012}10131014if(!ok_to_add)1015return-1;1016if(!verify_path(ce->name))1017returnerror("Invalid path '%s'", ce->name);10181019if(!skip_df_check &&1020check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {1021if(!ok_to_replace)1022returnerror("'%s' appears as both a file and as a directory",1023 ce->name);1024 pos =index_name_stage_pos(istate, ce->name,ce_namelen(ce),ce_stage(ce));1025 pos = -pos-1;1026}1027return pos +1;1028}10291030intadd_index_entry(struct index_state *istate,struct cache_entry *ce,int option)1031{1032int pos;10331034if(option & ADD_CACHE_JUST_APPEND)1035 pos = istate->cache_nr;1036else{1037int ret;1038 ret =add_index_entry_with_check(istate, ce, option);1039if(ret <=0)1040return ret;1041 pos = ret -1;1042}10431044/* Make sure the array is big enough .. */1045ALLOC_GROW(istate->cache, istate->cache_nr +1, istate->cache_alloc);10461047/* Add it in.. */1048 istate->cache_nr++;1049if(istate->cache_nr > pos +1)1050memmove(istate->cache + pos +1,1051 istate->cache + pos,1052(istate->cache_nr - pos -1) *sizeof(ce));1053set_index_entry(istate, pos, ce);1054 istate->cache_changed |= CE_ENTRY_ADDED;1055return0;1056}10571058/*1059 * "refresh" does not calculate a new sha1 file or bring the1060 * cache up-to-date for mode/content changes. But what it1061 * _does_ do is to "re-match" the stat information of a file1062 * with the cache, so that you can refresh the cache for a1063 * file that hasn't been changed but where the stat entry is1064 * out of date.1065 *1066 * For example, you'd want to do this after doing a "git-read-tree",1067 * to link up the stat cache details with the proper files.1068 */1069static struct cache_entry *refresh_cache_ent(struct index_state *istate,1070struct cache_entry *ce,1071unsigned int options,int*err,1072int*changed_ret)1073{1074struct stat st;1075struct cache_entry *updated;1076int changed, size;1077int refresh = options & CE_MATCH_REFRESH;1078int ignore_valid = options & CE_MATCH_IGNORE_VALID;1079int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;1080int ignore_missing = options & CE_MATCH_IGNORE_MISSING;10811082if(!refresh ||ce_uptodate(ce))1083return ce;10841085/*1086 * CE_VALID or CE_SKIP_WORKTREE means the user promised us1087 * that the change to the work tree does not matter and told1088 * us not to worry.1089 */1090if(!ignore_skip_worktree &&ce_skip_worktree(ce)) {1091ce_mark_uptodate(ce);1092return ce;1093}1094if(!ignore_valid && (ce->ce_flags & CE_VALID)) {1095ce_mark_uptodate(ce);1096return ce;1097}10981099if(has_symlink_leading_path(ce->name,ce_namelen(ce))) {1100if(ignore_missing)1101return ce;1102if(err)1103*err = ENOENT;1104return NULL;1105}11061107if(lstat(ce->name, &st) <0) {1108if(ignore_missing && errno == ENOENT)1109return ce;1110if(err)1111*err = errno;1112return NULL;1113}11141115 changed =ie_match_stat(istate, ce, &st, options);1116if(changed_ret)1117*changed_ret = changed;1118if(!changed) {1119/*1120 * The path is unchanged. If we were told to ignore1121 * valid bit, then we did the actual stat check and1122 * found that the entry is unmodified. If the entry1123 * is not marked VALID, this is the place to mark it1124 * valid again, under "assume unchanged" mode.1125 */1126if(ignore_valid && assume_unchanged &&1127!(ce->ce_flags & CE_VALID))1128;/* mark this one VALID again */1129else{1130/*1131 * We do not mark the index itself "modified"1132 * because CE_UPTODATE flag is in-core only;1133 * we are not going to write this change out.1134 */1135if(!S_ISGITLINK(ce->ce_mode))1136ce_mark_uptodate(ce);1137return ce;1138}1139}11401141if(ie_modified(istate, ce, &st, options)) {1142if(err)1143*err = EINVAL;1144return NULL;1145}11461147 size =ce_size(ce);1148 updated =xmalloc(size);1149memcpy(updated, ce, size);1150fill_stat_cache_info(updated, &st);1151/*1152 * If ignore_valid is not set, we should leave CE_VALID bit1153 * alone. Otherwise, paths marked with --no-assume-unchanged1154 * (i.e. things to be edited) will reacquire CE_VALID bit1155 * automatically, which is not really what we want.1156 */1157if(!ignore_valid && assume_unchanged &&1158!(ce->ce_flags & CE_VALID))1159 updated->ce_flags &= ~CE_VALID;11601161/* istate->cache_changed is updated in the caller */1162return updated;1163}11641165static voidshow_file(const char* fmt,const char* name,int in_porcelain,1166int* first,const char*header_msg)1167{1168if(in_porcelain && *first && header_msg) {1169printf("%s\n", header_msg);1170*first =0;1171}1172printf(fmt, name);1173}11741175intrefresh_index(struct index_state *istate,unsigned int flags,1176const struct pathspec *pathspec,1177char*seen,const char*header_msg)1178{1179int i;1180int has_errors =0;1181int really = (flags & REFRESH_REALLY) !=0;1182int allow_unmerged = (flags & REFRESH_UNMERGED) !=0;1183int quiet = (flags & REFRESH_QUIET) !=0;1184int not_new = (flags & REFRESH_IGNORE_MISSING) !=0;1185int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) !=0;1186int first =1;1187int in_porcelain = (flags & REFRESH_IN_PORCELAIN);1188unsigned int options = (CE_MATCH_REFRESH |1189(really ? CE_MATCH_IGNORE_VALID :0) |1190(not_new ? CE_MATCH_IGNORE_MISSING :0));1191const char*modified_fmt;1192const char*deleted_fmt;1193const char*typechange_fmt;1194const char*added_fmt;1195const char*unmerged_fmt;11961197 modified_fmt = (in_porcelain ?"M\t%s\n":"%s: needs update\n");1198 deleted_fmt = (in_porcelain ?"D\t%s\n":"%s: needs update\n");1199 typechange_fmt = (in_porcelain ?"T\t%s\n":"%sneeds update\n");1200 added_fmt = (in_porcelain ?"A\t%s\n":"%sneeds update\n");1201 unmerged_fmt = (in_porcelain ?"U\t%s\n":"%s: needs merge\n");1202for(i =0; i < istate->cache_nr; i++) {1203struct cache_entry *ce, *new;1204int cache_errno =0;1205int changed =0;1206int filtered =0;12071208 ce = istate->cache[i];1209if(ignore_submodules &&S_ISGITLINK(ce->ce_mode))1210continue;12111212if(pathspec && !ce_path_match(ce, pathspec, seen))1213 filtered =1;12141215if(ce_stage(ce)) {1216while((i < istate->cache_nr) &&1217!strcmp(istate->cache[i]->name, ce->name))1218 i++;1219 i--;1220if(allow_unmerged)1221continue;1222if(!filtered)1223show_file(unmerged_fmt, ce->name, in_porcelain,1224&first, header_msg);1225 has_errors =1;1226continue;1227}12281229if(filtered)1230continue;12311232new=refresh_cache_ent(istate, ce, options, &cache_errno, &changed);1233if(new== ce)1234continue;1235if(!new) {1236const char*fmt;12371238if(really && cache_errno == EINVAL) {1239/* If we are doing --really-refresh that1240 * means the index is not valid anymore.1241 */1242 ce->ce_flags &= ~CE_VALID;1243 ce->ce_flags |= CE_UPDATE_IN_BASE;1244 istate->cache_changed |= CE_ENTRY_CHANGED;1245}1246if(quiet)1247continue;12481249if(cache_errno == ENOENT)1250 fmt = deleted_fmt;1251else if(ce->ce_flags & CE_INTENT_TO_ADD)1252 fmt = added_fmt;/* must be before other checks */1253else if(changed & TYPE_CHANGED)1254 fmt = typechange_fmt;1255else1256 fmt = modified_fmt;1257show_file(fmt,1258 ce->name, in_porcelain, &first, header_msg);1259 has_errors =1;1260continue;1261}12621263replace_index_entry(istate, i,new);1264}1265return has_errors;1266}12671268static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,1269unsigned int options)1270{1271returnrefresh_cache_ent(&the_index, ce, options, NULL, NULL);1272}127312741275/*****************************************************************1276 * Index File I/O1277 *****************************************************************/12781279#define INDEX_FORMAT_DEFAULT 312801281static unsigned intget_index_format_default(void)1282{1283char*envversion =getenv("GIT_INDEX_VERSION");1284char*endp;1285int value;1286unsigned int version = INDEX_FORMAT_DEFAULT;12871288if(!envversion) {1289if(!git_config_get_int("index.version", &value))1290 version = value;1291if(version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {1292warning(_("index.version set, but the value is invalid.\n"1293"Using version%i"), INDEX_FORMAT_DEFAULT);1294return INDEX_FORMAT_DEFAULT;1295}1296return version;1297}12981299 version =strtoul(envversion, &endp,10);1300if(*endp ||1301 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {1302warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"1303"Using version%i"), INDEX_FORMAT_DEFAULT);1304 version = INDEX_FORMAT_DEFAULT;1305}1306return version;1307}13081309/*1310 * dev/ino/uid/gid/size are also just tracked to the low 32 bits1311 * Again - this is just a (very strong in practice) heuristic that1312 * the inode hasn't changed.1313 *1314 * We save the fields in big-endian order to allow using the1315 * index file over NFS transparently.1316 */1317struct ondisk_cache_entry {1318struct cache_time ctime;1319struct cache_time mtime;1320uint32_t dev;1321uint32_t ino;1322uint32_t mode;1323uint32_t uid;1324uint32_t gid;1325uint32_t size;1326unsigned char sha1[20];1327uint16_t flags;1328char name[FLEX_ARRAY];/* more */1329};13301331/*1332 * This struct is used when CE_EXTENDED bit is 11333 * The struct must match ondisk_cache_entry exactly from1334 * ctime till flags1335 */1336struct ondisk_cache_entry_extended {1337struct cache_time ctime;1338struct cache_time mtime;1339uint32_t dev;1340uint32_t ino;1341uint32_t mode;1342uint32_t uid;1343uint32_t gid;1344uint32_t size;1345unsigned char sha1[20];1346uint16_t flags;1347uint16_t flags2;1348char name[FLEX_ARRAY];/* more */1349};13501351/* These are only used for v3 or lower */1352#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)1353#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)1354#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)1355#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \1356 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \1357 ondisk_cache_entry_size(ce_namelen(ce)))13581359static intverify_hdr(struct cache_header *hdr,unsigned long size)1360{1361 git_SHA_CTX c;1362unsigned char sha1[20];1363int hdr_version;13641365if(hdr->hdr_signature !=htonl(CACHE_SIGNATURE))1366returnerror("bad signature");1367 hdr_version =ntohl(hdr->hdr_version);1368if(hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)1369returnerror("bad index version%d", hdr_version);1370git_SHA1_Init(&c);1371git_SHA1_Update(&c, hdr, size -20);1372git_SHA1_Final(sha1, &c);1373if(hashcmp(sha1, (unsigned char*)hdr + size -20))1374returnerror("bad index file sha1 signature");1375return0;1376}13771378static intread_index_extension(struct index_state *istate,1379const char*ext,void*data,unsigned long sz)1380{1381switch(CACHE_EXT(ext)) {1382case CACHE_EXT_TREE:1383 istate->cache_tree =cache_tree_read(data, sz);1384break;1385case CACHE_EXT_RESOLVE_UNDO:1386 istate->resolve_undo =resolve_undo_read(data, sz);1387break;1388case CACHE_EXT_LINK:1389if(read_link_extension(istate, data, sz))1390return-1;1391break;1392case CACHE_EXT_UNTRACKED:1393 istate->untracked =read_untracked_extension(data, sz);1394break;1395default:1396if(*ext <'A'||'Z'< *ext)1397returnerror("index uses %.4s extension, which we do not understand",1398 ext);1399fprintf(stderr,"ignoring %.4s extension\n", ext);1400break;1401}1402return0;1403}14041405inthold_locked_index(struct lock_file *lk,int die_on_error)1406{1407returnhold_lock_file_for_update(lk,get_index_file(),1408 die_on_error1409? LOCK_DIE_ON_ERROR1410:0);1411}14121413intread_index(struct index_state *istate)1414{1415returnread_index_from(istate,get_index_file());1416}14171418static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,1419unsigned int flags,1420const char*name,1421size_t len)1422{1423struct cache_entry *ce =xmalloc(cache_entry_size(len));14241425 ce->ce_stat_data.sd_ctime.sec =get_be32(&ondisk->ctime.sec);1426 ce->ce_stat_data.sd_mtime.sec =get_be32(&ondisk->mtime.sec);1427 ce->ce_stat_data.sd_ctime.nsec =get_be32(&ondisk->ctime.nsec);1428 ce->ce_stat_data.sd_mtime.nsec =get_be32(&ondisk->mtime.nsec);1429 ce->ce_stat_data.sd_dev =get_be32(&ondisk->dev);1430 ce->ce_stat_data.sd_ino =get_be32(&ondisk->ino);1431 ce->ce_mode =get_be32(&ondisk->mode);1432 ce->ce_stat_data.sd_uid =get_be32(&ondisk->uid);1433 ce->ce_stat_data.sd_gid =get_be32(&ondisk->gid);1434 ce->ce_stat_data.sd_size =get_be32(&ondisk->size);1435 ce->ce_flags = flags & ~CE_NAMEMASK;1436 ce->ce_namelen = len;1437 ce->index =0;1438hashcpy(ce->sha1, ondisk->sha1);1439memcpy(ce->name, name, len);1440 ce->name[len] ='\0';1441return ce;1442}14431444/*1445 * Adjacent cache entries tend to share the leading paths, so it makes1446 * sense to only store the differences in later entries. In the v41447 * on-disk format of the index, each on-disk cache entry stores the1448 * number of bytes to be stripped from the end of the previous name,1449 * and the bytes to append to the result, to come up with its name.1450 */1451static unsigned longexpand_name_field(struct strbuf *name,const char*cp_)1452{1453const unsigned char*ep, *cp = (const unsigned char*)cp_;1454size_t len =decode_varint(&cp);14551456if(name->len < len)1457die("malformed name field in the index");1458strbuf_remove(name, name->len - len, len);1459for(ep = cp; *ep; ep++)1460;/* find the end */1461strbuf_add(name, cp, ep - cp);1462return(const char*)ep +1- cp_;1463}14641465static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,1466unsigned long*ent_size,1467struct strbuf *previous_name)1468{1469struct cache_entry *ce;1470size_t len;1471const char*name;1472unsigned int flags;14731474/* On-disk flags are just 16 bits */1475 flags =get_be16(&ondisk->flags);1476 len = flags & CE_NAMEMASK;14771478if(flags & CE_EXTENDED) {1479struct ondisk_cache_entry_extended *ondisk2;1480int extended_flags;1481 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1482 extended_flags =get_be16(&ondisk2->flags2) <<16;1483/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */1484if(extended_flags & ~CE_EXTENDED_FLAGS)1485die("Unknown index entry format%08x", extended_flags);1486 flags |= extended_flags;1487 name = ondisk2->name;1488}1489else1490 name = ondisk->name;14911492if(!previous_name) {1493/* v3 and earlier */1494if(len == CE_NAMEMASK)1495 len =strlen(name);1496 ce =cache_entry_from_ondisk(ondisk, flags, name, len);14971498*ent_size =ondisk_ce_size(ce);1499}else{1500unsigned long consumed;1501 consumed =expand_name_field(previous_name, name);1502 ce =cache_entry_from_ondisk(ondisk, flags,1503 previous_name->buf,1504 previous_name->len);15051506*ent_size = (name - ((char*)ondisk)) + consumed;1507}1508return ce;1509}15101511static voidcheck_ce_order(struct cache_entry *ce,struct cache_entry *next_ce)1512{1513int name_compare =strcmp(ce->name, next_ce->name);1514if(0< name_compare)1515die("unordered stage entries in index");1516if(!name_compare) {1517if(!ce_stage(ce))1518die("multiple stage entries for merged file '%s'",1519 ce->name);1520if(ce_stage(ce) >ce_stage(next_ce))1521die("unordered stage entries for '%s'",1522 ce->name);1523}1524}15251526/* remember to discard_cache() before reading a different cache! */1527intdo_read_index(struct index_state *istate,const char*path,int must_exist)1528{1529int fd, i;1530struct stat st;1531unsigned long src_offset;1532struct cache_header *hdr;1533void*mmap;1534size_t mmap_size;1535struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;15361537if(istate->initialized)1538return istate->cache_nr;15391540 istate->timestamp.sec =0;1541 istate->timestamp.nsec =0;1542 fd =open(path, O_RDONLY);1543if(fd <0) {1544if(!must_exist && errno == ENOENT)1545return0;1546die_errno("%s: index file open failed", path);1547}15481549if(fstat(fd, &st))1550die_errno("cannot stat the open index");15511552 mmap_size =xsize_t(st.st_size);1553if(mmap_size <sizeof(struct cache_header) +20)1554die("index file smaller than expected");15551556 mmap =xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,0);1557if(mmap == MAP_FAILED)1558die_errno("unable to map index file");1559close(fd);15601561 hdr = mmap;1562if(verify_hdr(hdr, mmap_size) <0)1563goto unmap;15641565hashcpy(istate->sha1, (const unsigned char*)hdr + mmap_size -20);1566 istate->version =ntohl(hdr->hdr_version);1567 istate->cache_nr =ntohl(hdr->hdr_entries);1568 istate->cache_alloc =alloc_nr(istate->cache_nr);1569 istate->cache =xcalloc(istate->cache_alloc,sizeof(*istate->cache));1570 istate->initialized =1;15711572if(istate->version ==4)1573 previous_name = &previous_name_buf;1574else1575 previous_name = NULL;15761577 src_offset =sizeof(*hdr);1578for(i =0; i < istate->cache_nr; i++) {1579struct ondisk_cache_entry *disk_ce;1580struct cache_entry *ce;1581unsigned long consumed;15821583 disk_ce = (struct ondisk_cache_entry *)((char*)mmap + src_offset);1584 ce =create_from_disk(disk_ce, &consumed, previous_name);1585set_index_entry(istate, i, ce);15861587if(i >0)1588check_ce_order(istate->cache[i -1], ce);15891590 src_offset += consumed;1591}1592strbuf_release(&previous_name_buf);1593 istate->timestamp.sec = st.st_mtime;1594 istate->timestamp.nsec =ST_MTIME_NSEC(st);15951596while(src_offset <= mmap_size -20-8) {1597/* After an array of active_nr index entries,1598 * there can be arbitrary number of extended1599 * sections, each of which is prefixed with1600 * extension name (4-byte) and section length1601 * in 4-byte network byte order.1602 */1603uint32_t extsize;1604memcpy(&extsize, (char*)mmap + src_offset +4,4);1605 extsize =ntohl(extsize);1606if(read_index_extension(istate,1607(const char*) mmap + src_offset,1608(char*) mmap + src_offset +8,1609 extsize) <0)1610goto unmap;1611 src_offset +=8;1612 src_offset += extsize;1613}1614munmap(mmap, mmap_size);1615return istate->cache_nr;16161617unmap:1618munmap(mmap, mmap_size);1619die("index file corrupt");1620}16211622intread_index_from(struct index_state *istate,const char*path)1623{1624struct split_index *split_index;1625int ret;16261627/* istate->initialized covers both .git/index and .git/sharedindex.xxx */1628if(istate->initialized)1629return istate->cache_nr;16301631 ret =do_read_index(istate, path,0);1632 split_index = istate->split_index;1633if(!split_index)1634return ret;16351636if(is_null_sha1(split_index->base_sha1))1637return ret;16381639if(split_index->base)1640discard_index(split_index->base);1641else1642 split_index->base =xcalloc(1,sizeof(*split_index->base));1643 ret =do_read_index(split_index->base,1644git_path("sharedindex.%s",1645sha1_to_hex(split_index->base_sha1)),1);1646if(hashcmp(split_index->base_sha1, split_index->base->sha1))1647die("broken index, expect%sin%s, got%s",1648sha1_to_hex(split_index->base_sha1),1649git_path("sharedindex.%s",1650sha1_to_hex(split_index->base_sha1)),1651sha1_to_hex(split_index->base->sha1));1652merge_base_index(istate);1653return ret;1654}16551656intis_index_unborn(struct index_state *istate)1657{1658return(!istate->cache_nr && !istate->timestamp.sec);1659}16601661intdiscard_index(struct index_state *istate)1662{1663int i;16641665for(i =0; i < istate->cache_nr; i++) {1666if(istate->cache[i]->index &&1667 istate->split_index &&1668 istate->split_index->base &&1669 istate->cache[i]->index <= istate->split_index->base->cache_nr &&1670 istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index -1])1671continue;1672free(istate->cache[i]);1673}1674resolve_undo_clear_index(istate);1675 istate->cache_nr =0;1676 istate->cache_changed =0;1677 istate->timestamp.sec =0;1678 istate->timestamp.nsec =0;1679free_name_hash(istate);1680cache_tree_free(&(istate->cache_tree));1681 istate->initialized =0;1682free(istate->cache);1683 istate->cache = NULL;1684 istate->cache_alloc =0;1685discard_split_index(istate);1686free_untracked_cache(istate->untracked);1687 istate->untracked = NULL;1688return0;1689}16901691intunmerged_index(const struct index_state *istate)1692{1693int i;1694for(i =0; i < istate->cache_nr; i++) {1695if(ce_stage(istate->cache[i]))1696return1;1697}1698return0;1699}17001701#define WRITE_BUFFER_SIZE 81921702static unsigned char write_buffer[WRITE_BUFFER_SIZE];1703static unsigned long write_buffer_len;17041705static intce_write_flush(git_SHA_CTX *context,int fd)1706{1707unsigned int buffered = write_buffer_len;1708if(buffered) {1709git_SHA1_Update(context, write_buffer, buffered);1710if(write_in_full(fd, write_buffer, buffered) != buffered)1711return-1;1712 write_buffer_len =0;1713}1714return0;1715}17161717static intce_write(git_SHA_CTX *context,int fd,void*data,unsigned int len)1718{1719while(len) {1720unsigned int buffered = write_buffer_len;1721unsigned int partial = WRITE_BUFFER_SIZE - buffered;1722if(partial > len)1723 partial = len;1724memcpy(write_buffer + buffered, data, partial);1725 buffered += partial;1726if(buffered == WRITE_BUFFER_SIZE) {1727 write_buffer_len = buffered;1728if(ce_write_flush(context, fd))1729return-1;1730 buffered =0;1731}1732 write_buffer_len = buffered;1733 len -= partial;1734 data = (char*) data + partial;1735}1736return0;1737}17381739static intwrite_index_ext_header(git_SHA_CTX *context,int fd,1740unsigned int ext,unsigned int sz)1741{1742 ext =htonl(ext);1743 sz =htonl(sz);1744return((ce_write(context, fd, &ext,4) <0) ||1745(ce_write(context, fd, &sz,4) <0)) ? -1:0;1746}17471748static intce_flush(git_SHA_CTX *context,int fd,unsigned char*sha1)1749{1750unsigned int left = write_buffer_len;17511752if(left) {1753 write_buffer_len =0;1754git_SHA1_Update(context, write_buffer, left);1755}17561757/* Flush first if not enough space for SHA1 signature */1758if(left +20> WRITE_BUFFER_SIZE) {1759if(write_in_full(fd, write_buffer, left) != left)1760return-1;1761 left =0;1762}17631764/* Append the SHA1 signature at the end */1765git_SHA1_Final(write_buffer + left, context);1766hashcpy(sha1, write_buffer + left);1767 left +=20;1768return(write_in_full(fd, write_buffer, left) != left) ? -1:0;1769}17701771static voidce_smudge_racily_clean_entry(struct cache_entry *ce)1772{1773/*1774 * The only thing we care about in this function is to smudge the1775 * falsely clean entry due to touch-update-touch race, so we leave1776 * everything else as they are. We are called for entries whose1777 * ce_stat_data.sd_mtime match the index file mtime.1778 *1779 * Note that this actually does not do much for gitlinks, for1780 * which ce_match_stat_basic() always goes to the actual1781 * contents. The caller checks with is_racy_timestamp() which1782 * always says "no" for gitlinks, so we are not called for them ;-)1783 */1784struct stat st;17851786if(lstat(ce->name, &st) <0)1787return;1788if(ce_match_stat_basic(ce, &st))1789return;1790if(ce_modified_check_fs(ce, &st)) {1791/* This is "racily clean"; smudge it. Note that this1792 * is a tricky code. At first glance, it may appear1793 * that it can break with this sequence:1794 *1795 * $ echo xyzzy >frotz1796 * $ git-update-index --add frotz1797 * $ : >frotz1798 * $ sleep 31799 * $ echo filfre >nitfol1800 * $ git-update-index --add nitfol1801 *1802 * but it does not. When the second update-index runs,1803 * it notices that the entry "frotz" has the same timestamp1804 * as index, and if we were to smudge it by resetting its1805 * size to zero here, then the object name recorded1806 * in index is the 6-byte file but the cached stat information1807 * becomes zero --- which would then match what we would1808 * obtain from the filesystem next time we stat("frotz").1809 *1810 * However, the second update-index, before calling1811 * this function, notices that the cached size is 61812 * bytes and what is on the filesystem is an empty1813 * file, and never calls us, so the cached size information1814 * for "frotz" stays 6 which does not match the filesystem.1815 */1816 ce->ce_stat_data.sd_size =0;1817}1818}18191820/* Copy miscellaneous fields but not the name */1821static char*copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,1822struct cache_entry *ce)1823{1824short flags;18251826 ondisk->ctime.sec =htonl(ce->ce_stat_data.sd_ctime.sec);1827 ondisk->mtime.sec =htonl(ce->ce_stat_data.sd_mtime.sec);1828 ondisk->ctime.nsec =htonl(ce->ce_stat_data.sd_ctime.nsec);1829 ondisk->mtime.nsec =htonl(ce->ce_stat_data.sd_mtime.nsec);1830 ondisk->dev =htonl(ce->ce_stat_data.sd_dev);1831 ondisk->ino =htonl(ce->ce_stat_data.sd_ino);1832 ondisk->mode =htonl(ce->ce_mode);1833 ondisk->uid =htonl(ce->ce_stat_data.sd_uid);1834 ondisk->gid =htonl(ce->ce_stat_data.sd_gid);1835 ondisk->size =htonl(ce->ce_stat_data.sd_size);1836hashcpy(ondisk->sha1, ce->sha1);18371838 flags = ce->ce_flags & ~CE_NAMEMASK;1839 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK :ce_namelen(ce));1840 ondisk->flags =htons(flags);1841if(ce->ce_flags & CE_EXTENDED) {1842struct ondisk_cache_entry_extended *ondisk2;1843 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1844 ondisk2->flags2 =htons((ce->ce_flags & CE_EXTENDED_FLAGS) >>16);1845return ondisk2->name;1846}1847else{1848return ondisk->name;1849}1850}18511852static intce_write_entry(git_SHA_CTX *c,int fd,struct cache_entry *ce,1853struct strbuf *previous_name)1854{1855int size;1856struct ondisk_cache_entry *ondisk;1857int saved_namelen = saved_namelen;/* compiler workaround */1858char*name;1859int result;18601861if(ce->ce_flags & CE_STRIP_NAME) {1862 saved_namelen =ce_namelen(ce);1863 ce->ce_namelen =0;1864}18651866if(!previous_name) {1867 size =ondisk_ce_size(ce);1868 ondisk =xcalloc(1, size);1869 name =copy_cache_entry_to_ondisk(ondisk, ce);1870memcpy(name, ce->name,ce_namelen(ce));1871}else{1872int common, to_remove, prefix_size;1873unsigned char to_remove_vi[16];1874for(common =0;1875(ce->name[common] &&1876 common < previous_name->len &&1877 ce->name[common] == previous_name->buf[common]);1878 common++)1879;/* still matching */1880 to_remove = previous_name->len - common;1881 prefix_size =encode_varint(to_remove, to_remove_vi);18821883if(ce->ce_flags & CE_EXTENDED)1884 size =offsetof(struct ondisk_cache_entry_extended, name);1885else1886 size =offsetof(struct ondisk_cache_entry, name);1887 size += prefix_size + (ce_namelen(ce) - common +1);18881889 ondisk =xcalloc(1, size);1890 name =copy_cache_entry_to_ondisk(ondisk, ce);1891memcpy(name, to_remove_vi, prefix_size);1892memcpy(name + prefix_size, ce->name + common,ce_namelen(ce) - common);18931894strbuf_splice(previous_name, common, to_remove,1895 ce->name + common,ce_namelen(ce) - common);1896}1897if(ce->ce_flags & CE_STRIP_NAME) {1898 ce->ce_namelen = saved_namelen;1899 ce->ce_flags &= ~CE_STRIP_NAME;1900}19011902 result =ce_write(c, fd, ondisk, size);1903free(ondisk);1904return result;1905}19061907/*1908 * This function verifies if index_state has the correct sha1 of the1909 * index file. Don't die if we have any other failure, just return 0.1910 */1911static intverify_index_from(const struct index_state *istate,const char*path)1912{1913int fd;1914 ssize_t n;1915struct stat st;1916unsigned char sha1[20];19171918if(!istate->initialized)1919return0;19201921 fd =open(path, O_RDONLY);1922if(fd <0)1923return0;19241925if(fstat(fd, &st))1926goto out;19271928if(st.st_size <sizeof(struct cache_header) +20)1929goto out;19301931 n =pread_in_full(fd, sha1,20, st.st_size -20);1932if(n !=20)1933goto out;19341935if(hashcmp(istate->sha1, sha1))1936goto out;19371938close(fd);1939return1;19401941out:1942close(fd);1943return0;1944}19451946static intverify_index(const struct index_state *istate)1947{1948returnverify_index_from(istate,get_index_file());1949}19501951static inthas_racy_timestamp(struct index_state *istate)1952{1953int entries = istate->cache_nr;1954int i;19551956for(i =0; i < entries; i++) {1957struct cache_entry *ce = istate->cache[i];1958if(is_racy_timestamp(istate, ce))1959return1;1960}1961return0;1962}19631964/*1965 * Opportunistically update the index but do not complain if we can't1966 */1967voidupdate_index_if_able(struct index_state *istate,struct lock_file *lockfile)1968{1969if((istate->cache_changed ||has_racy_timestamp(istate)) &&1970verify_index(istate) &&1971write_locked_index(istate, lockfile, COMMIT_LOCK))1972rollback_lock_file(lockfile);1973}19741975static intdo_write_index(struct index_state *istate,int newfd,1976int strip_extensions)1977{1978 git_SHA_CTX c;1979struct cache_header hdr;1980int i, err, removed, extended, hdr_version;1981struct cache_entry **cache = istate->cache;1982int entries = istate->cache_nr;1983struct stat st;1984struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;19851986for(i = removed = extended =0; i < entries; i++) {1987if(cache[i]->ce_flags & CE_REMOVE)1988 removed++;19891990/* reduce extended entries if possible */1991 cache[i]->ce_flags &= ~CE_EXTENDED;1992if(cache[i]->ce_flags & CE_EXTENDED_FLAGS) {1993 extended++;1994 cache[i]->ce_flags |= CE_EXTENDED;1995}1996}19971998if(!istate->version) {1999 istate->version =get_index_format_default();2000if(getenv("GIT_TEST_SPLIT_INDEX"))2001init_split_index(istate);2002}20032004/* demote version 3 to version 2 when the latter suffices */2005if(istate->version ==3|| istate->version ==2)2006 istate->version = extended ?3:2;20072008 hdr_version = istate->version;20092010 hdr.hdr_signature =htonl(CACHE_SIGNATURE);2011 hdr.hdr_version =htonl(hdr_version);2012 hdr.hdr_entries =htonl(entries - removed);20132014git_SHA1_Init(&c);2015if(ce_write(&c, newfd, &hdr,sizeof(hdr)) <0)2016return-1;20172018 previous_name = (hdr_version ==4) ? &previous_name_buf : NULL;2019for(i =0; i < entries; i++) {2020struct cache_entry *ce = cache[i];2021if(ce->ce_flags & CE_REMOVE)2022continue;2023if(!ce_uptodate(ce) &&is_racy_timestamp(istate, ce))2024ce_smudge_racily_clean_entry(ce);2025if(is_null_sha1(ce->sha1)) {2026static const char msg[] ="cache entry has null sha1:%s";2027static int allow = -1;20282029if(allow <0)2030 allow =git_env_bool("GIT_ALLOW_NULL_SHA1",0);2031if(allow)2032warning(msg, ce->name);2033else2034returnerror(msg, ce->name);2035}2036if(ce_write_entry(&c, newfd, ce, previous_name) <0)2037return-1;2038}2039strbuf_release(&previous_name_buf);20402041/* Write extension data here */2042if(!strip_extensions && istate->split_index) {2043struct strbuf sb = STRBUF_INIT;20442045 err =write_link_extension(&sb, istate) <0||2046write_index_ext_header(&c, newfd, CACHE_EXT_LINK,2047 sb.len) <0||2048ce_write(&c, newfd, sb.buf, sb.len) <0;2049strbuf_release(&sb);2050if(err)2051return-1;2052}2053if(!strip_extensions && istate->cache_tree) {2054struct strbuf sb = STRBUF_INIT;20552056cache_tree_write(&sb, istate->cache_tree);2057 err =write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) <02058||ce_write(&c, newfd, sb.buf, sb.len) <0;2059strbuf_release(&sb);2060if(err)2061return-1;2062}2063if(!strip_extensions && istate->resolve_undo) {2064struct strbuf sb = STRBUF_INIT;20652066resolve_undo_write(&sb, istate->resolve_undo);2067 err =write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,2068 sb.len) <02069||ce_write(&c, newfd, sb.buf, sb.len) <0;2070strbuf_release(&sb);2071if(err)2072return-1;2073}2074if(!strip_extensions && istate->untracked) {2075struct strbuf sb = STRBUF_INIT;20762077write_untracked_extension(&sb, istate->untracked);2078 err =write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED,2079 sb.len) <0||2080ce_write(&c, newfd, sb.buf, sb.len) <0;2081strbuf_release(&sb);2082if(err)2083return-1;2084}20852086if(ce_flush(&c, newfd, istate->sha1) ||fstat(newfd, &st))2087return-1;2088 istate->timestamp.sec = (unsigned int)st.st_mtime;2089 istate->timestamp.nsec =ST_MTIME_NSEC(st);2090return0;2091}20922093voidset_alternate_index_output(const char*name)2094{2095 alternate_index_output = name;2096}20972098static intcommit_locked_index(struct lock_file *lk)2099{2100if(alternate_index_output)2101returncommit_lock_file_to(lk, alternate_index_output);2102else2103returncommit_lock_file(lk);2104}21052106static intdo_write_locked_index(struct index_state *istate,struct lock_file *lock,2107unsigned flags)2108{2109int ret =do_write_index(istate, lock->fd,0);2110if(ret)2111return ret;2112assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=2113(COMMIT_LOCK | CLOSE_LOCK));2114if(flags & COMMIT_LOCK)2115returncommit_locked_index(lock);2116else if(flags & CLOSE_LOCK)2117returnclose_lock_file(lock);2118else2119return ret;2120}21212122static intwrite_split_index(struct index_state *istate,2123struct lock_file *lock,2124unsigned flags)2125{2126int ret;2127prepare_to_write_split_index(istate);2128 ret =do_write_locked_index(istate, lock, flags);2129finish_writing_split_index(istate);2130return ret;2131}21322133static char*temporary_sharedindex;21342135static voidremove_temporary_sharedindex(void)2136{2137if(temporary_sharedindex) {2138unlink_or_warn(temporary_sharedindex);2139free(temporary_sharedindex);2140 temporary_sharedindex = NULL;2141}2142}21432144static voidremove_temporary_sharedindex_on_signal(int signo)2145{2146remove_temporary_sharedindex();2147sigchain_pop(signo);2148raise(signo);2149}21502151static intwrite_shared_index(struct index_state *istate,2152struct lock_file *lock,unsigned flags)2153{2154struct split_index *si = istate->split_index;2155static int installed_handler;2156int fd, ret;21572158 temporary_sharedindex =git_pathdup("sharedindex_XXXXXX");2159 fd =mkstemp(temporary_sharedindex);2160if(fd <0) {2161free(temporary_sharedindex);2162 temporary_sharedindex = NULL;2163hashclr(si->base_sha1);2164returndo_write_locked_index(istate, lock, flags);2165}2166if(!installed_handler) {2167atexit(remove_temporary_sharedindex);2168sigchain_push_common(remove_temporary_sharedindex_on_signal);2169}2170move_cache_to_base_index(istate);2171 ret =do_write_index(si->base, fd,1);2172close(fd);2173if(ret) {2174remove_temporary_sharedindex();2175return ret;2176}2177 ret =rename(temporary_sharedindex,2178git_path("sharedindex.%s",sha1_to_hex(si->base->sha1)));2179free(temporary_sharedindex);2180 temporary_sharedindex = NULL;2181if(!ret)2182hashcpy(si->base_sha1, si->base->sha1);2183return ret;2184}21852186intwrite_locked_index(struct index_state *istate,struct lock_file *lock,2187unsigned flags)2188{2189struct split_index *si = istate->split_index;21902191if(!si || alternate_index_output ||2192(istate->cache_changed & ~EXTMASK)) {2193if(si)2194hashclr(si->base_sha1);2195returndo_write_locked_index(istate, lock, flags);2196}21972198if(getenv("GIT_TEST_SPLIT_INDEX")) {2199int v = si->base_sha1[0];2200if((v &15) <6)2201 istate->cache_changed |= SPLIT_INDEX_ORDERED;2202}2203if(istate->cache_changed & SPLIT_INDEX_ORDERED) {2204int ret =write_shared_index(istate, lock, flags);2205if(ret)2206return ret;2207}22082209returnwrite_split_index(istate, lock, flags);2210}22112212/*2213 * Read the index file that is potentially unmerged into given2214 * index_state, dropping any unmerged entries. Returns true if2215 * the index is unmerged. Callers who want to refuse to work2216 * from an unmerged state can call this and check its return value,2217 * instead of calling read_cache().2218 */2219intread_index_unmerged(struct index_state *istate)2220{2221int i;2222int unmerged =0;22232224read_index(istate);2225for(i =0; i < istate->cache_nr; i++) {2226struct cache_entry *ce = istate->cache[i];2227struct cache_entry *new_ce;2228int size, len;22292230if(!ce_stage(ce))2231continue;2232 unmerged =1;2233 len =ce_namelen(ce);2234 size =cache_entry_size(len);2235 new_ce =xcalloc(1, size);2236memcpy(new_ce->name, ce->name, len);2237 new_ce->ce_flags =create_ce_flags(0) | CE_CONFLICTED;2238 new_ce->ce_namelen = len;2239 new_ce->ce_mode = ce->ce_mode;2240if(add_index_entry(istate, new_ce,0))2241returnerror("%s: cannot drop to stage #0",2242 new_ce->name);2243}2244return unmerged;2245}22462247/*2248 * Returns 1 if the path is an "other" path with respect to2249 * the index; that is, the path is not mentioned in the index at all,2250 * either as a file, a directory with some files in the index,2251 * or as an unmerged entry.2252 *2253 * We helpfully remove a trailing "/" from directories so that2254 * the output of read_directory can be used as-is.2255 */2256intindex_name_is_other(const struct index_state *istate,const char*name,2257int namelen)2258{2259int pos;2260if(namelen && name[namelen -1] =='/')2261 namelen--;2262 pos =index_name_pos(istate, name, namelen);2263if(0<= pos)2264return0;/* exact match */2265 pos = -pos -1;2266if(pos < istate->cache_nr) {2267struct cache_entry *ce = istate->cache[pos];2268if(ce_namelen(ce) == namelen &&2269!memcmp(ce->name, name, namelen))2270return0;/* Yup, this one exists unmerged */2271}2272return1;2273}22742275void*read_blob_data_from_index(struct index_state *istate,const char*path,unsigned long*size)2276{2277int pos, len;2278unsigned long sz;2279enum object_type type;2280void*data;22812282 len =strlen(path);2283 pos =index_name_pos(istate, path, len);2284if(pos <0) {2285/*2286 * We might be in the middle of a merge, in which2287 * case we would read stage #2 (ours).2288 */2289int i;2290for(i = -pos -1;2291(pos <0&& i < istate->cache_nr &&2292!strcmp(istate->cache[i]->name, path));2293 i++)2294if(ce_stage(istate->cache[i]) ==2)2295 pos = i;2296}2297if(pos <0)2298return NULL;2299 data =read_sha1_file(istate->cache[pos]->sha1, &type, &sz);2300if(!data || type != OBJ_BLOB) {2301free(data);2302return NULL;2303}2304if(size)2305*size = sz;2306return data;2307}23082309voidstat_validity_clear(struct stat_validity *sv)2310{2311free(sv->sd);2312 sv->sd = NULL;2313}23142315intstat_validity_check(struct stat_validity *sv,const char*path)2316{2317struct stat st;23182319if(stat(path, &st) <0)2320return sv->sd == NULL;2321if(!sv->sd)2322return0;2323returnS_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);2324}23252326voidstat_validity_update(struct stat_validity *sv,int fd)2327{2328struct stat st;23292330if(fstat(fd, &st) <0|| !S_ISREG(st.st_mode))2331stat_validity_clear(sv);2332else{2333if(!sv->sd)2334 sv->sd =xcalloc(1,sizeof(struct stat_data));2335fill_stat_data(sv->sd, &st);2336}2337}