1/* 2 * GIT - The information manager from hell 3 * 4 * Copyright (C) Linus Torvalds, 2005 5 */ 6#define NO_THE_INDEX_COMPATIBILITY_MACROS 7#include"cache.h" 8#include"cache-tree.h" 9#include"refs.h" 10#include"dir.h" 11#include"tree.h" 12#include"commit.h" 13#include"blob.h" 14#include"resolve-undo.h" 15 16static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,int really); 17 18/* Index extensions. 19 * 20 * The first letter should be 'A'..'Z' for extensions that are not 21 * necessary for a correct operation (i.e. optimization data). 22 * When new extensions are added that _needs_ to be understood in 23 * order to correctly interpret the index file, pick character that 24 * is outside the range, to cause the reader to abort. 25 */ 26 27#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) ) 28#define CACHE_EXT_TREE 0x54524545/* "TREE" */ 29#define CACHE_EXT_RESOLVE_UNDO 0x52455543/* "REUC" */ 30 31struct index_state the_index; 32 33static voidset_index_entry(struct index_state *istate,int nr,struct cache_entry *ce) 34{ 35 istate->cache[nr] = ce; 36add_name_hash(istate, ce); 37} 38 39static voidreplace_index_entry(struct index_state *istate,int nr,struct cache_entry *ce) 40{ 41struct cache_entry *old = istate->cache[nr]; 42 43remove_name_hash(old); 44set_index_entry(istate, nr, ce); 45 istate->cache_changed =1; 46} 47 48voidrename_index_entry_at(struct index_state *istate,int nr,const char*new_name) 49{ 50struct cache_entry *old = istate->cache[nr], *new; 51int namelen =strlen(new_name); 52 53new=xmalloc(cache_entry_size(namelen)); 54copy_cache_entry(new, old); 55new->ce_flags &= ~(CE_STATE_MASK | CE_NAMEMASK); 56new->ce_flags |= (namelen >= CE_NAMEMASK ? CE_NAMEMASK : namelen); 57memcpy(new->name, new_name, namelen +1); 58 59cache_tree_invalidate_path(istate->cache_tree, old->name); 60remove_index_entry_at(istate, nr); 61add_index_entry(istate,new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); 62} 63 64/* 65 * This only updates the "non-critical" parts of the directory 66 * cache, ie the parts that aren't tracked by GIT, and only used 67 * to validate the cache. 68 */ 69voidfill_stat_cache_info(struct cache_entry *ce,struct stat *st) 70{ 71 ce->ce_ctime.sec = (unsigned int)st->st_ctime; 72 ce->ce_mtime.sec = (unsigned int)st->st_mtime; 73 ce->ce_ctime.nsec =ST_CTIME_NSEC(*st); 74 ce->ce_mtime.nsec =ST_MTIME_NSEC(*st); 75 ce->ce_dev = st->st_dev; 76 ce->ce_ino = st->st_ino; 77 ce->ce_uid = st->st_uid; 78 ce->ce_gid = st->st_gid; 79 ce->ce_size = st->st_size; 80 81if(assume_unchanged) 82 ce->ce_flags |= CE_VALID; 83 84if(S_ISREG(st->st_mode)) 85ce_mark_uptodate(ce); 86} 87 88static intce_compare_data(struct cache_entry *ce,struct stat *st) 89{ 90int match = -1; 91int fd =open(ce->name, O_RDONLY); 92 93if(fd >=0) { 94unsigned char sha1[20]; 95if(!index_fd(sha1, fd, st,0, OBJ_BLOB, ce->name)) 96 match =hashcmp(sha1, ce->sha1); 97/* index_fd() closed the file descriptor already */ 98} 99return match; 100} 101 102static intce_compare_link(struct cache_entry *ce,size_t expected_size) 103{ 104int match = -1; 105void*buffer; 106unsigned long size; 107enum object_type type; 108struct strbuf sb = STRBUF_INIT; 109 110if(strbuf_readlink(&sb, ce->name, expected_size)) 111return-1; 112 113 buffer =read_sha1_file(ce->sha1, &type, &size); 114if(buffer) { 115if(size == sb.len) 116 match =memcmp(buffer, sb.buf, size); 117free(buffer); 118} 119strbuf_release(&sb); 120return match; 121} 122 123static intce_compare_gitlink(struct cache_entry *ce) 124{ 125unsigned char sha1[20]; 126 127/* 128 * We don't actually require that the .git directory 129 * under GITLINK directory be a valid git directory. It 130 * might even be missing (in case nobody populated that 131 * sub-project). 132 * 133 * If so, we consider it always to match. 134 */ 135if(resolve_gitlink_ref(ce->name,"HEAD", sha1) <0) 136return0; 137returnhashcmp(sha1, ce->sha1); 138} 139 140static intce_modified_check_fs(struct cache_entry *ce,struct stat *st) 141{ 142switch(st->st_mode & S_IFMT) { 143case S_IFREG: 144if(ce_compare_data(ce, st)) 145return DATA_CHANGED; 146break; 147case S_IFLNK: 148if(ce_compare_link(ce,xsize_t(st->st_size))) 149return DATA_CHANGED; 150break; 151case S_IFDIR: 152if(S_ISGITLINK(ce->ce_mode)) 153returnce_compare_gitlink(ce) ? DATA_CHANGED :0; 154default: 155return TYPE_CHANGED; 156} 157return0; 158} 159 160static intis_empty_blob_sha1(const unsigned char*sha1) 161{ 162static const unsigned char empty_blob_sha1[20] = { 1630xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b, 1640x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91 165}; 166 167return!hashcmp(sha1, empty_blob_sha1); 168} 169 170static intce_match_stat_basic(struct cache_entry *ce,struct stat *st) 171{ 172unsigned int changed =0; 173 174if(ce->ce_flags & CE_REMOVE) 175return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED; 176 177switch(ce->ce_mode & S_IFMT) { 178case S_IFREG: 179 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED :0; 180/* We consider only the owner x bit to be relevant for 181 * "mode changes" 182 */ 183if(trust_executable_bit && 184(0100& (ce->ce_mode ^ st->st_mode))) 185 changed |= MODE_CHANGED; 186break; 187case S_IFLNK: 188if(!S_ISLNK(st->st_mode) && 189(has_symlinks || !S_ISREG(st->st_mode))) 190 changed |= TYPE_CHANGED; 191break; 192case S_IFGITLINK: 193/* We ignore most of the st_xxx fields for gitlinks */ 194if(!S_ISDIR(st->st_mode)) 195 changed |= TYPE_CHANGED; 196else if(ce_compare_gitlink(ce)) 197 changed |= DATA_CHANGED; 198return changed; 199default: 200die("internal error: ce_mode is%o", ce->ce_mode); 201} 202if(ce->ce_mtime.sec != (unsigned int)st->st_mtime) 203 changed |= MTIME_CHANGED; 204if(trust_ctime && ce->ce_ctime.sec != (unsigned int)st->st_ctime) 205 changed |= CTIME_CHANGED; 206 207#ifdef USE_NSEC 208if(ce->ce_mtime.nsec !=ST_MTIME_NSEC(*st)) 209 changed |= MTIME_CHANGED; 210if(trust_ctime && ce->ce_ctime.nsec !=ST_CTIME_NSEC(*st)) 211 changed |= CTIME_CHANGED; 212#endif 213 214if(ce->ce_uid != (unsigned int) st->st_uid || 215 ce->ce_gid != (unsigned int) st->st_gid) 216 changed |= OWNER_CHANGED; 217if(ce->ce_ino != (unsigned int) st->st_ino) 218 changed |= INODE_CHANGED; 219 220#ifdef USE_STDEV 221/* 222 * st_dev breaks on network filesystems where different 223 * clients will have different views of what "device" 224 * the filesystem is on 225 */ 226if(ce->ce_dev != (unsigned int) st->st_dev) 227 changed |= INODE_CHANGED; 228#endif 229 230if(ce->ce_size != (unsigned int) st->st_size) 231 changed |= DATA_CHANGED; 232 233/* Racily smudged entry? */ 234if(!ce->ce_size) { 235if(!is_empty_blob_sha1(ce->sha1)) 236 changed |= DATA_CHANGED; 237} 238 239return changed; 240} 241 242static intis_racy_timestamp(const struct index_state *istate,struct cache_entry *ce) 243{ 244return(!S_ISGITLINK(ce->ce_mode) && 245 istate->timestamp.sec && 246#ifdef USE_NSEC 247/* nanosecond timestamped files can also be racy! */ 248(istate->timestamp.sec < ce->ce_mtime.sec || 249(istate->timestamp.sec == ce->ce_mtime.sec && 250 istate->timestamp.nsec <= ce->ce_mtime.nsec)) 251#else 252 istate->timestamp.sec <= ce->ce_mtime.sec 253#endif 254); 255} 256 257intie_match_stat(const struct index_state *istate, 258struct cache_entry *ce,struct stat *st, 259unsigned int options) 260{ 261unsigned int changed; 262int ignore_valid = options & CE_MATCH_IGNORE_VALID; 263int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE; 264int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY; 265 266/* 267 * If it's marked as always valid in the index, it's 268 * valid whatever the checked-out copy says. 269 * 270 * skip-worktree has the same effect with higher precedence 271 */ 272if(!ignore_skip_worktree &&ce_skip_worktree(ce)) 273return0; 274if(!ignore_valid && (ce->ce_flags & CE_VALID)) 275return0; 276 277/* 278 * Intent-to-add entries have not been added, so the index entry 279 * by definition never matches what is in the work tree until it 280 * actually gets added. 281 */ 282if(ce->ce_flags & CE_INTENT_TO_ADD) 283return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED; 284 285 changed =ce_match_stat_basic(ce, st); 286 287/* 288 * Within 1 second of this sequence: 289 * echo xyzzy >file && git-update-index --add file 290 * running this command: 291 * echo frotz >file 292 * would give a falsely clean cache entry. The mtime and 293 * length match the cache, and other stat fields do not change. 294 * 295 * We could detect this at update-index time (the cache entry 296 * being registered/updated records the same time as "now") 297 * and delay the return from git-update-index, but that would 298 * effectively mean we can make at most one commit per second, 299 * which is not acceptable. Instead, we check cache entries 300 * whose mtime are the same as the index file timestamp more 301 * carefully than others. 302 */ 303if(!changed &&is_racy_timestamp(istate, ce)) { 304if(assume_racy_is_modified) 305 changed |= DATA_CHANGED; 306else 307 changed |=ce_modified_check_fs(ce, st); 308} 309 310return changed; 311} 312 313intie_modified(const struct index_state *istate, 314struct cache_entry *ce,struct stat *st,unsigned int options) 315{ 316int changed, changed_fs; 317 318 changed =ie_match_stat(istate, ce, st, options); 319if(!changed) 320return0; 321/* 322 * If the mode or type has changed, there's no point in trying 323 * to refresh the entry - it's not going to match 324 */ 325if(changed & (MODE_CHANGED | TYPE_CHANGED)) 326return changed; 327 328/* 329 * Immediately after read-tree or update-index --cacheinfo, 330 * the length field is zero, as we have never even read the 331 * lstat(2) information once, and we cannot trust DATA_CHANGED 332 * returned by ie_match_stat() which in turn was returned by 333 * ce_match_stat_basic() to signal that the filesize of the 334 * blob changed. We have to actually go to the filesystem to 335 * see if the contents match, and if so, should answer "unchanged". 336 * 337 * The logic does not apply to gitlinks, as ce_match_stat_basic() 338 * already has checked the actual HEAD from the filesystem in the 339 * subproject. If ie_match_stat() already said it is different, 340 * then we know it is. 341 */ 342if((changed & DATA_CHANGED) && 343(S_ISGITLINK(ce->ce_mode) || ce->ce_size !=0)) 344return changed; 345 346 changed_fs =ce_modified_check_fs(ce, st); 347if(changed_fs) 348return changed | changed_fs; 349return0; 350} 351 352intbase_name_compare(const char*name1,int len1,int mode1, 353const char*name2,int len2,int mode2) 354{ 355unsigned char c1, c2; 356int len = len1 < len2 ? len1 : len2; 357int cmp; 358 359 cmp =memcmp(name1, name2, len); 360if(cmp) 361return cmp; 362 c1 = name1[len]; 363 c2 = name2[len]; 364if(!c1 &&S_ISDIR(mode1)) 365 c1 ='/'; 366if(!c2 &&S_ISDIR(mode2)) 367 c2 ='/'; 368return(c1 < c2) ? -1: (c1 > c2) ?1:0; 369} 370 371/* 372 * df_name_compare() is identical to base_name_compare(), except it 373 * compares conflicting directory/file entries as equal. Note that 374 * while a directory name compares as equal to a regular file, they 375 * then individually compare _differently_ to a filename that has 376 * a dot after the basename (because '\0' < '.' < '/'). 377 * 378 * This is used by routines that want to traverse the git namespace 379 * but then handle conflicting entries together when possible. 380 */ 381intdf_name_compare(const char*name1,int len1,int mode1, 382const char*name2,int len2,int mode2) 383{ 384int len = len1 < len2 ? len1 : len2, cmp; 385unsigned char c1, c2; 386 387 cmp =memcmp(name1, name2, len); 388if(cmp) 389return cmp; 390/* Directories and files compare equal (same length, same name) */ 391if(len1 == len2) 392return0; 393 c1 = name1[len]; 394if(!c1 &&S_ISDIR(mode1)) 395 c1 ='/'; 396 c2 = name2[len]; 397if(!c2 &&S_ISDIR(mode2)) 398 c2 ='/'; 399if(c1 =='/'&& !c2) 400return0; 401if(c2 =='/'&& !c1) 402return0; 403return c1 - c2; 404} 405 406intcache_name_compare(const char*name1,int flags1,const char*name2,int flags2) 407{ 408int len1 = flags1 & CE_NAMEMASK; 409int len2 = flags2 & CE_NAMEMASK; 410int len = len1 < len2 ? len1 : len2; 411int cmp; 412 413 cmp =memcmp(name1, name2, len); 414if(cmp) 415return cmp; 416if(len1 < len2) 417return-1; 418if(len1 > len2) 419return1; 420 421/* Compare stages */ 422 flags1 &= CE_STAGEMASK; 423 flags2 &= CE_STAGEMASK; 424 425if(flags1 < flags2) 426return-1; 427if(flags1 > flags2) 428return1; 429return0; 430} 431 432intindex_name_pos(const struct index_state *istate,const char*name,int namelen) 433{ 434int first, last; 435 436 first =0; 437 last = istate->cache_nr; 438while(last > first) { 439int next = (last + first) >>1; 440struct cache_entry *ce = istate->cache[next]; 441int cmp =cache_name_compare(name, namelen, ce->name, ce->ce_flags); 442if(!cmp) 443return next; 444if(cmp <0) { 445 last = next; 446continue; 447} 448 first = next+1; 449} 450return-first-1; 451} 452 453/* Remove entry, return true if there are more entries to go.. */ 454intremove_index_entry_at(struct index_state *istate,int pos) 455{ 456struct cache_entry *ce = istate->cache[pos]; 457 458record_resolve_undo(istate, ce); 459remove_name_hash(ce); 460 istate->cache_changed =1; 461 istate->cache_nr--; 462if(pos >= istate->cache_nr) 463return0; 464memmove(istate->cache + pos, 465 istate->cache + pos +1, 466(istate->cache_nr - pos) *sizeof(struct cache_entry *)); 467return1; 468} 469 470/* 471 * Remove all cache ententries marked for removal, that is where 472 * CE_REMOVE is set in ce_flags. This is much more effective than 473 * calling remove_index_entry_at() for each entry to be removed. 474 */ 475voidremove_marked_cache_entries(struct index_state *istate) 476{ 477struct cache_entry **ce_array = istate->cache; 478unsigned int i, j; 479 480for(i = j =0; i < istate->cache_nr; i++) { 481if(ce_array[i]->ce_flags & CE_REMOVE) 482remove_name_hash(ce_array[i]); 483else 484 ce_array[j++] = ce_array[i]; 485} 486 istate->cache_changed =1; 487 istate->cache_nr = j; 488} 489 490intremove_file_from_index(struct index_state *istate,const char*path) 491{ 492int pos =index_name_pos(istate, path,strlen(path)); 493if(pos <0) 494 pos = -pos-1; 495cache_tree_invalidate_path(istate->cache_tree, path); 496while(pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path)) 497remove_index_entry_at(istate, pos); 498return0; 499} 500 501static intcompare_name(struct cache_entry *ce,const char*path,int namelen) 502{ 503return namelen !=ce_namelen(ce) ||memcmp(path, ce->name, namelen); 504} 505 506static intindex_name_pos_also_unmerged(struct index_state *istate, 507const char*path,int namelen) 508{ 509int pos =index_name_pos(istate, path, namelen); 510struct cache_entry *ce; 511 512if(pos >=0) 513return pos; 514 515/* maybe unmerged? */ 516 pos = -1- pos; 517if(pos >= istate->cache_nr || 518compare_name((ce = istate->cache[pos]), path, namelen)) 519return-1; 520 521/* order of preference: stage 2, 1, 3 */ 522if(ce_stage(ce) ==1&& pos +1< istate->cache_nr && 523ce_stage((ce = istate->cache[pos +1])) ==2&& 524!compare_name(ce, path, namelen)) 525 pos++; 526return pos; 527} 528 529static intdifferent_name(struct cache_entry *ce,struct cache_entry *alias) 530{ 531int len =ce_namelen(ce); 532returnce_namelen(alias) != len ||memcmp(ce->name, alias->name, len); 533} 534 535/* 536 * If we add a filename that aliases in the cache, we will use the 537 * name that we already have - but we don't want to update the same 538 * alias twice, because that implies that there were actually two 539 * different files with aliasing names! 540 * 541 * So we use the CE_ADDED flag to verify that the alias was an old 542 * one before we accept it as 543 */ 544static struct cache_entry *create_alias_ce(struct cache_entry *ce,struct cache_entry *alias) 545{ 546int len; 547struct cache_entry *new; 548 549if(alias->ce_flags & CE_ADDED) 550die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name); 551 552/* Ok, create the new entry using the name of the existing alias */ 553 len =ce_namelen(alias); 554new=xcalloc(1,cache_entry_size(len)); 555memcpy(new->name, alias->name, len); 556copy_cache_entry(new, ce); 557free(ce); 558return new; 559} 560 561static voidrecord_intent_to_add(struct cache_entry *ce) 562{ 563unsigned char sha1[20]; 564if(write_sha1_file("",0, blob_type, sha1)) 565die("cannot create an empty blob in the object database"); 566hashcpy(ce->sha1, sha1); 567} 568 569intadd_to_index(struct index_state *istate,const char*path,struct stat *st,int flags) 570{ 571int size, namelen, was_same; 572 mode_t st_mode = st->st_mode; 573struct cache_entry *ce, *alias; 574unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY; 575int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND); 576int pretend = flags & ADD_CACHE_PRETEND; 577int intent_only = flags & ADD_CACHE_INTENT; 578int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE| 579(intent_only ? ADD_CACHE_NEW_ONLY :0)); 580 581if(!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode)) 582returnerror("%s: can only add regular files, symbolic links or git-directories", path); 583 584 namelen =strlen(path); 585if(S_ISDIR(st_mode)) { 586while(namelen && path[namelen-1] =='/') 587 namelen--; 588} 589 size =cache_entry_size(namelen); 590 ce =xcalloc(1, size); 591memcpy(ce->name, path, namelen); 592 ce->ce_flags = namelen; 593if(!intent_only) 594fill_stat_cache_info(ce, st); 595else 596 ce->ce_flags |= CE_INTENT_TO_ADD; 597 598if(trust_executable_bit && has_symlinks) 599 ce->ce_mode =create_ce_mode(st_mode); 600else{ 601/* If there is an existing entry, pick the mode bits and type 602 * from it, otherwise assume unexecutable regular file. 603 */ 604struct cache_entry *ent; 605int pos =index_name_pos_also_unmerged(istate, path, namelen); 606 607 ent = (0<= pos) ? istate->cache[pos] : NULL; 608 ce->ce_mode =ce_mode_from_stat(ent, st_mode); 609} 610 611/* When core.ignorecase=true, determine if a directory of the same name but differing 612 * case already exists within the Git repository. If it does, ensure the directory 613 * case of the file being added to the repository matches (is folded into) the existing 614 * entry's directory case. 615 */ 616if(ignore_case) { 617const char*startPtr = ce->name; 618const char*ptr = startPtr; 619while(*ptr) { 620while(*ptr && *ptr !='/') 621++ptr; 622if(*ptr =='/') { 623struct cache_entry *foundce; 624++ptr; 625 foundce =index_name_exists(&the_index, ce->name, ptr - ce->name, ignore_case); 626if(foundce) { 627memcpy((void*)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr); 628 startPtr = ptr; 629} 630} 631} 632} 633 634 alias =index_name_exists(istate, ce->name,ce_namelen(ce), ignore_case); 635if(alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) { 636/* Nothing changed, really */ 637free(ce); 638if(!S_ISGITLINK(alias->ce_mode)) 639ce_mark_uptodate(alias); 640 alias->ce_flags |= CE_ADDED; 641return0; 642} 643if(!intent_only) { 644if(index_path(ce->sha1, path, st,1)) 645returnerror("unable to index file%s", path); 646}else 647record_intent_to_add(ce); 648 649if(ignore_case && alias &&different_name(ce, alias)) 650 ce =create_alias_ce(ce, alias); 651 ce->ce_flags |= CE_ADDED; 652 653/* It was suspected to be racily clean, but it turns out to be Ok */ 654 was_same = (alias && 655!ce_stage(alias) && 656!hashcmp(alias->sha1, ce->sha1) && 657 ce->ce_mode == alias->ce_mode); 658 659if(pretend) 660; 661else if(add_index_entry(istate, ce, add_option)) 662returnerror("unable to add%sto index",path); 663if(verbose && !was_same) 664printf("add '%s'\n", path); 665return0; 666} 667 668intadd_file_to_index(struct index_state *istate,const char*path,int flags) 669{ 670struct stat st; 671if(lstat(path, &st)) 672die_errno("unable to stat '%s'", path); 673returnadd_to_index(istate, path, &st, flags); 674} 675 676struct cache_entry *make_cache_entry(unsigned int mode, 677const unsigned char*sha1,const char*path,int stage, 678int refresh) 679{ 680int size, len; 681struct cache_entry *ce; 682 683if(!verify_path(path)) { 684error("Invalid path '%s'", path); 685return NULL; 686} 687 688 len =strlen(path); 689 size =cache_entry_size(len); 690 ce =xcalloc(1, size); 691 692hashcpy(ce->sha1, sha1); 693memcpy(ce->name, path, len); 694 ce->ce_flags =create_ce_flags(len, stage); 695 ce->ce_mode =create_ce_mode(mode); 696 697if(refresh) 698returnrefresh_cache_entry(ce,0); 699 700return ce; 701} 702 703intce_same_name(struct cache_entry *a,struct cache_entry *b) 704{ 705int len =ce_namelen(a); 706returnce_namelen(b) == len && !memcmp(a->name, b->name, len); 707} 708 709intce_path_match(const struct cache_entry *ce,const char**pathspec) 710{ 711const char*match, *name; 712int len; 713 714if(!pathspec) 715return1; 716 717 len =ce_namelen(ce); 718 name = ce->name; 719while((match = *pathspec++) != NULL) { 720int matchlen =strlen(match); 721if(matchlen > len) 722continue; 723if(memcmp(name, match, matchlen)) 724continue; 725if(matchlen && name[matchlen-1] =='/') 726return1; 727if(name[matchlen] =='/'|| !name[matchlen]) 728return1; 729if(!matchlen) 730return1; 731} 732return0; 733} 734 735/* 736 * We fundamentally don't like some paths: we don't want 737 * dot or dot-dot anywhere, and for obvious reasons don't 738 * want to recurse into ".git" either. 739 * 740 * Also, we don't want double slashes or slashes at the 741 * end that can make pathnames ambiguous. 742 */ 743static intverify_dotfile(const char*rest) 744{ 745/* 746 * The first character was '.', but that 747 * has already been discarded, we now test 748 * the rest. 749 */ 750switch(*rest) { 751/* "." is not allowed */ 752case'\0':case'/': 753return0; 754 755/* 756 * ".git" followed by NUL or slash is bad. This 757 * shares the path end test with the ".." case. 758 */ 759case'g': 760if(rest[1] !='i') 761break; 762if(rest[2] !='t') 763break; 764 rest +=2; 765/* fallthrough */ 766case'.': 767if(rest[1] =='\0'|| rest[1] =='/') 768return0; 769} 770return1; 771} 772 773intverify_path(const char*path) 774{ 775char c; 776 777goto inside; 778for(;;) { 779if(!c) 780return1; 781if(c =='/') { 782inside: 783 c = *path++; 784switch(c) { 785default: 786continue; 787case'/':case'\0': 788break; 789case'.': 790if(verify_dotfile(path)) 791continue; 792} 793return0; 794} 795 c = *path++; 796} 797} 798 799/* 800 * Do we have another file that has the beginning components being a 801 * proper superset of the name we're trying to add? 802 */ 803static inthas_file_name(struct index_state *istate, 804const struct cache_entry *ce,int pos,int ok_to_replace) 805{ 806int retval =0; 807int len =ce_namelen(ce); 808int stage =ce_stage(ce); 809const char*name = ce->name; 810 811while(pos < istate->cache_nr) { 812struct cache_entry *p = istate->cache[pos++]; 813 814if(len >=ce_namelen(p)) 815break; 816if(memcmp(name, p->name, len)) 817break; 818if(ce_stage(p) != stage) 819continue; 820if(p->name[len] !='/') 821continue; 822if(p->ce_flags & CE_REMOVE) 823continue; 824 retval = -1; 825if(!ok_to_replace) 826break; 827remove_index_entry_at(istate, --pos); 828} 829return retval; 830} 831 832/* 833 * Do we have another file with a pathname that is a proper 834 * subset of the name we're trying to add? 835 */ 836static inthas_dir_name(struct index_state *istate, 837const struct cache_entry *ce,int pos,int ok_to_replace) 838{ 839int retval =0; 840int stage =ce_stage(ce); 841const char*name = ce->name; 842const char*slash = name +ce_namelen(ce); 843 844for(;;) { 845int len; 846 847for(;;) { 848if(*--slash =='/') 849break; 850if(slash <= ce->name) 851return retval; 852} 853 len = slash - name; 854 855 pos =index_name_pos(istate, name,create_ce_flags(len, stage)); 856if(pos >=0) { 857/* 858 * Found one, but not so fast. This could 859 * be a marker that says "I was here, but 860 * I am being removed". Such an entry is 861 * not a part of the resulting tree, and 862 * it is Ok to have a directory at the same 863 * path. 864 */ 865if(!(istate->cache[pos]->ce_flags & CE_REMOVE)) { 866 retval = -1; 867if(!ok_to_replace) 868break; 869remove_index_entry_at(istate, pos); 870continue; 871} 872} 873else 874 pos = -pos-1; 875 876/* 877 * Trivial optimization: if we find an entry that 878 * already matches the sub-directory, then we know 879 * we're ok, and we can exit. 880 */ 881while(pos < istate->cache_nr) { 882struct cache_entry *p = istate->cache[pos]; 883if((ce_namelen(p) <= len) || 884(p->name[len] !='/') || 885memcmp(p->name, name, len)) 886break;/* not our subdirectory */ 887if(ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) 888/* 889 * p is at the same stage as our entry, and 890 * is a subdirectory of what we are looking 891 * at, so we cannot have conflicts at our 892 * level or anything shorter. 893 */ 894return retval; 895 pos++; 896} 897} 898return retval; 899} 900 901/* We may be in a situation where we already have path/file and path 902 * is being added, or we already have path and path/file is being 903 * added. Either one would result in a nonsense tree that has path 904 * twice when git-write-tree tries to write it out. Prevent it. 905 * 906 * If ok-to-replace is specified, we remove the conflicting entries 907 * from the cache so the caller should recompute the insert position. 908 * When this happens, we return non-zero. 909 */ 910static intcheck_file_directory_conflict(struct index_state *istate, 911const struct cache_entry *ce, 912int pos,int ok_to_replace) 913{ 914int retval; 915 916/* 917 * When ce is an "I am going away" entry, we allow it to be added 918 */ 919if(ce->ce_flags & CE_REMOVE) 920return0; 921 922/* 923 * We check if the path is a sub-path of a subsequent pathname 924 * first, since removing those will not change the position 925 * in the array. 926 */ 927 retval =has_file_name(istate, ce, pos, ok_to_replace); 928 929/* 930 * Then check if the path might have a clashing sub-directory 931 * before it. 932 */ 933return retval +has_dir_name(istate, ce, pos, ok_to_replace); 934} 935 936static intadd_index_entry_with_check(struct index_state *istate,struct cache_entry *ce,int option) 937{ 938int pos; 939int ok_to_add = option & ADD_CACHE_OK_TO_ADD; 940int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; 941int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; 942int new_only = option & ADD_CACHE_NEW_ONLY; 943 944cache_tree_invalidate_path(istate->cache_tree, ce->name); 945 pos =index_name_pos(istate, ce->name, ce->ce_flags); 946 947/* existing match? Just replace it. */ 948if(pos >=0) { 949if(!new_only) 950replace_index_entry(istate, pos, ce); 951return0; 952} 953 pos = -pos-1; 954 955/* 956 * Inserting a merged entry ("stage 0") into the index 957 * will always replace all non-merged entries.. 958 */ 959if(pos < istate->cache_nr &&ce_stage(ce) ==0) { 960while(ce_same_name(istate->cache[pos], ce)) { 961 ok_to_add =1; 962if(!remove_index_entry_at(istate, pos)) 963break; 964} 965} 966 967if(!ok_to_add) 968return-1; 969if(!verify_path(ce->name)) 970returnerror("Invalid path '%s'", ce->name); 971 972if(!skip_df_check && 973check_file_directory_conflict(istate, ce, pos, ok_to_replace)) { 974if(!ok_to_replace) 975returnerror("'%s' appears as both a file and as a directory", 976 ce->name); 977 pos =index_name_pos(istate, ce->name, ce->ce_flags); 978 pos = -pos-1; 979} 980return pos +1; 981} 982 983intadd_index_entry(struct index_state *istate,struct cache_entry *ce,int option) 984{ 985int pos; 986 987if(option & ADD_CACHE_JUST_APPEND) 988 pos = istate->cache_nr; 989else{ 990int ret; 991 ret =add_index_entry_with_check(istate, ce, option); 992if(ret <=0) 993return ret; 994 pos = ret -1; 995} 996 997/* Make sure the array is big enough .. */ 998if(istate->cache_nr == istate->cache_alloc) { 999 istate->cache_alloc =alloc_nr(istate->cache_alloc);1000 istate->cache =xrealloc(istate->cache,1001 istate->cache_alloc *sizeof(struct cache_entry *));1002}10031004/* Add it in.. */1005 istate->cache_nr++;1006if(istate->cache_nr > pos +1)1007memmove(istate->cache + pos +1,1008 istate->cache + pos,1009(istate->cache_nr - pos -1) *sizeof(ce));1010set_index_entry(istate, pos, ce);1011 istate->cache_changed =1;1012return0;1013}10141015/*1016 * "refresh" does not calculate a new sha1 file or bring the1017 * cache up-to-date for mode/content changes. But what it1018 * _does_ do is to "re-match" the stat information of a file1019 * with the cache, so that you can refresh the cache for a1020 * file that hasn't been changed but where the stat entry is1021 * out of date.1022 *1023 * For example, you'd want to do this after doing a "git-read-tree",1024 * to link up the stat cache details with the proper files.1025 */1026static struct cache_entry *refresh_cache_ent(struct index_state *istate,1027struct cache_entry *ce,1028unsigned int options,int*err)1029{1030struct stat st;1031struct cache_entry *updated;1032int changed, size;1033int ignore_valid = options & CE_MATCH_IGNORE_VALID;1034int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;10351036if(ce_uptodate(ce))1037return ce;10381039/*1040 * CE_VALID or CE_SKIP_WORKTREE means the user promised us1041 * that the change to the work tree does not matter and told1042 * us not to worry.1043 */1044if(!ignore_skip_worktree &&ce_skip_worktree(ce)) {1045ce_mark_uptodate(ce);1046return ce;1047}1048if(!ignore_valid && (ce->ce_flags & CE_VALID)) {1049ce_mark_uptodate(ce);1050return ce;1051}10521053if(lstat(ce->name, &st) <0) {1054if(err)1055*err = errno;1056return NULL;1057}10581059 changed =ie_match_stat(istate, ce, &st, options);1060if(!changed) {1061/*1062 * The path is unchanged. If we were told to ignore1063 * valid bit, then we did the actual stat check and1064 * found that the entry is unmodified. If the entry1065 * is not marked VALID, this is the place to mark it1066 * valid again, under "assume unchanged" mode.1067 */1068if(ignore_valid && assume_unchanged &&1069!(ce->ce_flags & CE_VALID))1070;/* mark this one VALID again */1071else{1072/*1073 * We do not mark the index itself "modified"1074 * because CE_UPTODATE flag is in-core only;1075 * we are not going to write this change out.1076 */1077if(!S_ISGITLINK(ce->ce_mode))1078ce_mark_uptodate(ce);1079return ce;1080}1081}10821083if(ie_modified(istate, ce, &st, options)) {1084if(err)1085*err = EINVAL;1086return NULL;1087}10881089 size =ce_size(ce);1090 updated =xmalloc(size);1091memcpy(updated, ce, size);1092fill_stat_cache_info(updated, &st);1093/*1094 * If ignore_valid is not set, we should leave CE_VALID bit1095 * alone. Otherwise, paths marked with --no-assume-unchanged1096 * (i.e. things to be edited) will reacquire CE_VALID bit1097 * automatically, which is not really what we want.1098 */1099if(!ignore_valid && assume_unchanged &&1100!(ce->ce_flags & CE_VALID))1101 updated->ce_flags &= ~CE_VALID;11021103return updated;1104}11051106static voidshow_file(const char* fmt,const char* name,int in_porcelain,1107int* first,const char*header_msg)1108{1109if(in_porcelain && *first && header_msg) {1110printf("%s\n", header_msg);1111*first=0;1112}1113printf(fmt, name);1114}11151116intrefresh_index(struct index_state *istate,unsigned int flags,const char**pathspec,1117char*seen,const char*header_msg)1118{1119int i;1120int has_errors =0;1121int really = (flags & REFRESH_REALLY) !=0;1122int allow_unmerged = (flags & REFRESH_UNMERGED) !=0;1123int quiet = (flags & REFRESH_QUIET) !=0;1124int not_new = (flags & REFRESH_IGNORE_MISSING) !=0;1125int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) !=0;1126int first =1;1127int in_porcelain = (flags & REFRESH_IN_PORCELAIN);1128unsigned int options = really ? CE_MATCH_IGNORE_VALID :0;1129const char*needs_update_fmt;1130const char*needs_merge_fmt;11311132 needs_update_fmt = (in_porcelain ?"M\t%s\n":"%s: needs update\n");1133 needs_merge_fmt = (in_porcelain ?"U\t%s\n":"%s: needs merge\n");1134for(i =0; i < istate->cache_nr; i++) {1135struct cache_entry *ce, *new;1136int cache_errno =0;11371138 ce = istate->cache[i];1139if(ignore_submodules &&S_ISGITLINK(ce->ce_mode))1140continue;11411142if(ce_stage(ce)) {1143while((i < istate->cache_nr) &&1144!strcmp(istate->cache[i]->name, ce->name))1145 i++;1146 i--;1147if(allow_unmerged)1148continue;1149show_file(needs_merge_fmt, ce->name, in_porcelain, &first, header_msg);1150 has_errors =1;1151continue;1152}11531154if(pathspec && !match_pathspec(pathspec, ce->name,strlen(ce->name),0, seen))1155continue;11561157new=refresh_cache_ent(istate, ce, options, &cache_errno);1158if(new== ce)1159continue;1160if(!new) {1161if(not_new && cache_errno == ENOENT)1162continue;1163if(really && cache_errno == EINVAL) {1164/* If we are doing --really-refresh that1165 * means the index is not valid anymore.1166 */1167 ce->ce_flags &= ~CE_VALID;1168 istate->cache_changed =1;1169}1170if(quiet)1171continue;1172show_file(needs_update_fmt, ce->name, in_porcelain, &first, header_msg);1173 has_errors =1;1174continue;1175}11761177replace_index_entry(istate, i,new);1178}1179return has_errors;1180}11811182static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,int really)1183{1184returnrefresh_cache_ent(&the_index, ce, really, NULL);1185}11861187static intverify_hdr(struct cache_header *hdr,unsigned long size)1188{1189 git_SHA_CTX c;1190unsigned char sha1[20];11911192if(hdr->hdr_signature !=htonl(CACHE_SIGNATURE))1193returnerror("bad signature");1194if(hdr->hdr_version !=htonl(2) && hdr->hdr_version !=htonl(3))1195returnerror("bad index version");1196git_SHA1_Init(&c);1197git_SHA1_Update(&c, hdr, size -20);1198git_SHA1_Final(sha1, &c);1199if(hashcmp(sha1, (unsigned char*)hdr + size -20))1200returnerror("bad index file sha1 signature");1201return0;1202}12031204static intread_index_extension(struct index_state *istate,1205const char*ext,void*data,unsigned long sz)1206{1207switch(CACHE_EXT(ext)) {1208case CACHE_EXT_TREE:1209 istate->cache_tree =cache_tree_read(data, sz);1210break;1211case CACHE_EXT_RESOLVE_UNDO:1212 istate->resolve_undo =resolve_undo_read(data, sz);1213break;1214default:1215if(*ext <'A'||'Z'< *ext)1216returnerror("index uses %.4s extension, which we do not understand",1217 ext);1218fprintf(stderr,"ignoring %.4s extension\n", ext);1219break;1220}1221return0;1222}12231224intread_index(struct index_state *istate)1225{1226returnread_index_from(istate,get_index_file());1227}12281229static voidconvert_from_disk(struct ondisk_cache_entry *ondisk,struct cache_entry *ce)1230{1231size_t len;1232const char*name;12331234 ce->ce_ctime.sec =ntohl(ondisk->ctime.sec);1235 ce->ce_mtime.sec =ntohl(ondisk->mtime.sec);1236 ce->ce_ctime.nsec =ntohl(ondisk->ctime.nsec);1237 ce->ce_mtime.nsec =ntohl(ondisk->mtime.nsec);1238 ce->ce_dev =ntohl(ondisk->dev);1239 ce->ce_ino =ntohl(ondisk->ino);1240 ce->ce_mode =ntohl(ondisk->mode);1241 ce->ce_uid =ntohl(ondisk->uid);1242 ce->ce_gid =ntohl(ondisk->gid);1243 ce->ce_size =ntohl(ondisk->size);1244/* On-disk flags are just 16 bits */1245 ce->ce_flags =ntohs(ondisk->flags);12461247hashcpy(ce->sha1, ondisk->sha1);12481249 len = ce->ce_flags & CE_NAMEMASK;12501251if(ce->ce_flags & CE_EXTENDED) {1252struct ondisk_cache_entry_extended *ondisk2;1253int extended_flags;1254 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1255 extended_flags =ntohs(ondisk2->flags2) <<16;1256/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */1257if(extended_flags & ~CE_EXTENDED_FLAGS)1258die("Unknown index entry format%08x", extended_flags);1259 ce->ce_flags |= extended_flags;1260 name = ondisk2->name;1261}1262else1263 name = ondisk->name;12641265if(len == CE_NAMEMASK)1266 len =strlen(name);1267/*1268 * NEEDSWORK: If the original index is crafted, this copy could1269 * go unchecked.1270 */1271memcpy(ce->name, name, len +1);1272}12731274staticinlinesize_testimate_cache_size(size_t ondisk_size,unsigned int entries)1275{1276long per_entry;12771278 per_entry =sizeof(struct cache_entry) -sizeof(struct ondisk_cache_entry);12791280/*1281 * Alignment can cause differences. This should be "alignof", but1282 * since that's a gcc'ism, just use the size of a pointer.1283 */1284 per_entry +=sizeof(void*);1285return ondisk_size + entries*per_entry;1286}12871288/* remember to discard_cache() before reading a different cache! */1289intread_index_from(struct index_state *istate,const char*path)1290{1291int fd, i;1292struct stat st;1293unsigned long src_offset, dst_offset;1294struct cache_header *hdr;1295void*mmap;1296size_t mmap_size;12971298 errno = EBUSY;1299if(istate->initialized)1300return istate->cache_nr;13011302 errno = ENOENT;1303 istate->timestamp.sec =0;1304 istate->timestamp.nsec =0;1305 fd =open(path, O_RDONLY);1306if(fd <0) {1307if(errno == ENOENT)1308return0;1309die_errno("index file open failed");1310}13111312if(fstat(fd, &st))1313die_errno("cannot stat the open index");13141315 errno = EINVAL;1316 mmap_size =xsize_t(st.st_size);1317if(mmap_size <sizeof(struct cache_header) +20)1318die("index file smaller than expected");13191320 mmap =xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,0);1321close(fd);1322if(mmap == MAP_FAILED)1323die_errno("unable to map index file");13241325 hdr = mmap;1326if(verify_hdr(hdr, mmap_size) <0)1327goto unmap;13281329 istate->cache_nr =ntohl(hdr->hdr_entries);1330 istate->cache_alloc =alloc_nr(istate->cache_nr);1331 istate->cache =xcalloc(istate->cache_alloc,sizeof(struct cache_entry *));13321333/*1334 * The disk format is actually larger than the in-memory format,1335 * due to space for nsec etc, so even though the in-memory one1336 * has room for a few more flags, we can allocate using the same1337 * index size1338 */1339 istate->alloc =xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));1340 istate->initialized =1;13411342 src_offset =sizeof(*hdr);1343 dst_offset =0;1344for(i =0; i < istate->cache_nr; i++) {1345struct ondisk_cache_entry *disk_ce;1346struct cache_entry *ce;13471348 disk_ce = (struct ondisk_cache_entry *)((char*)mmap + src_offset);1349 ce = (struct cache_entry *)((char*)istate->alloc + dst_offset);1350convert_from_disk(disk_ce, ce);1351set_index_entry(istate, i, ce);13521353 src_offset +=ondisk_ce_size(ce);1354 dst_offset +=ce_size(ce);1355}1356 istate->timestamp.sec = st.st_mtime;1357 istate->timestamp.nsec =ST_MTIME_NSEC(st);13581359while(src_offset <= mmap_size -20-8) {1360/* After an array of active_nr index entries,1361 * there can be arbitrary number of extended1362 * sections, each of which is prefixed with1363 * extension name (4-byte) and section length1364 * in 4-byte network byte order.1365 */1366uint32_t extsize;1367memcpy(&extsize, (char*)mmap + src_offset +4,4);1368 extsize =ntohl(extsize);1369if(read_index_extension(istate,1370(const char*) mmap + src_offset,1371(char*) mmap + src_offset +8,1372 extsize) <0)1373goto unmap;1374 src_offset +=8;1375 src_offset += extsize;1376}1377munmap(mmap, mmap_size);1378return istate->cache_nr;13791380unmap:1381munmap(mmap, mmap_size);1382 errno = EINVAL;1383die("index file corrupt");1384}13851386intis_index_unborn(struct index_state *istate)1387{1388return(!istate->cache_nr && !istate->alloc && !istate->timestamp.sec);1389}13901391intdiscard_index(struct index_state *istate)1392{1393resolve_undo_clear_index(istate);1394 istate->cache_nr =0;1395 istate->cache_changed =0;1396 istate->timestamp.sec =0;1397 istate->timestamp.nsec =0;1398 istate->name_hash_initialized =0;1399free_hash(&istate->name_hash);1400cache_tree_free(&(istate->cache_tree));1401free(istate->alloc);1402 istate->alloc = NULL;1403 istate->initialized =0;14041405/* no need to throw away allocated active_cache */1406return0;1407}14081409intunmerged_index(const struct index_state *istate)1410{1411int i;1412for(i =0; i < istate->cache_nr; i++) {1413if(ce_stage(istate->cache[i]))1414return1;1415}1416return0;1417}14181419#define WRITE_BUFFER_SIZE 81921420static unsigned char write_buffer[WRITE_BUFFER_SIZE];1421static unsigned long write_buffer_len;14221423static intce_write_flush(git_SHA_CTX *context,int fd)1424{1425unsigned int buffered = write_buffer_len;1426if(buffered) {1427git_SHA1_Update(context, write_buffer, buffered);1428if(write_in_full(fd, write_buffer, buffered) != buffered)1429return-1;1430 write_buffer_len =0;1431}1432return0;1433}14341435static intce_write(git_SHA_CTX *context,int fd,void*data,unsigned int len)1436{1437while(len) {1438unsigned int buffered = write_buffer_len;1439unsigned int partial = WRITE_BUFFER_SIZE - buffered;1440if(partial > len)1441 partial = len;1442memcpy(write_buffer + buffered, data, partial);1443 buffered += partial;1444if(buffered == WRITE_BUFFER_SIZE) {1445 write_buffer_len = buffered;1446if(ce_write_flush(context, fd))1447return-1;1448 buffered =0;1449}1450 write_buffer_len = buffered;1451 len -= partial;1452 data = (char*) data + partial;1453}1454return0;1455}14561457static intwrite_index_ext_header(git_SHA_CTX *context,int fd,1458unsigned int ext,unsigned int sz)1459{1460 ext =htonl(ext);1461 sz =htonl(sz);1462return((ce_write(context, fd, &ext,4) <0) ||1463(ce_write(context, fd, &sz,4) <0)) ? -1:0;1464}14651466static intce_flush(git_SHA_CTX *context,int fd)1467{1468unsigned int left = write_buffer_len;14691470if(left) {1471 write_buffer_len =0;1472git_SHA1_Update(context, write_buffer, left);1473}14741475/* Flush first if not enough space for SHA1 signature */1476if(left +20> WRITE_BUFFER_SIZE) {1477if(write_in_full(fd, write_buffer, left) != left)1478return-1;1479 left =0;1480}14811482/* Append the SHA1 signature at the end */1483git_SHA1_Final(write_buffer + left, context);1484 left +=20;1485return(write_in_full(fd, write_buffer, left) != left) ? -1:0;1486}14871488static voidce_smudge_racily_clean_entry(struct cache_entry *ce)1489{1490/*1491 * The only thing we care about in this function is to smudge the1492 * falsely clean entry due to touch-update-touch race, so we leave1493 * everything else as they are. We are called for entries whose1494 * ce_mtime match the index file mtime.1495 *1496 * Note that this actually does not do much for gitlinks, for1497 * which ce_match_stat_basic() always goes to the actual1498 * contents. The caller checks with is_racy_timestamp() which1499 * always says "no" for gitlinks, so we are not called for them ;-)1500 */1501struct stat st;15021503if(lstat(ce->name, &st) <0)1504return;1505if(ce_match_stat_basic(ce, &st))1506return;1507if(ce_modified_check_fs(ce, &st)) {1508/* This is "racily clean"; smudge it. Note that this1509 * is a tricky code. At first glance, it may appear1510 * that it can break with this sequence:1511 *1512 * $ echo xyzzy >frotz1513 * $ git-update-index --add frotz1514 * $ : >frotz1515 * $ sleep 31516 * $ echo filfre >nitfol1517 * $ git-update-index --add nitfol1518 *1519 * but it does not. When the second update-index runs,1520 * it notices that the entry "frotz" has the same timestamp1521 * as index, and if we were to smudge it by resetting its1522 * size to zero here, then the object name recorded1523 * in index is the 6-byte file but the cached stat information1524 * becomes zero --- which would then match what we would1525 * obtain from the filesystem next time we stat("frotz").1526 *1527 * However, the second update-index, before calling1528 * this function, notices that the cached size is 61529 * bytes and what is on the filesystem is an empty1530 * file, and never calls us, so the cached size information1531 * for "frotz" stays 6 which does not match the filesystem.1532 */1533 ce->ce_size =0;1534}1535}15361537static intce_write_entry(git_SHA_CTX *c,int fd,struct cache_entry *ce)1538{1539int size =ondisk_ce_size(ce);1540struct ondisk_cache_entry *ondisk =xcalloc(1, size);1541char*name;1542int result;15431544 ondisk->ctime.sec =htonl(ce->ce_ctime.sec);1545 ondisk->mtime.sec =htonl(ce->ce_mtime.sec);1546 ondisk->ctime.nsec =htonl(ce->ce_ctime.nsec);1547 ondisk->mtime.nsec =htonl(ce->ce_mtime.nsec);1548 ondisk->dev =htonl(ce->ce_dev);1549 ondisk->ino =htonl(ce->ce_ino);1550 ondisk->mode =htonl(ce->ce_mode);1551 ondisk->uid =htonl(ce->ce_uid);1552 ondisk->gid =htonl(ce->ce_gid);1553 ondisk->size =htonl(ce->ce_size);1554hashcpy(ondisk->sha1, ce->sha1);1555 ondisk->flags =htons(ce->ce_flags);1556if(ce->ce_flags & CE_EXTENDED) {1557struct ondisk_cache_entry_extended *ondisk2;1558 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1559 ondisk2->flags2 =htons((ce->ce_flags & CE_EXTENDED_FLAGS) >>16);1560 name = ondisk2->name;1561}1562else1563 name = ondisk->name;1564memcpy(name, ce->name,ce_namelen(ce));15651566 result =ce_write(c, fd, ondisk, size);1567free(ondisk);1568return result;1569}15701571intwrite_index(struct index_state *istate,int newfd)1572{1573 git_SHA_CTX c;1574struct cache_header hdr;1575int i, err, removed, extended;1576struct cache_entry **cache = istate->cache;1577int entries = istate->cache_nr;1578struct stat st;15791580for(i = removed = extended =0; i < entries; i++) {1581if(cache[i]->ce_flags & CE_REMOVE)1582 removed++;15831584/* reduce extended entries if possible */1585 cache[i]->ce_flags &= ~CE_EXTENDED;1586if(cache[i]->ce_flags & CE_EXTENDED_FLAGS) {1587 extended++;1588 cache[i]->ce_flags |= CE_EXTENDED;1589}1590}15911592 hdr.hdr_signature =htonl(CACHE_SIGNATURE);1593/* for extended format, increase version so older git won't try to read it */1594 hdr.hdr_version =htonl(extended ?3:2);1595 hdr.hdr_entries =htonl(entries - removed);15961597git_SHA1_Init(&c);1598if(ce_write(&c, newfd, &hdr,sizeof(hdr)) <0)1599return-1;16001601for(i =0; i < entries; i++) {1602struct cache_entry *ce = cache[i];1603if(ce->ce_flags & CE_REMOVE)1604continue;1605if(!ce_uptodate(ce) &&is_racy_timestamp(istate, ce))1606ce_smudge_racily_clean_entry(ce);1607if(ce_write_entry(&c, newfd, ce) <0)1608return-1;1609}16101611/* Write extension data here */1612if(istate->cache_tree) {1613struct strbuf sb = STRBUF_INIT;16141615cache_tree_write(&sb, istate->cache_tree);1616 err =write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) <01617||ce_write(&c, newfd, sb.buf, sb.len) <0;1618strbuf_release(&sb);1619if(err)1620return-1;1621}1622if(istate->resolve_undo) {1623struct strbuf sb = STRBUF_INIT;16241625resolve_undo_write(&sb, istate->resolve_undo);1626 err =write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,1627 sb.len) <01628||ce_write(&c, newfd, sb.buf, sb.len) <0;1629strbuf_release(&sb);1630if(err)1631return-1;1632}16331634if(ce_flush(&c, newfd) ||fstat(newfd, &st))1635return-1;1636 istate->timestamp.sec = (unsigned int)st.st_mtime;1637 istate->timestamp.nsec =ST_MTIME_NSEC(st);1638return0;1639}16401641/*1642 * Read the index file that is potentially unmerged into given1643 * index_state, dropping any unmerged entries. Returns true if1644 * the index is unmerged. Callers who want to refuse to work1645 * from an unmerged state can call this and check its return value,1646 * instead of calling read_cache().1647 */1648intread_index_unmerged(struct index_state *istate)1649{1650int i;1651int unmerged =0;16521653read_index(istate);1654for(i =0; i < istate->cache_nr; i++) {1655struct cache_entry *ce = istate->cache[i];1656struct cache_entry *new_ce;1657int size, len;16581659if(!ce_stage(ce))1660continue;1661 unmerged =1;1662 len =strlen(ce->name);1663 size =cache_entry_size(len);1664 new_ce =xcalloc(1, size);1665memcpy(new_ce->name, ce->name, len);1666 new_ce->ce_flags =create_ce_flags(len,0) | CE_CONFLICTED;1667 new_ce->ce_mode = ce->ce_mode;1668if(add_index_entry(istate, new_ce,0))1669returnerror("%s: cannot drop to stage #0",1670 ce->name);1671 i =index_name_pos(istate, new_ce->name, len);1672}1673return unmerged;1674}16751676/*1677 * Returns 1 if the path is an "other" path with respect to1678 * the index; that is, the path is not mentioned in the index at all,1679 * either as a file, a directory with some files in the index,1680 * or as an unmerged entry.1681 *1682 * We helpfully remove a trailing "/" from directories so that1683 * the output of read_directory can be used as-is.1684 */1685intindex_name_is_other(const struct index_state *istate,const char*name,1686int namelen)1687{1688int pos;1689if(namelen && name[namelen -1] =='/')1690 namelen--;1691 pos =index_name_pos(istate, name, namelen);1692if(0<= pos)1693return0;/* exact match */1694 pos = -pos -1;1695if(pos < istate->cache_nr) {1696struct cache_entry *ce = istate->cache[pos];1697if(ce_namelen(ce) == namelen &&1698!memcmp(ce->name, name, namelen))1699return0;/* Yup, this one exists unmerged */1700}1701return1;1702}