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 */ 701if(!S_ISGITLINK(alias->ce_mode)) 702ce_mark_uptodate(alias); 703 alias->ce_flags |= CE_ADDED; 704 705free(ce); 706return0; 707} 708if(!intent_only) { 709if(index_path(ce->sha1, path, st, HASH_WRITE_OBJECT)) { 710free(ce); 711returnerror("unable to index file%s", path); 712} 713}else 714set_object_name_for_intent_to_add_entry(ce); 715 716if(ignore_case && alias &&different_name(ce, alias)) 717 ce =create_alias_ce(istate, ce, alias); 718 ce->ce_flags |= CE_ADDED; 719 720/* It was suspected to be racily clean, but it turns out to be Ok */ 721 was_same = (alias && 722!ce_stage(alias) && 723!hashcmp(alias->sha1, ce->sha1) && 724 ce->ce_mode == alias->ce_mode); 725 726if(pretend) 727free(ce); 728else if(add_index_entry(istate, ce, add_option)) { 729free(ce); 730returnerror("unable to add%sto index", path); 731} 732if(verbose && !was_same) 733printf("add '%s'\n", path); 734return0; 735} 736 737intadd_file_to_index(struct index_state *istate,const char*path,int flags) 738{ 739struct stat st; 740if(lstat(path, &st)) 741die_errno("unable to stat '%s'", path); 742returnadd_to_index(istate, path, &st, flags); 743} 744 745struct cache_entry *make_cache_entry(unsigned int mode, 746const unsigned char*sha1,const char*path,int stage, 747unsigned int refresh_options) 748{ 749int size, len; 750struct cache_entry *ce, *ret; 751 752if(!verify_path(path)) { 753error("Invalid path '%s'", path); 754return NULL; 755} 756 757 len =strlen(path); 758 size =cache_entry_size(len); 759 ce =xcalloc(1, size); 760 761hashcpy(ce->sha1, sha1); 762memcpy(ce->name, path, len); 763 ce->ce_flags =create_ce_flags(stage); 764 ce->ce_namelen = len; 765 ce->ce_mode =create_ce_mode(mode); 766 767 ret =refresh_cache_entry(ce, refresh_options); 768if(ret != ce) 769free(ce); 770return ret; 771} 772 773intce_same_name(const struct cache_entry *a,const struct cache_entry *b) 774{ 775int len =ce_namelen(a); 776returnce_namelen(b) == len && !memcmp(a->name, b->name, len); 777} 778 779/* 780 * We fundamentally don't like some paths: we don't want 781 * dot or dot-dot anywhere, and for obvious reasons don't 782 * want to recurse into ".git" either. 783 * 784 * Also, we don't want double slashes or slashes at the 785 * end that can make pathnames ambiguous. 786 */ 787static intverify_dotfile(const char*rest) 788{ 789/* 790 * The first character was '.', but that 791 * has already been discarded, we now test 792 * the rest. 793 */ 794 795/* "." is not allowed */ 796if(*rest =='\0'||is_dir_sep(*rest)) 797return0; 798 799switch(*rest) { 800/* 801 * ".git" followed by NUL or slash is bad. This 802 * shares the path end test with the ".." case. 803 */ 804case'g': 805case'G': 806if(rest[1] !='i'&& rest[1] !='I') 807break; 808if(rest[2] !='t'&& rest[2] !='T') 809break; 810 rest +=2; 811/* fallthrough */ 812case'.': 813if(rest[1] =='\0'||is_dir_sep(rest[1])) 814return0; 815} 816return1; 817} 818 819intverify_path(const char*path) 820{ 821char c; 822 823if(has_dos_drive_prefix(path)) 824return0; 825 826goto inside; 827for(;;) { 828if(!c) 829return1; 830if(is_dir_sep(c)) { 831inside: 832if(protect_hfs &&is_hfs_dotgit(path)) 833return0; 834if(protect_ntfs &&is_ntfs_dotgit(path)) 835return0; 836 c = *path++; 837if((c =='.'&& !verify_dotfile(path)) || 838is_dir_sep(c) || c =='\0') 839return0; 840} 841 c = *path++; 842} 843} 844 845/* 846 * Do we have another file that has the beginning components being a 847 * proper superset of the name we're trying to add? 848 */ 849static inthas_file_name(struct index_state *istate, 850const struct cache_entry *ce,int pos,int ok_to_replace) 851{ 852int retval =0; 853int len =ce_namelen(ce); 854int stage =ce_stage(ce); 855const char*name = ce->name; 856 857while(pos < istate->cache_nr) { 858struct cache_entry *p = istate->cache[pos++]; 859 860if(len >=ce_namelen(p)) 861break; 862if(memcmp(name, p->name, len)) 863break; 864if(ce_stage(p) != stage) 865continue; 866if(p->name[len] !='/') 867continue; 868if(p->ce_flags & CE_REMOVE) 869continue; 870 retval = -1; 871if(!ok_to_replace) 872break; 873remove_index_entry_at(istate, --pos); 874} 875return retval; 876} 877 878/* 879 * Do we have another file with a pathname that is a proper 880 * subset of the name we're trying to add? 881 */ 882static inthas_dir_name(struct index_state *istate, 883const struct cache_entry *ce,int pos,int ok_to_replace) 884{ 885int retval =0; 886int stage =ce_stage(ce); 887const char*name = ce->name; 888const char*slash = name +ce_namelen(ce); 889 890for(;;) { 891int len; 892 893for(;;) { 894if(*--slash =='/') 895break; 896if(slash <= ce->name) 897return retval; 898} 899 len = slash - name; 900 901 pos =index_name_stage_pos(istate, name, len, stage); 902if(pos >=0) { 903/* 904 * Found one, but not so fast. This could 905 * be a marker that says "I was here, but 906 * I am being removed". Such an entry is 907 * not a part of the resulting tree, and 908 * it is Ok to have a directory at the same 909 * path. 910 */ 911if(!(istate->cache[pos]->ce_flags & CE_REMOVE)) { 912 retval = -1; 913if(!ok_to_replace) 914break; 915remove_index_entry_at(istate, pos); 916continue; 917} 918} 919else 920 pos = -pos-1; 921 922/* 923 * Trivial optimization: if we find an entry that 924 * already matches the sub-directory, then we know 925 * we're ok, and we can exit. 926 */ 927while(pos < istate->cache_nr) { 928struct cache_entry *p = istate->cache[pos]; 929if((ce_namelen(p) <= len) || 930(p->name[len] !='/') || 931memcmp(p->name, name, len)) 932break;/* not our subdirectory */ 933if(ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) 934/* 935 * p is at the same stage as our entry, and 936 * is a subdirectory of what we are looking 937 * at, so we cannot have conflicts at our 938 * level or anything shorter. 939 */ 940return retval; 941 pos++; 942} 943} 944return retval; 945} 946 947/* We may be in a situation where we already have path/file and path 948 * is being added, or we already have path and path/file is being 949 * added. Either one would result in a nonsense tree that has path 950 * twice when git-write-tree tries to write it out. Prevent it. 951 * 952 * If ok-to-replace is specified, we remove the conflicting entries 953 * from the cache so the caller should recompute the insert position. 954 * When this happens, we return non-zero. 955 */ 956static intcheck_file_directory_conflict(struct index_state *istate, 957const struct cache_entry *ce, 958int pos,int ok_to_replace) 959{ 960int retval; 961 962/* 963 * When ce is an "I am going away" entry, we allow it to be added 964 */ 965if(ce->ce_flags & CE_REMOVE) 966return0; 967 968/* 969 * We check if the path is a sub-path of a subsequent pathname 970 * first, since removing those will not change the position 971 * in the array. 972 */ 973 retval =has_file_name(istate, ce, pos, ok_to_replace); 974 975/* 976 * Then check if the path might have a clashing sub-directory 977 * before it. 978 */ 979return retval +has_dir_name(istate, ce, pos, ok_to_replace); 980} 981 982static intadd_index_entry_with_check(struct index_state *istate,struct cache_entry *ce,int option) 983{ 984int pos; 985int ok_to_add = option & ADD_CACHE_OK_TO_ADD; 986int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; 987int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; 988int new_only = option & ADD_CACHE_NEW_ONLY; 989 990if(!(option & ADD_CACHE_KEEP_CACHE_TREE)) 991cache_tree_invalidate_path(istate, ce->name); 992 pos =index_name_stage_pos(istate, ce->name,ce_namelen(ce),ce_stage(ce)); 993 994/* existing match? Just replace it. */ 995if(pos >=0) { 996if(!new_only) 997replace_index_entry(istate, pos, ce); 998return0; 999}1000 pos = -pos-1;10011002untracked_cache_add_to_index(istate, ce->name);10031004/*1005 * Inserting a merged entry ("stage 0") into the index1006 * will always replace all non-merged entries..1007 */1008if(pos < istate->cache_nr &&ce_stage(ce) ==0) {1009while(ce_same_name(istate->cache[pos], ce)) {1010 ok_to_add =1;1011if(!remove_index_entry_at(istate, pos))1012break;1013}1014}10151016if(!ok_to_add)1017return-1;1018if(!verify_path(ce->name))1019returnerror("Invalid path '%s'", ce->name);10201021if(!skip_df_check &&1022check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {1023if(!ok_to_replace)1024returnerror("'%s' appears as both a file and as a directory",1025 ce->name);1026 pos =index_name_stage_pos(istate, ce->name,ce_namelen(ce),ce_stage(ce));1027 pos = -pos-1;1028}1029return pos +1;1030}10311032intadd_index_entry(struct index_state *istate,struct cache_entry *ce,int option)1033{1034int pos;10351036if(option & ADD_CACHE_JUST_APPEND)1037 pos = istate->cache_nr;1038else{1039int ret;1040 ret =add_index_entry_with_check(istate, ce, option);1041if(ret <=0)1042return ret;1043 pos = ret -1;1044}10451046/* Make sure the array is big enough .. */1047ALLOC_GROW(istate->cache, istate->cache_nr +1, istate->cache_alloc);10481049/* Add it in.. */1050 istate->cache_nr++;1051if(istate->cache_nr > pos +1)1052memmove(istate->cache + pos +1,1053 istate->cache + pos,1054(istate->cache_nr - pos -1) *sizeof(ce));1055set_index_entry(istate, pos, ce);1056 istate->cache_changed |= CE_ENTRY_ADDED;1057return0;1058}10591060/*1061 * "refresh" does not calculate a new sha1 file or bring the1062 * cache up-to-date for mode/content changes. But what it1063 * _does_ do is to "re-match" the stat information of a file1064 * with the cache, so that you can refresh the cache for a1065 * file that hasn't been changed but where the stat entry is1066 * out of date.1067 *1068 * For example, you'd want to do this after doing a "git-read-tree",1069 * to link up the stat cache details with the proper files.1070 */1071static struct cache_entry *refresh_cache_ent(struct index_state *istate,1072struct cache_entry *ce,1073unsigned int options,int*err,1074int*changed_ret)1075{1076struct stat st;1077struct cache_entry *updated;1078int changed, size;1079int refresh = options & CE_MATCH_REFRESH;1080int ignore_valid = options & CE_MATCH_IGNORE_VALID;1081int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;1082int ignore_missing = options & CE_MATCH_IGNORE_MISSING;10831084if(!refresh ||ce_uptodate(ce))1085return ce;10861087/*1088 * CE_VALID or CE_SKIP_WORKTREE means the user promised us1089 * that the change to the work tree does not matter and told1090 * us not to worry.1091 */1092if(!ignore_skip_worktree &&ce_skip_worktree(ce)) {1093ce_mark_uptodate(ce);1094return ce;1095}1096if(!ignore_valid && (ce->ce_flags & CE_VALID)) {1097ce_mark_uptodate(ce);1098return ce;1099}11001101if(has_symlink_leading_path(ce->name,ce_namelen(ce))) {1102if(ignore_missing)1103return ce;1104if(err)1105*err = ENOENT;1106return NULL;1107}11081109if(lstat(ce->name, &st) <0) {1110if(ignore_missing && errno == ENOENT)1111return ce;1112if(err)1113*err = errno;1114return NULL;1115}11161117 changed =ie_match_stat(istate, ce, &st, options);1118if(changed_ret)1119*changed_ret = changed;1120if(!changed) {1121/*1122 * The path is unchanged. If we were told to ignore1123 * valid bit, then we did the actual stat check and1124 * found that the entry is unmodified. If the entry1125 * is not marked VALID, this is the place to mark it1126 * valid again, under "assume unchanged" mode.1127 */1128if(ignore_valid && assume_unchanged &&1129!(ce->ce_flags & CE_VALID))1130;/* mark this one VALID again */1131else{1132/*1133 * We do not mark the index itself "modified"1134 * because CE_UPTODATE flag is in-core only;1135 * we are not going to write this change out.1136 */1137if(!S_ISGITLINK(ce->ce_mode))1138ce_mark_uptodate(ce);1139return ce;1140}1141}11421143if(ie_modified(istate, ce, &st, options)) {1144if(err)1145*err = EINVAL;1146return NULL;1147}11481149 size =ce_size(ce);1150 updated =xmalloc(size);1151memcpy(updated, ce, size);1152fill_stat_cache_info(updated, &st);1153/*1154 * If ignore_valid is not set, we should leave CE_VALID bit1155 * alone. Otherwise, paths marked with --no-assume-unchanged1156 * (i.e. things to be edited) will reacquire CE_VALID bit1157 * automatically, which is not really what we want.1158 */1159if(!ignore_valid && assume_unchanged &&1160!(ce->ce_flags & CE_VALID))1161 updated->ce_flags &= ~CE_VALID;11621163/* istate->cache_changed is updated in the caller */1164return updated;1165}11661167static voidshow_file(const char* fmt,const char* name,int in_porcelain,1168int* first,const char*header_msg)1169{1170if(in_porcelain && *first && header_msg) {1171printf("%s\n", header_msg);1172*first =0;1173}1174printf(fmt, name);1175}11761177intrefresh_index(struct index_state *istate,unsigned int flags,1178const struct pathspec *pathspec,1179char*seen,const char*header_msg)1180{1181int i;1182int has_errors =0;1183int really = (flags & REFRESH_REALLY) !=0;1184int allow_unmerged = (flags & REFRESH_UNMERGED) !=0;1185int quiet = (flags & REFRESH_QUIET) !=0;1186int not_new = (flags & REFRESH_IGNORE_MISSING) !=0;1187int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) !=0;1188int first =1;1189int in_porcelain = (flags & REFRESH_IN_PORCELAIN);1190unsigned int options = (CE_MATCH_REFRESH |1191(really ? CE_MATCH_IGNORE_VALID :0) |1192(not_new ? CE_MATCH_IGNORE_MISSING :0));1193const char*modified_fmt;1194const char*deleted_fmt;1195const char*typechange_fmt;1196const char*added_fmt;1197const char*unmerged_fmt;11981199 modified_fmt = (in_porcelain ?"M\t%s\n":"%s: needs update\n");1200 deleted_fmt = (in_porcelain ?"D\t%s\n":"%s: needs update\n");1201 typechange_fmt = (in_porcelain ?"T\t%s\n":"%sneeds update\n");1202 added_fmt = (in_porcelain ?"A\t%s\n":"%sneeds update\n");1203 unmerged_fmt = (in_porcelain ?"U\t%s\n":"%s: needs merge\n");1204for(i =0; i < istate->cache_nr; i++) {1205struct cache_entry *ce, *new;1206int cache_errno =0;1207int changed =0;1208int filtered =0;12091210 ce = istate->cache[i];1211if(ignore_submodules &&S_ISGITLINK(ce->ce_mode))1212continue;12131214if(pathspec && !ce_path_match(ce, pathspec, seen))1215 filtered =1;12161217if(ce_stage(ce)) {1218while((i < istate->cache_nr) &&1219!strcmp(istate->cache[i]->name, ce->name))1220 i++;1221 i--;1222if(allow_unmerged)1223continue;1224if(!filtered)1225show_file(unmerged_fmt, ce->name, in_porcelain,1226&first, header_msg);1227 has_errors =1;1228continue;1229}12301231if(filtered)1232continue;12331234new=refresh_cache_ent(istate, ce, options, &cache_errno, &changed);1235if(new== ce)1236continue;1237if(!new) {1238const char*fmt;12391240if(really && cache_errno == EINVAL) {1241/* If we are doing --really-refresh that1242 * means the index is not valid anymore.1243 */1244 ce->ce_flags &= ~CE_VALID;1245 ce->ce_flags |= CE_UPDATE_IN_BASE;1246 istate->cache_changed |= CE_ENTRY_CHANGED;1247}1248if(quiet)1249continue;12501251if(cache_errno == ENOENT)1252 fmt = deleted_fmt;1253else if(ce->ce_flags & CE_INTENT_TO_ADD)1254 fmt = added_fmt;/* must be before other checks */1255else if(changed & TYPE_CHANGED)1256 fmt = typechange_fmt;1257else1258 fmt = modified_fmt;1259show_file(fmt,1260 ce->name, in_porcelain, &first, header_msg);1261 has_errors =1;1262continue;1263}12641265replace_index_entry(istate, i,new);1266}1267return has_errors;1268}12691270static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,1271unsigned int options)1272{1273returnrefresh_cache_ent(&the_index, ce, options, NULL, NULL);1274}127512761277/*****************************************************************1278 * Index File I/O1279 *****************************************************************/12801281#define INDEX_FORMAT_DEFAULT 312821283static unsigned intget_index_format_default(void)1284{1285char*envversion =getenv("GIT_INDEX_VERSION");1286char*endp;1287int value;1288unsigned int version = INDEX_FORMAT_DEFAULT;12891290if(!envversion) {1291if(!git_config_get_int("index.version", &value))1292 version = value;1293if(version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {1294warning(_("index.version set, but the value is invalid.\n"1295"Using version%i"), INDEX_FORMAT_DEFAULT);1296return INDEX_FORMAT_DEFAULT;1297}1298return version;1299}13001301 version =strtoul(envversion, &endp,10);1302if(*endp ||1303 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {1304warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"1305"Using version%i"), INDEX_FORMAT_DEFAULT);1306 version = INDEX_FORMAT_DEFAULT;1307}1308return version;1309}13101311/*1312 * dev/ino/uid/gid/size are also just tracked to the low 32 bits1313 * Again - this is just a (very strong in practice) heuristic that1314 * the inode hasn't changed.1315 *1316 * We save the fields in big-endian order to allow using the1317 * index file over NFS transparently.1318 */1319struct ondisk_cache_entry {1320struct cache_time ctime;1321struct cache_time mtime;1322uint32_t dev;1323uint32_t ino;1324uint32_t mode;1325uint32_t uid;1326uint32_t gid;1327uint32_t size;1328unsigned char sha1[20];1329uint16_t flags;1330char name[FLEX_ARRAY];/* more */1331};13321333/*1334 * This struct is used when CE_EXTENDED bit is 11335 * The struct must match ondisk_cache_entry exactly from1336 * ctime till flags1337 */1338struct ondisk_cache_entry_extended {1339struct cache_time ctime;1340struct cache_time mtime;1341uint32_t dev;1342uint32_t ino;1343uint32_t mode;1344uint32_t uid;1345uint32_t gid;1346uint32_t size;1347unsigned char sha1[20];1348uint16_t flags;1349uint16_t flags2;1350char name[FLEX_ARRAY];/* more */1351};13521353/* These are only used for v3 or lower */1354#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)1355#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)1356#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)1357#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \1358 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \1359 ondisk_cache_entry_size(ce_namelen(ce)))13601361static intverify_hdr(struct cache_header *hdr,unsigned long size)1362{1363 git_SHA_CTX c;1364unsigned char sha1[20];1365int hdr_version;13661367if(hdr->hdr_signature !=htonl(CACHE_SIGNATURE))1368returnerror("bad signature");1369 hdr_version =ntohl(hdr->hdr_version);1370if(hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)1371returnerror("bad index version%d", hdr_version);1372git_SHA1_Init(&c);1373git_SHA1_Update(&c, hdr, size -20);1374git_SHA1_Final(sha1, &c);1375if(hashcmp(sha1, (unsigned char*)hdr + size -20))1376returnerror("bad index file sha1 signature");1377return0;1378}13791380static intread_index_extension(struct index_state *istate,1381const char*ext,void*data,unsigned long sz)1382{1383switch(CACHE_EXT(ext)) {1384case CACHE_EXT_TREE:1385 istate->cache_tree =cache_tree_read(data, sz);1386break;1387case CACHE_EXT_RESOLVE_UNDO:1388 istate->resolve_undo =resolve_undo_read(data, sz);1389break;1390case CACHE_EXT_LINK:1391if(read_link_extension(istate, data, sz))1392return-1;1393break;1394case CACHE_EXT_UNTRACKED:1395 istate->untracked =read_untracked_extension(data, sz);1396break;1397default:1398if(*ext <'A'||'Z'< *ext)1399returnerror("index uses %.4s extension, which we do not understand",1400 ext);1401fprintf(stderr,"ignoring %.4s extension\n", ext);1402break;1403}1404return0;1405}14061407inthold_locked_index(struct lock_file *lk,int die_on_error)1408{1409returnhold_lock_file_for_update(lk,get_index_file(),1410 die_on_error1411? LOCK_DIE_ON_ERROR1412:0);1413}14141415intread_index(struct index_state *istate)1416{1417returnread_index_from(istate,get_index_file());1418}14191420static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,1421unsigned int flags,1422const char*name,1423size_t len)1424{1425struct cache_entry *ce =xmalloc(cache_entry_size(len));14261427 ce->ce_stat_data.sd_ctime.sec =get_be32(&ondisk->ctime.sec);1428 ce->ce_stat_data.sd_mtime.sec =get_be32(&ondisk->mtime.sec);1429 ce->ce_stat_data.sd_ctime.nsec =get_be32(&ondisk->ctime.nsec);1430 ce->ce_stat_data.sd_mtime.nsec =get_be32(&ondisk->mtime.nsec);1431 ce->ce_stat_data.sd_dev =get_be32(&ondisk->dev);1432 ce->ce_stat_data.sd_ino =get_be32(&ondisk->ino);1433 ce->ce_mode =get_be32(&ondisk->mode);1434 ce->ce_stat_data.sd_uid =get_be32(&ondisk->uid);1435 ce->ce_stat_data.sd_gid =get_be32(&ondisk->gid);1436 ce->ce_stat_data.sd_size =get_be32(&ondisk->size);1437 ce->ce_flags = flags & ~CE_NAMEMASK;1438 ce->ce_namelen = len;1439 ce->index =0;1440hashcpy(ce->sha1, ondisk->sha1);1441memcpy(ce->name, name, len);1442 ce->name[len] ='\0';1443return ce;1444}14451446/*1447 * Adjacent cache entries tend to share the leading paths, so it makes1448 * sense to only store the differences in later entries. In the v41449 * on-disk format of the index, each on-disk cache entry stores the1450 * number of bytes to be stripped from the end of the previous name,1451 * and the bytes to append to the result, to come up with its name.1452 */1453static unsigned longexpand_name_field(struct strbuf *name,const char*cp_)1454{1455const unsigned char*ep, *cp = (const unsigned char*)cp_;1456size_t len =decode_varint(&cp);14571458if(name->len < len)1459die("malformed name field in the index");1460strbuf_remove(name, name->len - len, len);1461for(ep = cp; *ep; ep++)1462;/* find the end */1463strbuf_add(name, cp, ep - cp);1464return(const char*)ep +1- cp_;1465}14661467static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,1468unsigned long*ent_size,1469struct strbuf *previous_name)1470{1471struct cache_entry *ce;1472size_t len;1473const char*name;1474unsigned int flags;14751476/* On-disk flags are just 16 bits */1477 flags =get_be16(&ondisk->flags);1478 len = flags & CE_NAMEMASK;14791480if(flags & CE_EXTENDED) {1481struct ondisk_cache_entry_extended *ondisk2;1482int extended_flags;1483 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1484 extended_flags =get_be16(&ondisk2->flags2) <<16;1485/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */1486if(extended_flags & ~CE_EXTENDED_FLAGS)1487die("Unknown index entry format%08x", extended_flags);1488 flags |= extended_flags;1489 name = ondisk2->name;1490}1491else1492 name = ondisk->name;14931494if(!previous_name) {1495/* v3 and earlier */1496if(len == CE_NAMEMASK)1497 len =strlen(name);1498 ce =cache_entry_from_ondisk(ondisk, flags, name, len);14991500*ent_size =ondisk_ce_size(ce);1501}else{1502unsigned long consumed;1503 consumed =expand_name_field(previous_name, name);1504 ce =cache_entry_from_ondisk(ondisk, flags,1505 previous_name->buf,1506 previous_name->len);15071508*ent_size = (name - ((char*)ondisk)) + consumed;1509}1510return ce;1511}15121513static voidcheck_ce_order(struct index_state *istate)1514{1515unsigned int i;15161517for(i =1; i < istate->cache_nr; i++) {1518struct cache_entry *ce = istate->cache[i -1];1519struct cache_entry *next_ce = istate->cache[i];1520int name_compare =strcmp(ce->name, next_ce->name);15211522if(0< name_compare)1523die("unordered stage entries in index");1524if(!name_compare) {1525if(!ce_stage(ce))1526die("multiple stage entries for merged file '%s'",1527 ce->name);1528if(ce_stage(ce) >ce_stage(next_ce))1529die("unordered stage entries for '%s'",1530 ce->name);1531}1532}1533}15341535/* remember to discard_cache() before reading a different cache! */1536intdo_read_index(struct index_state *istate,const char*path,int must_exist)1537{1538int fd, i;1539struct stat st;1540unsigned long src_offset;1541struct cache_header *hdr;1542void*mmap;1543size_t mmap_size;1544struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;15451546if(istate->initialized)1547return istate->cache_nr;15481549 istate->timestamp.sec =0;1550 istate->timestamp.nsec =0;1551 fd =open(path, O_RDONLY);1552if(fd <0) {1553if(!must_exist && errno == ENOENT)1554return0;1555die_errno("%s: index file open failed", path);1556}15571558if(fstat(fd, &st))1559die_errno("cannot stat the open index");15601561 mmap_size =xsize_t(st.st_size);1562if(mmap_size <sizeof(struct cache_header) +20)1563die("index file smaller than expected");15641565 mmap =xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd,0);1566if(mmap == MAP_FAILED)1567die_errno("unable to map index file");1568close(fd);15691570 hdr = mmap;1571if(verify_hdr(hdr, mmap_size) <0)1572goto unmap;15731574hashcpy(istate->sha1, (const unsigned char*)hdr + mmap_size -20);1575 istate->version =ntohl(hdr->hdr_version);1576 istate->cache_nr =ntohl(hdr->hdr_entries);1577 istate->cache_alloc =alloc_nr(istate->cache_nr);1578 istate->cache =xcalloc(istate->cache_alloc,sizeof(*istate->cache));1579 istate->initialized =1;15801581if(istate->version ==4)1582 previous_name = &previous_name_buf;1583else1584 previous_name = NULL;15851586 src_offset =sizeof(*hdr);1587for(i =0; i < istate->cache_nr; i++) {1588struct ondisk_cache_entry *disk_ce;1589struct cache_entry *ce;1590unsigned long consumed;15911592 disk_ce = (struct ondisk_cache_entry *)((char*)mmap + src_offset);1593 ce =create_from_disk(disk_ce, &consumed, previous_name);1594set_index_entry(istate, i, ce);15951596 src_offset += consumed;1597}1598strbuf_release(&previous_name_buf);1599 istate->timestamp.sec = st.st_mtime;1600 istate->timestamp.nsec =ST_MTIME_NSEC(st);16011602while(src_offset <= mmap_size -20-8) {1603/* After an array of active_nr index entries,1604 * there can be arbitrary number of extended1605 * sections, each of which is prefixed with1606 * extension name (4-byte) and section length1607 * in 4-byte network byte order.1608 */1609uint32_t extsize;1610memcpy(&extsize, (char*)mmap + src_offset +4,4);1611 extsize =ntohl(extsize);1612if(read_index_extension(istate,1613(const char*) mmap + src_offset,1614(char*) mmap + src_offset +8,1615 extsize) <0)1616goto unmap;1617 src_offset +=8;1618 src_offset += extsize;1619}1620munmap(mmap, mmap_size);1621return istate->cache_nr;16221623unmap:1624munmap(mmap, mmap_size);1625die("index file corrupt");1626}16271628intread_index_from(struct index_state *istate,const char*path)1629{1630struct split_index *split_index;1631int ret;16321633/* istate->initialized covers both .git/index and .git/sharedindex.xxx */1634if(istate->initialized)1635return istate->cache_nr;16361637 ret =do_read_index(istate, path,0);1638 split_index = istate->split_index;1639if(!split_index ||is_null_sha1(split_index->base_sha1)) {1640check_ce_order(istate);1641return ret;1642}16431644if(split_index->base)1645discard_index(split_index->base);1646else1647 split_index->base =xcalloc(1,sizeof(*split_index->base));1648 ret =do_read_index(split_index->base,1649git_path("sharedindex.%s",1650sha1_to_hex(split_index->base_sha1)),1);1651if(hashcmp(split_index->base_sha1, split_index->base->sha1))1652die("broken index, expect%sin%s, got%s",1653sha1_to_hex(split_index->base_sha1),1654git_path("sharedindex.%s",1655sha1_to_hex(split_index->base_sha1)),1656sha1_to_hex(split_index->base->sha1));1657merge_base_index(istate);1658check_ce_order(istate);1659return ret;1660}16611662intis_index_unborn(struct index_state *istate)1663{1664return(!istate->cache_nr && !istate->timestamp.sec);1665}16661667intdiscard_index(struct index_state *istate)1668{1669int i;16701671for(i =0; i < istate->cache_nr; i++) {1672if(istate->cache[i]->index &&1673 istate->split_index &&1674 istate->split_index->base &&1675 istate->cache[i]->index <= istate->split_index->base->cache_nr &&1676 istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index -1])1677continue;1678free(istate->cache[i]);1679}1680resolve_undo_clear_index(istate);1681 istate->cache_nr =0;1682 istate->cache_changed =0;1683 istate->timestamp.sec =0;1684 istate->timestamp.nsec =0;1685free_name_hash(istate);1686cache_tree_free(&(istate->cache_tree));1687 istate->initialized =0;1688free(istate->cache);1689 istate->cache = NULL;1690 istate->cache_alloc =0;1691discard_split_index(istate);1692free_untracked_cache(istate->untracked);1693 istate->untracked = NULL;1694return0;1695}16961697intunmerged_index(const struct index_state *istate)1698{1699int i;1700for(i =0; i < istate->cache_nr; i++) {1701if(ce_stage(istate->cache[i]))1702return1;1703}1704return0;1705}17061707#define WRITE_BUFFER_SIZE 81921708static unsigned char write_buffer[WRITE_BUFFER_SIZE];1709static unsigned long write_buffer_len;17101711static intce_write_flush(git_SHA_CTX *context,int fd)1712{1713unsigned int buffered = write_buffer_len;1714if(buffered) {1715git_SHA1_Update(context, write_buffer, buffered);1716if(write_in_full(fd, write_buffer, buffered) != buffered)1717return-1;1718 write_buffer_len =0;1719}1720return0;1721}17221723static intce_write(git_SHA_CTX *context,int fd,void*data,unsigned int len)1724{1725while(len) {1726unsigned int buffered = write_buffer_len;1727unsigned int partial = WRITE_BUFFER_SIZE - buffered;1728if(partial > len)1729 partial = len;1730memcpy(write_buffer + buffered, data, partial);1731 buffered += partial;1732if(buffered == WRITE_BUFFER_SIZE) {1733 write_buffer_len = buffered;1734if(ce_write_flush(context, fd))1735return-1;1736 buffered =0;1737}1738 write_buffer_len = buffered;1739 len -= partial;1740 data = (char*) data + partial;1741}1742return0;1743}17441745static intwrite_index_ext_header(git_SHA_CTX *context,int fd,1746unsigned int ext,unsigned int sz)1747{1748 ext =htonl(ext);1749 sz =htonl(sz);1750return((ce_write(context, fd, &ext,4) <0) ||1751(ce_write(context, fd, &sz,4) <0)) ? -1:0;1752}17531754static intce_flush(git_SHA_CTX *context,int fd,unsigned char*sha1)1755{1756unsigned int left = write_buffer_len;17571758if(left) {1759 write_buffer_len =0;1760git_SHA1_Update(context, write_buffer, left);1761}17621763/* Flush first if not enough space for SHA1 signature */1764if(left +20> WRITE_BUFFER_SIZE) {1765if(write_in_full(fd, write_buffer, left) != left)1766return-1;1767 left =0;1768}17691770/* Append the SHA1 signature at the end */1771git_SHA1_Final(write_buffer + left, context);1772hashcpy(sha1, write_buffer + left);1773 left +=20;1774return(write_in_full(fd, write_buffer, left) != left) ? -1:0;1775}17761777static voidce_smudge_racily_clean_entry(struct cache_entry *ce)1778{1779/*1780 * The only thing we care about in this function is to smudge the1781 * falsely clean entry due to touch-update-touch race, so we leave1782 * everything else as they are. We are called for entries whose1783 * ce_stat_data.sd_mtime match the index file mtime.1784 *1785 * Note that this actually does not do much for gitlinks, for1786 * which ce_match_stat_basic() always goes to the actual1787 * contents. The caller checks with is_racy_timestamp() which1788 * always says "no" for gitlinks, so we are not called for them ;-)1789 */1790struct stat st;17911792if(lstat(ce->name, &st) <0)1793return;1794if(ce_match_stat_basic(ce, &st))1795return;1796if(ce_modified_check_fs(ce, &st)) {1797/* This is "racily clean"; smudge it. Note that this1798 * is a tricky code. At first glance, it may appear1799 * that it can break with this sequence:1800 *1801 * $ echo xyzzy >frotz1802 * $ git-update-index --add frotz1803 * $ : >frotz1804 * $ sleep 31805 * $ echo filfre >nitfol1806 * $ git-update-index --add nitfol1807 *1808 * but it does not. When the second update-index runs,1809 * it notices that the entry "frotz" has the same timestamp1810 * as index, and if we were to smudge it by resetting its1811 * size to zero here, then the object name recorded1812 * in index is the 6-byte file but the cached stat information1813 * becomes zero --- which would then match what we would1814 * obtain from the filesystem next time we stat("frotz").1815 *1816 * However, the second update-index, before calling1817 * this function, notices that the cached size is 61818 * bytes and what is on the filesystem is an empty1819 * file, and never calls us, so the cached size information1820 * for "frotz" stays 6 which does not match the filesystem.1821 */1822 ce->ce_stat_data.sd_size =0;1823}1824}18251826/* Copy miscellaneous fields but not the name */1827static char*copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,1828struct cache_entry *ce)1829{1830short flags;18311832 ondisk->ctime.sec =htonl(ce->ce_stat_data.sd_ctime.sec);1833 ondisk->mtime.sec =htonl(ce->ce_stat_data.sd_mtime.sec);1834 ondisk->ctime.nsec =htonl(ce->ce_stat_data.sd_ctime.nsec);1835 ondisk->mtime.nsec =htonl(ce->ce_stat_data.sd_mtime.nsec);1836 ondisk->dev =htonl(ce->ce_stat_data.sd_dev);1837 ondisk->ino =htonl(ce->ce_stat_data.sd_ino);1838 ondisk->mode =htonl(ce->ce_mode);1839 ondisk->uid =htonl(ce->ce_stat_data.sd_uid);1840 ondisk->gid =htonl(ce->ce_stat_data.sd_gid);1841 ondisk->size =htonl(ce->ce_stat_data.sd_size);1842hashcpy(ondisk->sha1, ce->sha1);18431844 flags = ce->ce_flags & ~CE_NAMEMASK;1845 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK :ce_namelen(ce));1846 ondisk->flags =htons(flags);1847if(ce->ce_flags & CE_EXTENDED) {1848struct ondisk_cache_entry_extended *ondisk2;1849 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1850 ondisk2->flags2 =htons((ce->ce_flags & CE_EXTENDED_FLAGS) >>16);1851return ondisk2->name;1852}1853else{1854return ondisk->name;1855}1856}18571858static intce_write_entry(git_SHA_CTX *c,int fd,struct cache_entry *ce,1859struct strbuf *previous_name)1860{1861int size;1862struct ondisk_cache_entry *ondisk;1863int saved_namelen = saved_namelen;/* compiler workaround */1864char*name;1865int result;18661867if(ce->ce_flags & CE_STRIP_NAME) {1868 saved_namelen =ce_namelen(ce);1869 ce->ce_namelen =0;1870}18711872if(!previous_name) {1873 size =ondisk_ce_size(ce);1874 ondisk =xcalloc(1, size);1875 name =copy_cache_entry_to_ondisk(ondisk, ce);1876memcpy(name, ce->name,ce_namelen(ce));1877}else{1878int common, to_remove, prefix_size;1879unsigned char to_remove_vi[16];1880for(common =0;1881(ce->name[common] &&1882 common < previous_name->len &&1883 ce->name[common] == previous_name->buf[common]);1884 common++)1885;/* still matching */1886 to_remove = previous_name->len - common;1887 prefix_size =encode_varint(to_remove, to_remove_vi);18881889if(ce->ce_flags & CE_EXTENDED)1890 size =offsetof(struct ondisk_cache_entry_extended, name);1891else1892 size =offsetof(struct ondisk_cache_entry, name);1893 size += prefix_size + (ce_namelen(ce) - common +1);18941895 ondisk =xcalloc(1, size);1896 name =copy_cache_entry_to_ondisk(ondisk, ce);1897memcpy(name, to_remove_vi, prefix_size);1898memcpy(name + prefix_size, ce->name + common,ce_namelen(ce) - common);18991900strbuf_splice(previous_name, common, to_remove,1901 ce->name + common,ce_namelen(ce) - common);1902}1903if(ce->ce_flags & CE_STRIP_NAME) {1904 ce->ce_namelen = saved_namelen;1905 ce->ce_flags &= ~CE_STRIP_NAME;1906}19071908 result =ce_write(c, fd, ondisk, size);1909free(ondisk);1910return result;1911}19121913/*1914 * This function verifies if index_state has the correct sha1 of the1915 * index file. Don't die if we have any other failure, just return 0.1916 */1917static intverify_index_from(const struct index_state *istate,const char*path)1918{1919int fd;1920 ssize_t n;1921struct stat st;1922unsigned char sha1[20];19231924if(!istate->initialized)1925return0;19261927 fd =open(path, O_RDONLY);1928if(fd <0)1929return0;19301931if(fstat(fd, &st))1932goto out;19331934if(st.st_size <sizeof(struct cache_header) +20)1935goto out;19361937 n =pread_in_full(fd, sha1,20, st.st_size -20);1938if(n !=20)1939goto out;19401941if(hashcmp(istate->sha1, sha1))1942goto out;19431944close(fd);1945return1;19461947out:1948close(fd);1949return0;1950}19511952static intverify_index(const struct index_state *istate)1953{1954returnverify_index_from(istate,get_index_file());1955}19561957static inthas_racy_timestamp(struct index_state *istate)1958{1959int entries = istate->cache_nr;1960int i;19611962for(i =0; i < entries; i++) {1963struct cache_entry *ce = istate->cache[i];1964if(is_racy_timestamp(istate, ce))1965return1;1966}1967return0;1968}19691970/*1971 * Opportunistically update the index but do not complain if we can't1972 */1973voidupdate_index_if_able(struct index_state *istate,struct lock_file *lockfile)1974{1975if((istate->cache_changed ||has_racy_timestamp(istate)) &&1976verify_index(istate) &&1977write_locked_index(istate, lockfile, COMMIT_LOCK))1978rollback_lock_file(lockfile);1979}19801981static intdo_write_index(struct index_state *istate,int newfd,1982int strip_extensions)1983{1984 git_SHA_CTX c;1985struct cache_header hdr;1986int i, err, removed, extended, hdr_version;1987struct cache_entry **cache = istate->cache;1988int entries = istate->cache_nr;1989struct stat st;1990struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;19911992for(i = removed = extended =0; i < entries; i++) {1993if(cache[i]->ce_flags & CE_REMOVE)1994 removed++;19951996/* reduce extended entries if possible */1997 cache[i]->ce_flags &= ~CE_EXTENDED;1998if(cache[i]->ce_flags & CE_EXTENDED_FLAGS) {1999 extended++;2000 cache[i]->ce_flags |= CE_EXTENDED;2001}2002}20032004if(!istate->version) {2005 istate->version =get_index_format_default();2006if(getenv("GIT_TEST_SPLIT_INDEX"))2007init_split_index(istate);2008}20092010/* demote version 3 to version 2 when the latter suffices */2011if(istate->version ==3|| istate->version ==2)2012 istate->version = extended ?3:2;20132014 hdr_version = istate->version;20152016 hdr.hdr_signature =htonl(CACHE_SIGNATURE);2017 hdr.hdr_version =htonl(hdr_version);2018 hdr.hdr_entries =htonl(entries - removed);20192020git_SHA1_Init(&c);2021if(ce_write(&c, newfd, &hdr,sizeof(hdr)) <0)2022return-1;20232024 previous_name = (hdr_version ==4) ? &previous_name_buf : NULL;2025for(i =0; i < entries; i++) {2026struct cache_entry *ce = cache[i];2027if(ce->ce_flags & CE_REMOVE)2028continue;2029if(!ce_uptodate(ce) &&is_racy_timestamp(istate, ce))2030ce_smudge_racily_clean_entry(ce);2031if(is_null_sha1(ce->sha1)) {2032static const char msg[] ="cache entry has null sha1:%s";2033static int allow = -1;20342035if(allow <0)2036 allow =git_env_bool("GIT_ALLOW_NULL_SHA1",0);2037if(allow)2038warning(msg, ce->name);2039else2040returnerror(msg, ce->name);2041}2042if(ce_write_entry(&c, newfd, ce, previous_name) <0)2043return-1;2044}2045strbuf_release(&previous_name_buf);20462047/* Write extension data here */2048if(!strip_extensions && istate->split_index) {2049struct strbuf sb = STRBUF_INIT;20502051 err =write_link_extension(&sb, istate) <0||2052write_index_ext_header(&c, newfd, CACHE_EXT_LINK,2053 sb.len) <0||2054ce_write(&c, newfd, sb.buf, sb.len) <0;2055strbuf_release(&sb);2056if(err)2057return-1;2058}2059if(!strip_extensions && istate->cache_tree) {2060struct strbuf sb = STRBUF_INIT;20612062cache_tree_write(&sb, istate->cache_tree);2063 err =write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) <02064||ce_write(&c, newfd, sb.buf, sb.len) <0;2065strbuf_release(&sb);2066if(err)2067return-1;2068}2069if(!strip_extensions && istate->resolve_undo) {2070struct strbuf sb = STRBUF_INIT;20712072resolve_undo_write(&sb, istate->resolve_undo);2073 err =write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,2074 sb.len) <02075||ce_write(&c, newfd, sb.buf, sb.len) <0;2076strbuf_release(&sb);2077if(err)2078return-1;2079}2080if(!strip_extensions && istate->untracked) {2081struct strbuf sb = STRBUF_INIT;20822083write_untracked_extension(&sb, istate->untracked);2084 err =write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED,2085 sb.len) <0||2086ce_write(&c, newfd, sb.buf, sb.len) <0;2087strbuf_release(&sb);2088if(err)2089return-1;2090}20912092if(ce_flush(&c, newfd, istate->sha1) ||fstat(newfd, &st))2093return-1;2094 istate->timestamp.sec = (unsigned int)st.st_mtime;2095 istate->timestamp.nsec =ST_MTIME_NSEC(st);2096return0;2097}20982099voidset_alternate_index_output(const char*name)2100{2101 alternate_index_output = name;2102}21032104static intcommit_locked_index(struct lock_file *lk)2105{2106if(alternate_index_output)2107returncommit_lock_file_to(lk, alternate_index_output);2108else2109returncommit_lock_file(lk);2110}21112112static intdo_write_locked_index(struct index_state *istate,struct lock_file *lock,2113unsigned flags)2114{2115int ret =do_write_index(istate, lock->fd,0);2116if(ret)2117return ret;2118assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=2119(COMMIT_LOCK | CLOSE_LOCK));2120if(flags & COMMIT_LOCK)2121returncommit_locked_index(lock);2122else if(flags & CLOSE_LOCK)2123returnclose_lock_file(lock);2124else2125return ret;2126}21272128static intwrite_split_index(struct index_state *istate,2129struct lock_file *lock,2130unsigned flags)2131{2132int ret;2133prepare_to_write_split_index(istate);2134 ret =do_write_locked_index(istate, lock, flags);2135finish_writing_split_index(istate);2136return ret;2137}21382139static char*temporary_sharedindex;21402141static voidremove_temporary_sharedindex(void)2142{2143if(temporary_sharedindex) {2144unlink_or_warn(temporary_sharedindex);2145free(temporary_sharedindex);2146 temporary_sharedindex = NULL;2147}2148}21492150static voidremove_temporary_sharedindex_on_signal(int signo)2151{2152remove_temporary_sharedindex();2153sigchain_pop(signo);2154raise(signo);2155}21562157static intwrite_shared_index(struct index_state *istate,2158struct lock_file *lock,unsigned flags)2159{2160struct split_index *si = istate->split_index;2161static int installed_handler;2162int fd, ret;21632164 temporary_sharedindex =git_pathdup("sharedindex_XXXXXX");2165 fd =mkstemp(temporary_sharedindex);2166if(fd <0) {2167free(temporary_sharedindex);2168 temporary_sharedindex = NULL;2169hashclr(si->base_sha1);2170returndo_write_locked_index(istate, lock, flags);2171}2172if(!installed_handler) {2173atexit(remove_temporary_sharedindex);2174sigchain_push_common(remove_temporary_sharedindex_on_signal);2175}2176move_cache_to_base_index(istate);2177 ret =do_write_index(si->base, fd,1);2178close(fd);2179if(ret) {2180remove_temporary_sharedindex();2181return ret;2182}2183 ret =rename(temporary_sharedindex,2184git_path("sharedindex.%s",sha1_to_hex(si->base->sha1)));2185free(temporary_sharedindex);2186 temporary_sharedindex = NULL;2187if(!ret)2188hashcpy(si->base_sha1, si->base->sha1);2189return ret;2190}21912192intwrite_locked_index(struct index_state *istate,struct lock_file *lock,2193unsigned flags)2194{2195struct split_index *si = istate->split_index;21962197if(!si || alternate_index_output ||2198(istate->cache_changed & ~EXTMASK)) {2199if(si)2200hashclr(si->base_sha1);2201returndo_write_locked_index(istate, lock, flags);2202}22032204if(getenv("GIT_TEST_SPLIT_INDEX")) {2205int v = si->base_sha1[0];2206if((v &15) <6)2207 istate->cache_changed |= SPLIT_INDEX_ORDERED;2208}2209if(istate->cache_changed & SPLIT_INDEX_ORDERED) {2210int ret =write_shared_index(istate, lock, flags);2211if(ret)2212return ret;2213}22142215returnwrite_split_index(istate, lock, flags);2216}22172218/*2219 * Read the index file that is potentially unmerged into given2220 * index_state, dropping any unmerged entries. Returns true if2221 * the index is unmerged. Callers who want to refuse to work2222 * from an unmerged state can call this and check its return value,2223 * instead of calling read_cache().2224 */2225intread_index_unmerged(struct index_state *istate)2226{2227int i;2228int unmerged =0;22292230read_index(istate);2231for(i =0; i < istate->cache_nr; i++) {2232struct cache_entry *ce = istate->cache[i];2233struct cache_entry *new_ce;2234int size, len;22352236if(!ce_stage(ce))2237continue;2238 unmerged =1;2239 len =ce_namelen(ce);2240 size =cache_entry_size(len);2241 new_ce =xcalloc(1, size);2242memcpy(new_ce->name, ce->name, len);2243 new_ce->ce_flags =create_ce_flags(0) | CE_CONFLICTED;2244 new_ce->ce_namelen = len;2245 new_ce->ce_mode = ce->ce_mode;2246if(add_index_entry(istate, new_ce,0))2247returnerror("%s: cannot drop to stage #0",2248 new_ce->name);2249}2250return unmerged;2251}22522253/*2254 * Returns 1 if the path is an "other" path with respect to2255 * the index; that is, the path is not mentioned in the index at all,2256 * either as a file, a directory with some files in the index,2257 * or as an unmerged entry.2258 *2259 * We helpfully remove a trailing "/" from directories so that2260 * the output of read_directory can be used as-is.2261 */2262intindex_name_is_other(const struct index_state *istate,const char*name,2263int namelen)2264{2265int pos;2266if(namelen && name[namelen -1] =='/')2267 namelen--;2268 pos =index_name_pos(istate, name, namelen);2269if(0<= pos)2270return0;/* exact match */2271 pos = -pos -1;2272if(pos < istate->cache_nr) {2273struct cache_entry *ce = istate->cache[pos];2274if(ce_namelen(ce) == namelen &&2275!memcmp(ce->name, name, namelen))2276return0;/* Yup, this one exists unmerged */2277}2278return1;2279}22802281void*read_blob_data_from_index(struct index_state *istate,const char*path,unsigned long*size)2282{2283int pos, len;2284unsigned long sz;2285enum object_type type;2286void*data;22872288 len =strlen(path);2289 pos =index_name_pos(istate, path, len);2290if(pos <0) {2291/*2292 * We might be in the middle of a merge, in which2293 * case we would read stage #2 (ours).2294 */2295int i;2296for(i = -pos -1;2297(pos <0&& i < istate->cache_nr &&2298!strcmp(istate->cache[i]->name, path));2299 i++)2300if(ce_stage(istate->cache[i]) ==2)2301 pos = i;2302}2303if(pos <0)2304return NULL;2305 data =read_sha1_file(istate->cache[pos]->sha1, &type, &sz);2306if(!data || type != OBJ_BLOB) {2307free(data);2308return NULL;2309}2310if(size)2311*size = sz;2312return data;2313}23142315voidstat_validity_clear(struct stat_validity *sv)2316{2317free(sv->sd);2318 sv->sd = NULL;2319}23202321intstat_validity_check(struct stat_validity *sv,const char*path)2322{2323struct stat st;23242325if(stat(path, &st) <0)2326return sv->sd == NULL;2327if(!sv->sd)2328return0;2329returnS_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);2330}23312332voidstat_validity_update(struct stat_validity *sv,int fd)2333{2334struct stat st;23352336if(fstat(fd, &st) <0|| !S_ISREG(st.st_mode))2337stat_validity_clear(sv);2338else{2339if(!sv->sd)2340 sv->sd =xcalloc(1,sizeof(struct stat_data));2341fill_stat_data(sv->sd, &st);2342}2343}