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"diff.h" 14#include"diffcore.h" 15#include"revision.h" 16#include"blob.h" 17#include"resolve-undo.h" 18 19/* Index extensions. 20 * 21 * The first letter should be 'A'..'Z' for extensions that are not 22 * necessary for a correct operation (i.e. optimization data). 23 * When new extensions are added that _needs_ to be understood in 24 * order to correctly interpret the index file, pick character that 25 * is outside the range, to cause the reader to abort. 26 */ 27 28#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) ) 29#define CACHE_EXT_TREE 0x54524545/* "TREE" */ 30#define CACHE_EXT_RESOLVE_UNDO 0x52455543/* "REUN" */ 31 32struct index_state the_index; 33 34static voidset_index_entry(struct index_state *istate,int nr,struct cache_entry *ce) 35{ 36 istate->cache[nr] = ce; 37add_name_hash(istate, ce); 38} 39 40static voidreplace_index_entry(struct index_state *istate,int nr,struct cache_entry *ce) 41{ 42struct cache_entry *old = istate->cache[nr]; 43 44remove_name_hash(old); 45set_index_entry(istate, nr, ce); 46 istate->cache_changed =1; 47} 48 49voidrename_index_entry_at(struct index_state *istate,int nr,const char*new_name) 50{ 51struct cache_entry *old = istate->cache[nr], *new; 52int namelen =strlen(new_name); 53 54new=xmalloc(cache_entry_size(namelen)); 55copy_cache_entry(new, old); 56new->ce_flags &= ~(CE_STATE_MASK | CE_NAMEMASK); 57new->ce_flags |= (namelen >= CE_NAMEMASK ? CE_NAMEMASK : namelen); 58memcpy(new->name, new_name, namelen +1); 59 60cache_tree_invalidate_path(istate->cache_tree, old->name); 61remove_index_entry_at(istate, nr); 62add_index_entry(istate,new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); 63} 64 65/* 66 * This only updates the "non-critical" parts of the directory 67 * cache, ie the parts that aren't tracked by GIT, and only used 68 * to validate the cache. 69 */ 70voidfill_stat_cache_info(struct cache_entry *ce,struct stat *st) 71{ 72 ce->ce_ctime.sec = (unsigned int)st->st_ctime; 73 ce->ce_mtime.sec = (unsigned int)st->st_mtime; 74 ce->ce_ctime.nsec =ST_CTIME_NSEC(*st); 75 ce->ce_mtime.nsec =ST_MTIME_NSEC(*st); 76 ce->ce_dev = st->st_dev; 77 ce->ce_ino = st->st_ino; 78 ce->ce_uid = st->st_uid; 79 ce->ce_gid = st->st_gid; 80 ce->ce_size = st->st_size; 81 82if(assume_unchanged) 83 ce->ce_flags |= CE_VALID; 84 85if(S_ISREG(st->st_mode)) 86ce_mark_uptodate(ce); 87} 88 89static intce_compare_data(struct cache_entry *ce,struct stat *st) 90{ 91int match = -1; 92int fd =open(ce->name, O_RDONLY); 93 94if(fd >=0) { 95unsigned char sha1[20]; 96if(!index_fd(sha1, fd, st,0, OBJ_BLOB, ce->name)) 97 match =hashcmp(sha1, ce->sha1); 98/* index_fd() closed the file descriptor already */ 99} 100return match; 101} 102 103static intce_compare_link(struct cache_entry *ce,size_t expected_size) 104{ 105int match = -1; 106void*buffer; 107unsigned long size; 108enum object_type type; 109struct strbuf sb = STRBUF_INIT; 110 111if(strbuf_readlink(&sb, ce->name, expected_size)) 112return-1; 113 114 buffer =read_sha1_file(ce->sha1, &type, &size); 115if(buffer) { 116if(size == sb.len) 117 match =memcmp(buffer, sb.buf, size); 118free(buffer); 119} 120strbuf_release(&sb); 121return match; 122} 123 124static intce_compare_gitlink(struct cache_entry *ce) 125{ 126unsigned char sha1[20]; 127 128/* 129 * We don't actually require that the .git directory 130 * under GITLINK directory be a valid git directory. It 131 * might even be missing (in case nobody populated that 132 * sub-project). 133 * 134 * If so, we consider it always to match. 135 */ 136if(resolve_gitlink_ref(ce->name,"HEAD", sha1) <0) 137return0; 138returnhashcmp(sha1, ce->sha1); 139} 140 141static intce_modified_check_fs(struct cache_entry *ce,struct stat *st) 142{ 143switch(st->st_mode & S_IFMT) { 144case S_IFREG: 145if(ce_compare_data(ce, st)) 146return DATA_CHANGED; 147break; 148case S_IFLNK: 149if(ce_compare_link(ce,xsize_t(st->st_size))) 150return DATA_CHANGED; 151break; 152case S_IFDIR: 153if(S_ISGITLINK(ce->ce_mode)) 154returnce_compare_gitlink(ce) ? DATA_CHANGED :0; 155default: 156return TYPE_CHANGED; 157} 158return0; 159} 160 161intis_empty_blob_sha1(const unsigned char*sha1) 162{ 163static const unsigned char empty_blob_sha1[20] = { 1640xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b, 1650x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91 166}; 167 168return!hashcmp(sha1, empty_blob_sha1); 169} 170 171static intce_match_stat_basic(struct cache_entry *ce,struct stat *st) 172{ 173unsigned int changed =0; 174 175if(ce->ce_flags & CE_REMOVE) 176return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED; 177 178switch(ce->ce_mode & S_IFMT) { 179case S_IFREG: 180 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED :0; 181/* We consider only the owner x bit to be relevant for 182 * "mode changes" 183 */ 184if(trust_executable_bit && 185(0100& (ce->ce_mode ^ st->st_mode))) 186 changed |= MODE_CHANGED; 187break; 188case S_IFLNK: 189if(!S_ISLNK(st->st_mode) && 190(has_symlinks || !S_ISREG(st->st_mode))) 191 changed |= TYPE_CHANGED; 192break; 193case S_IFGITLINK: 194/* We ignore most of the st_xxx fields for gitlinks */ 195if(!S_ISDIR(st->st_mode)) 196 changed |= TYPE_CHANGED; 197else if(ce_compare_gitlink(ce)) 198 changed |= DATA_CHANGED; 199return changed; 200default: 201die("internal error: ce_mode is%o", ce->ce_mode); 202} 203if(ce->ce_mtime.sec != (unsigned int)st->st_mtime) 204 changed |= MTIME_CHANGED; 205if(trust_ctime && ce->ce_ctime.sec != (unsigned int)st->st_ctime) 206 changed |= CTIME_CHANGED; 207 208#ifdef USE_NSEC 209if(ce->ce_mtime.nsec !=ST_MTIME_NSEC(*st)) 210 changed |= MTIME_CHANGED; 211if(trust_ctime && ce->ce_ctime.nsec !=ST_CTIME_NSEC(*st)) 212 changed |= CTIME_CHANGED; 213#endif 214 215if(ce->ce_uid != (unsigned int) st->st_uid || 216 ce->ce_gid != (unsigned int) st->st_gid) 217 changed |= OWNER_CHANGED; 218if(ce->ce_ino != (unsigned int) st->st_ino) 219 changed |= INODE_CHANGED; 220 221#ifdef USE_STDEV 222/* 223 * st_dev breaks on network filesystems where different 224 * clients will have different views of what "device" 225 * the filesystem is on 226 */ 227if(ce->ce_dev != (unsigned int) st->st_dev) 228 changed |= INODE_CHANGED; 229#endif 230 231if(ce->ce_size != (unsigned int) st->st_size) 232 changed |= DATA_CHANGED; 233 234/* Racily smudged entry? */ 235if(!ce->ce_size) { 236if(!is_empty_blob_sha1(ce->sha1)) 237 changed |= DATA_CHANGED; 238} 239 240return changed; 241} 242 243static intis_racy_timestamp(const struct index_state *istate,struct cache_entry *ce) 244{ 245return(!S_ISGITLINK(ce->ce_mode) && 246 istate->timestamp.sec && 247#ifdef USE_NSEC 248/* nanosecond timestamped files can also be racy! */ 249(istate->timestamp.sec < ce->ce_mtime.sec || 250(istate->timestamp.sec == ce->ce_mtime.sec && 251 istate->timestamp.nsec <= ce->ce_mtime.nsec)) 252#else 253 istate->timestamp.sec <= ce->ce_mtime.sec 254#endif 255); 256} 257 258intie_match_stat(const struct index_state *istate, 259struct cache_entry *ce,struct stat *st, 260unsigned int options) 261{ 262unsigned int changed; 263int ignore_valid = options & CE_MATCH_IGNORE_VALID; 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 */ 270if(!ignore_valid && (ce->ce_flags & CE_VALID)) 271return0; 272 273/* 274 * Intent-to-add entries have not been added, so the index entry 275 * by definition never matches what is in the work tree until it 276 * actually gets added. 277 */ 278if(ce->ce_flags & CE_INTENT_TO_ADD) 279return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED; 280 281 changed =ce_match_stat_basic(ce, st); 282 283/* 284 * Within 1 second of this sequence: 285 * echo xyzzy >file && git-update-index --add file 286 * running this command: 287 * echo frotz >file 288 * would give a falsely clean cache entry. The mtime and 289 * length match the cache, and other stat fields do not change. 290 * 291 * We could detect this at update-index time (the cache entry 292 * being registered/updated records the same time as "now") 293 * and delay the return from git-update-index, but that would 294 * effectively mean we can make at most one commit per second, 295 * which is not acceptable. Instead, we check cache entries 296 * whose mtime are the same as the index file timestamp more 297 * carefully than others. 298 */ 299if(!changed &&is_racy_timestamp(istate, ce)) { 300if(assume_racy_is_modified) 301 changed |= DATA_CHANGED; 302else 303 changed |=ce_modified_check_fs(ce, st); 304} 305 306return changed; 307} 308 309intie_modified(const struct index_state *istate, 310struct cache_entry *ce,struct stat *st,unsigned int options) 311{ 312int changed, changed_fs; 313 314 changed =ie_match_stat(istate, ce, st, options); 315if(!changed) 316return0; 317/* 318 * If the mode or type has changed, there's no point in trying 319 * to refresh the entry - it's not going to match 320 */ 321if(changed & (MODE_CHANGED | TYPE_CHANGED)) 322return changed; 323 324/* 325 * Immediately after read-tree or update-index --cacheinfo, 326 * the length field is zero, as we have never even read the 327 * lstat(2) information once, and we cannot trust DATA_CHANGED 328 * returned by ie_match_stat() which in turn was returned by 329 * ce_match_stat_basic() to signal that the filesize of the 330 * blob changed. We have to actually go to the filesystem to 331 * see if the contents match, and if so, should answer "unchanged". 332 * 333 * The logic does not apply to gitlinks, as ce_match_stat_basic() 334 * already has checked the actual HEAD from the filesystem in the 335 * subproject. If ie_match_stat() already said it is different, 336 * then we know it is. 337 */ 338if((changed & DATA_CHANGED) && 339(S_ISGITLINK(ce->ce_mode) || ce->ce_size !=0)) 340return changed; 341 342 changed_fs =ce_modified_check_fs(ce, st); 343if(changed_fs) 344return changed | changed_fs; 345return0; 346} 347 348intbase_name_compare(const char*name1,int len1,int mode1, 349const char*name2,int len2,int mode2) 350{ 351unsigned char c1, c2; 352int len = len1 < len2 ? len1 : len2; 353int cmp; 354 355 cmp =memcmp(name1, name2, len); 356if(cmp) 357return cmp; 358 c1 = name1[len]; 359 c2 = name2[len]; 360if(!c1 &&S_ISDIR(mode1)) 361 c1 ='/'; 362if(!c2 &&S_ISDIR(mode2)) 363 c2 ='/'; 364return(c1 < c2) ? -1: (c1 > c2) ?1:0; 365} 366 367/* 368 * df_name_compare() is identical to base_name_compare(), except it 369 * compares conflicting directory/file entries as equal. Note that 370 * while a directory name compares as equal to a regular file, they 371 * then individually compare _differently_ to a filename that has 372 * a dot after the basename (because '\0' < '.' < '/'). 373 * 374 * This is used by routines that want to traverse the git namespace 375 * but then handle conflicting entries together when possible. 376 */ 377intdf_name_compare(const char*name1,int len1,int mode1, 378const char*name2,int len2,int mode2) 379{ 380int len = len1 < len2 ? len1 : len2, cmp; 381unsigned char c1, c2; 382 383 cmp =memcmp(name1, name2, len); 384if(cmp) 385return cmp; 386/* Directories and files compare equal (same length, same name) */ 387if(len1 == len2) 388return0; 389 c1 = name1[len]; 390if(!c1 &&S_ISDIR(mode1)) 391 c1 ='/'; 392 c2 = name2[len]; 393if(!c2 &&S_ISDIR(mode2)) 394 c2 ='/'; 395if(c1 =='/'&& !c2) 396return0; 397if(c2 =='/'&& !c1) 398return0; 399return c1 - c2; 400} 401 402intcache_name_compare(const char*name1,int flags1,const char*name2,int flags2) 403{ 404int len1 = flags1 & CE_NAMEMASK; 405int len2 = flags2 & CE_NAMEMASK; 406int len = len1 < len2 ? len1 : len2; 407int cmp; 408 409 cmp =memcmp(name1, name2, len); 410if(cmp) 411return cmp; 412if(len1 < len2) 413return-1; 414if(len1 > len2) 415return1; 416 417/* Compare stages */ 418 flags1 &= CE_STAGEMASK; 419 flags2 &= CE_STAGEMASK; 420 421if(flags1 < flags2) 422return-1; 423if(flags1 > flags2) 424return1; 425return0; 426} 427 428intindex_name_pos(const struct index_state *istate,const char*name,int namelen) 429{ 430int first, last; 431 432 first =0; 433 last = istate->cache_nr; 434while(last > first) { 435int next = (last + first) >>1; 436struct cache_entry *ce = istate->cache[next]; 437int cmp =cache_name_compare(name, namelen, ce->name, ce->ce_flags); 438if(!cmp) 439return next; 440if(cmp <0) { 441 last = next; 442continue; 443} 444 first = next+1; 445} 446return-first-1; 447} 448 449/* Remove entry, return true if there are more entries to go.. */ 450intremove_index_entry_at(struct index_state *istate,int pos) 451{ 452struct cache_entry *ce = istate->cache[pos]; 453 454record_resolve_undo(istate, ce); 455remove_name_hash(ce); 456 istate->cache_changed =1; 457 istate->cache_nr--; 458if(pos >= istate->cache_nr) 459return0; 460memmove(istate->cache + pos, 461 istate->cache + pos +1, 462(istate->cache_nr - pos) *sizeof(struct cache_entry *)); 463return1; 464} 465 466/* 467 * Remove all cache ententries marked for removal, that is where 468 * CE_REMOVE is set in ce_flags. This is much more effective than 469 * calling remove_index_entry_at() for each entry to be removed. 470 */ 471voidremove_marked_cache_entries(struct index_state *istate) 472{ 473struct cache_entry **ce_array = istate->cache; 474unsigned int i, j; 475 476for(i = j =0; i < istate->cache_nr; i++) { 477if(ce_array[i]->ce_flags & CE_REMOVE) 478remove_name_hash(ce_array[i]); 479else 480 ce_array[j++] = ce_array[i]; 481} 482 istate->cache_changed =1; 483 istate->cache_nr = j; 484} 485 486intremove_file_from_index(struct index_state *istate,const char*path) 487{ 488int pos =index_name_pos(istate, path,strlen(path)); 489if(pos <0) 490 pos = -pos-1; 491cache_tree_invalidate_path(istate->cache_tree, path); 492while(pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path)) 493remove_index_entry_at(istate, pos); 494return0; 495} 496 497static intcompare_name(struct cache_entry *ce,const char*path,int namelen) 498{ 499return namelen !=ce_namelen(ce) ||memcmp(path, ce->name, namelen); 500} 501 502static intindex_name_pos_also_unmerged(struct index_state *istate, 503const char*path,int namelen) 504{ 505int pos =index_name_pos(istate, path, namelen); 506struct cache_entry *ce; 507 508if(pos >=0) 509return pos; 510 511/* maybe unmerged? */ 512 pos = -1- pos; 513if(pos >= istate->cache_nr || 514compare_name((ce = istate->cache[pos]), path, namelen)) 515return-1; 516 517/* order of preference: stage 2, 1, 3 */ 518if(ce_stage(ce) ==1&& pos +1< istate->cache_nr && 519ce_stage((ce = istate->cache[pos +1])) ==2&& 520!compare_name(ce, path, namelen)) 521 pos++; 522return pos; 523} 524 525static intdifferent_name(struct cache_entry *ce,struct cache_entry *alias) 526{ 527int len =ce_namelen(ce); 528returnce_namelen(alias) != len ||memcmp(ce->name, alias->name, len); 529} 530 531/* 532 * If we add a filename that aliases in the cache, we will use the 533 * name that we already have - but we don't want to update the same 534 * alias twice, because that implies that there were actually two 535 * different files with aliasing names! 536 * 537 * So we use the CE_ADDED flag to verify that the alias was an old 538 * one before we accept it as 539 */ 540static struct cache_entry *create_alias_ce(struct cache_entry *ce,struct cache_entry *alias) 541{ 542int len; 543struct cache_entry *new; 544 545if(alias->ce_flags & CE_ADDED) 546die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name); 547 548/* Ok, create the new entry using the name of the existing alias */ 549 len =ce_namelen(alias); 550new=xcalloc(1,cache_entry_size(len)); 551memcpy(new->name, alias->name, len); 552copy_cache_entry(new, ce); 553free(ce); 554return new; 555} 556 557static voidrecord_intent_to_add(struct cache_entry *ce) 558{ 559unsigned char sha1[20]; 560if(write_sha1_file("",0, blob_type, sha1)) 561die("cannot create an empty blob in the object database"); 562hashcpy(ce->sha1, sha1); 563} 564 565intadd_to_index(struct index_state *istate,const char*path,struct stat *st,int flags) 566{ 567int size, namelen, was_same; 568 mode_t st_mode = st->st_mode; 569struct cache_entry *ce, *alias; 570unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY; 571int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND); 572int pretend = flags & ADD_CACHE_PRETEND; 573int intent_only = flags & ADD_CACHE_INTENT; 574int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE| 575(intent_only ? ADD_CACHE_NEW_ONLY :0)); 576 577if(!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode)) 578returnerror("%s: can only add regular files, symbolic links or git-directories", path); 579 580 namelen =strlen(path); 581if(S_ISDIR(st_mode)) { 582while(namelen && path[namelen-1] =='/') 583 namelen--; 584} 585 size =cache_entry_size(namelen); 586 ce =xcalloc(1, size); 587memcpy(ce->name, path, namelen); 588 ce->ce_flags = namelen; 589if(!intent_only) 590fill_stat_cache_info(ce, st); 591else 592 ce->ce_flags |= CE_INTENT_TO_ADD; 593 594if(trust_executable_bit && has_symlinks) 595 ce->ce_mode =create_ce_mode(st_mode); 596else{ 597/* If there is an existing entry, pick the mode bits and type 598 * from it, otherwise assume unexecutable regular file. 599 */ 600struct cache_entry *ent; 601int pos =index_name_pos_also_unmerged(istate, path, namelen); 602 603 ent = (0<= pos) ? istate->cache[pos] : NULL; 604 ce->ce_mode =ce_mode_from_stat(ent, st_mode); 605} 606 607 alias =index_name_exists(istate, ce->name,ce_namelen(ce), ignore_case); 608if(alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) { 609/* Nothing changed, really */ 610free(ce); 611ce_mark_uptodate(alias); 612 alias->ce_flags |= CE_ADDED; 613return0; 614} 615if(!intent_only) { 616if(index_path(ce->sha1, path, st,1)) 617returnerror("unable to index file%s", path); 618}else 619record_intent_to_add(ce); 620 621if(ignore_case && alias &&different_name(ce, alias)) 622 ce =create_alias_ce(ce, alias); 623 ce->ce_flags |= CE_ADDED; 624 625/* It was suspected to be racily clean, but it turns out to be Ok */ 626 was_same = (alias && 627!ce_stage(alias) && 628!hashcmp(alias->sha1, ce->sha1) && 629 ce->ce_mode == alias->ce_mode); 630 631if(pretend) 632; 633else if(add_index_entry(istate, ce, add_option)) 634returnerror("unable to add%sto index",path); 635if(verbose && !was_same) 636printf("add '%s'\n", path); 637return0; 638} 639 640intadd_file_to_index(struct index_state *istate,const char*path,int flags) 641{ 642struct stat st; 643if(lstat(path, &st)) 644die_errno("unable to stat '%s'", path); 645returnadd_to_index(istate, path, &st, flags); 646} 647 648struct cache_entry *make_cache_entry(unsigned int mode, 649const unsigned char*sha1,const char*path,int stage, 650int refresh) 651{ 652int size, len; 653struct cache_entry *ce; 654 655if(!verify_path(path)) { 656error("Invalid path '%s'", path); 657return NULL; 658} 659 660 len =strlen(path); 661 size =cache_entry_size(len); 662 ce =xcalloc(1, size); 663 664hashcpy(ce->sha1, sha1); 665memcpy(ce->name, path, len); 666 ce->ce_flags =create_ce_flags(len, stage); 667 ce->ce_mode =create_ce_mode(mode); 668 669if(refresh) 670returnrefresh_cache_entry(ce,0); 671 672return ce; 673} 674 675intce_same_name(struct cache_entry *a,struct cache_entry *b) 676{ 677int len =ce_namelen(a); 678returnce_namelen(b) == len && !memcmp(a->name, b->name, len); 679} 680 681intce_path_match(const struct cache_entry *ce,const char**pathspec) 682{ 683const char*match, *name; 684int len; 685 686if(!pathspec) 687return1; 688 689 len =ce_namelen(ce); 690 name = ce->name; 691while((match = *pathspec++) != NULL) { 692int matchlen =strlen(match); 693if(matchlen > len) 694continue; 695if(memcmp(name, match, matchlen)) 696continue; 697if(matchlen && name[matchlen-1] =='/') 698return1; 699if(name[matchlen] =='/'|| !name[matchlen]) 700return1; 701if(!matchlen) 702return1; 703} 704return0; 705} 706 707/* 708 * We fundamentally don't like some paths: we don't want 709 * dot or dot-dot anywhere, and for obvious reasons don't 710 * want to recurse into ".git" either. 711 * 712 * Also, we don't want double slashes or slashes at the 713 * end that can make pathnames ambiguous. 714 */ 715static intverify_dotfile(const char*rest) 716{ 717/* 718 * The first character was '.', but that 719 * has already been discarded, we now test 720 * the rest. 721 */ 722switch(*rest) { 723/* "." is not allowed */ 724case'\0':case'/': 725return0; 726 727/* 728 * ".git" followed by NUL or slash is bad. This 729 * shares the path end test with the ".." case. 730 */ 731case'g': 732if(rest[1] !='i') 733break; 734if(rest[2] !='t') 735break; 736 rest +=2; 737/* fallthrough */ 738case'.': 739if(rest[1] =='\0'|| rest[1] =='/') 740return0; 741} 742return1; 743} 744 745intverify_path(const char*path) 746{ 747char c; 748 749goto inside; 750for(;;) { 751if(!c) 752return1; 753if(c =='/') { 754inside: 755 c = *path++; 756switch(c) { 757default: 758continue; 759case'/':case'\0': 760break; 761case'.': 762if(verify_dotfile(path)) 763continue; 764} 765return0; 766} 767 c = *path++; 768} 769} 770 771/* 772 * Do we have another file that has the beginning components being a 773 * proper superset of the name we're trying to add? 774 */ 775static inthas_file_name(struct index_state *istate, 776const struct cache_entry *ce,int pos,int ok_to_replace) 777{ 778int retval =0; 779int len =ce_namelen(ce); 780int stage =ce_stage(ce); 781const char*name = ce->name; 782 783while(pos < istate->cache_nr) { 784struct cache_entry *p = istate->cache[pos++]; 785 786if(len >=ce_namelen(p)) 787break; 788if(memcmp(name, p->name, len)) 789break; 790if(ce_stage(p) != stage) 791continue; 792if(p->name[len] !='/') 793continue; 794if(p->ce_flags & CE_REMOVE) 795continue; 796 retval = -1; 797if(!ok_to_replace) 798break; 799remove_index_entry_at(istate, --pos); 800} 801return retval; 802} 803 804/* 805 * Do we have another file with a pathname that is a proper 806 * subset of the name we're trying to add? 807 */ 808static inthas_dir_name(struct index_state *istate, 809const struct cache_entry *ce,int pos,int ok_to_replace) 810{ 811int retval =0; 812int stage =ce_stage(ce); 813const char*name = ce->name; 814const char*slash = name +ce_namelen(ce); 815 816for(;;) { 817int len; 818 819for(;;) { 820if(*--slash =='/') 821break; 822if(slash <= ce->name) 823return retval; 824} 825 len = slash - name; 826 827 pos =index_name_pos(istate, name,create_ce_flags(len, stage)); 828if(pos >=0) { 829/* 830 * Found one, but not so fast. This could 831 * be a marker that says "I was here, but 832 * I am being removed". Such an entry is 833 * not a part of the resulting tree, and 834 * it is Ok to have a directory at the same 835 * path. 836 */ 837if(!(istate->cache[pos]->ce_flags & CE_REMOVE)) { 838 retval = -1; 839if(!ok_to_replace) 840break; 841remove_index_entry_at(istate, pos); 842continue; 843} 844} 845else 846 pos = -pos-1; 847 848/* 849 * Trivial optimization: if we find an entry that 850 * already matches the sub-directory, then we know 851 * we're ok, and we can exit. 852 */ 853while(pos < istate->cache_nr) { 854struct cache_entry *p = istate->cache[pos]; 855if((ce_namelen(p) <= len) || 856(p->name[len] !='/') || 857memcmp(p->name, name, len)) 858break;/* not our subdirectory */ 859if(ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) 860/* 861 * p is at the same stage as our entry, and 862 * is a subdirectory of what we are looking 863 * at, so we cannot have conflicts at our 864 * level or anything shorter. 865 */ 866return retval; 867 pos++; 868} 869} 870return retval; 871} 872 873/* We may be in a situation where we already have path/file and path 874 * is being added, or we already have path and path/file is being 875 * added. Either one would result in a nonsense tree that has path 876 * twice when git-write-tree tries to write it out. Prevent it. 877 * 878 * If ok-to-replace is specified, we remove the conflicting entries 879 * from the cache so the caller should recompute the insert position. 880 * When this happens, we return non-zero. 881 */ 882static intcheck_file_directory_conflict(struct index_state *istate, 883const struct cache_entry *ce, 884int pos,int ok_to_replace) 885{ 886int retval; 887 888/* 889 * When ce is an "I am going away" entry, we allow it to be added 890 */ 891if(ce->ce_flags & CE_REMOVE) 892return0; 893 894/* 895 * We check if the path is a sub-path of a subsequent pathname 896 * first, since removing those will not change the position 897 * in the array. 898 */ 899 retval =has_file_name(istate, ce, pos, ok_to_replace); 900 901/* 902 * Then check if the path might have a clashing sub-directory 903 * before it. 904 */ 905return retval +has_dir_name(istate, ce, pos, ok_to_replace); 906} 907 908static intadd_index_entry_with_check(struct index_state *istate,struct cache_entry *ce,int option) 909{ 910int pos; 911int ok_to_add = option & ADD_CACHE_OK_TO_ADD; 912int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; 913int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; 914int new_only = option & ADD_CACHE_NEW_ONLY; 915 916cache_tree_invalidate_path(istate->cache_tree, ce->name); 917 pos =index_name_pos(istate, ce->name, ce->ce_flags); 918 919/* existing match? Just replace it. */ 920if(pos >=0) { 921if(!new_only) 922replace_index_entry(istate, pos, ce); 923return0; 924} 925 pos = -pos-1; 926 927/* 928 * Inserting a merged entry ("stage 0") into the index 929 * will always replace all non-merged entries.. 930 */ 931if(pos < istate->cache_nr &&ce_stage(ce) ==0) { 932while(ce_same_name(istate->cache[pos], ce)) { 933 ok_to_add =1; 934if(!remove_index_entry_at(istate, pos)) 935break; 936} 937} 938 939if(!ok_to_add) 940return-1; 941if(!verify_path(ce->name)) 942returnerror("Invalid path '%s'", ce->name); 943 944if(!skip_df_check && 945check_file_directory_conflict(istate, ce, pos, ok_to_replace)) { 946if(!ok_to_replace) 947returnerror("'%s' appears as both a file and as a directory", 948 ce->name); 949 pos =index_name_pos(istate, ce->name, ce->ce_flags); 950 pos = -pos-1; 951} 952return pos +1; 953} 954 955intadd_index_entry(struct index_state *istate,struct cache_entry *ce,int option) 956{ 957int pos; 958 959if(option & ADD_CACHE_JUST_APPEND) 960 pos = istate->cache_nr; 961else{ 962int ret; 963 ret =add_index_entry_with_check(istate, ce, option); 964if(ret <=0) 965return ret; 966 pos = ret -1; 967} 968 969/* Make sure the array is big enough .. */ 970if(istate->cache_nr == istate->cache_alloc) { 971 istate->cache_alloc =alloc_nr(istate->cache_alloc); 972 istate->cache =xrealloc(istate->cache, 973 istate->cache_alloc *sizeof(struct cache_entry *)); 974} 975 976/* Add it in.. */ 977 istate->cache_nr++; 978if(istate->cache_nr > pos +1) 979memmove(istate->cache + pos +1, 980 istate->cache + pos, 981(istate->cache_nr - pos -1) *sizeof(ce)); 982set_index_entry(istate, pos, ce); 983 istate->cache_changed =1; 984return0; 985} 986 987/* 988 * "refresh" does not calculate a new sha1 file or bring the 989 * cache up-to-date for mode/content changes. But what it 990 * _does_ do is to "re-match" the stat information of a file 991 * with the cache, so that you can refresh the cache for a 992 * file that hasn't been changed but where the stat entry is 993 * out of date. 994 * 995 * For example, you'd want to do this after doing a "git-read-tree", 996 * to link up the stat cache details with the proper files. 997 */ 998static struct cache_entry *refresh_cache_ent(struct index_state *istate, 999struct cache_entry *ce,1000unsigned int options,int*err)1001{1002struct stat st;1003struct cache_entry *updated;1004int changed, size;1005int ignore_valid = options & CE_MATCH_IGNORE_VALID;10061007if(ce_uptodate(ce))1008return ce;10091010/*1011 * CE_VALID means the user promised us that the change to1012 * the work tree does not matter and told us not to worry.1013 */1014if(!ignore_valid && (ce->ce_flags & CE_VALID)) {1015ce_mark_uptodate(ce);1016return ce;1017}10181019if(lstat(ce->name, &st) <0) {1020if(err)1021*err = errno;1022return NULL;1023}10241025 changed =ie_match_stat(istate, ce, &st, options);1026if(!changed) {1027/*1028 * The path is unchanged. If we were told to ignore1029 * valid bit, then we did the actual stat check and1030 * found that the entry is unmodified. If the entry1031 * is not marked VALID, this is the place to mark it1032 * valid again, under "assume unchanged" mode.1033 */1034if(ignore_valid && assume_unchanged &&1035!(ce->ce_flags & CE_VALID))1036;/* mark this one VALID again */1037else{1038/*1039 * We do not mark the index itself "modified"1040 * because CE_UPTODATE flag is in-core only;1041 * we are not going to write this change out.1042 */1043ce_mark_uptodate(ce);1044return ce;1045}1046}10471048if(ie_modified(istate, ce, &st, options)) {1049if(err)1050*err = EINVAL;1051return NULL;1052}10531054 size =ce_size(ce);1055 updated =xmalloc(size);1056memcpy(updated, ce, size);1057fill_stat_cache_info(updated, &st);1058/*1059 * If ignore_valid is not set, we should leave CE_VALID bit1060 * alone. Otherwise, paths marked with --no-assume-unchanged1061 * (i.e. things to be edited) will reacquire CE_VALID bit1062 * automatically, which is not really what we want.1063 */1064if(!ignore_valid && assume_unchanged &&1065!(ce->ce_flags & CE_VALID))1066 updated->ce_flags &= ~CE_VALID;10671068return updated;1069}10701071static voidshow_file(const char* fmt,const char* name,int in_porcelain,1072int* first,char*header_msg)1073{1074if(in_porcelain && *first && header_msg) {1075printf("%s\n", header_msg);1076*first=0;1077}1078printf(fmt, name);1079}10801081intrefresh_index(struct index_state *istate,unsigned int flags,const char**pathspec,1082char*seen,char*header_msg)1083{1084int i;1085int has_errors =0;1086int really = (flags & REFRESH_REALLY) !=0;1087int allow_unmerged = (flags & REFRESH_UNMERGED) !=0;1088int quiet = (flags & REFRESH_QUIET) !=0;1089int not_new = (flags & REFRESH_IGNORE_MISSING) !=0;1090int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) !=0;1091int first =1;1092int in_porcelain = (flags & REFRESH_IN_PORCELAIN);1093unsigned int options = really ? CE_MATCH_IGNORE_VALID :0;1094const char*needs_update_fmt;1095const char*needs_merge_fmt;10961097 needs_update_fmt = (in_porcelain ?"M\t%s\n":"%s: needs update\n");1098 needs_merge_fmt = (in_porcelain ?"U\t%s\n":"%s: needs merge\n");1099for(i =0; i < istate->cache_nr; i++) {1100struct cache_entry *ce, *new;1101int cache_errno =0;11021103 ce = istate->cache[i];1104if(ignore_submodules &&S_ISGITLINK(ce->ce_mode))1105continue;11061107if(ce_stage(ce)) {1108while((i < istate->cache_nr) &&1109!strcmp(istate->cache[i]->name, ce->name))1110 i++;1111 i--;1112if(allow_unmerged)1113continue;1114show_file(needs_merge_fmt, ce->name, in_porcelain, &first, header_msg);1115 has_errors =1;1116continue;1117}11181119if(pathspec && !match_pathspec(pathspec, ce->name,strlen(ce->name),0, seen))1120continue;11211122new=refresh_cache_ent(istate, ce, options, &cache_errno);1123if(new== ce)1124continue;1125if(!new) {1126if(not_new && cache_errno == ENOENT)1127continue;1128if(really && cache_errno == EINVAL) {1129/* If we are doing --really-refresh that1130 * means the index is not valid anymore.1131 */1132 ce->ce_flags &= ~CE_VALID;1133 istate->cache_changed =1;1134}1135if(quiet)1136continue;1137show_file(needs_update_fmt, ce->name, in_porcelain, &first, header_msg);1138 has_errors =1;1139continue;1140}11411142replace_index_entry(istate, i,new);1143}1144return has_errors;1145}11461147struct cache_entry *refresh_cache_entry(struct cache_entry *ce,int really)1148{1149returnrefresh_cache_ent(&the_index, ce, really, NULL);1150}11511152static intverify_hdr(struct cache_header *hdr,unsigned long size)1153{1154 git_SHA_CTX c;1155unsigned char sha1[20];11561157if(hdr->hdr_signature !=htonl(CACHE_SIGNATURE))1158returnerror("bad signature");1159if(hdr->hdr_version !=htonl(2) && hdr->hdr_version !=htonl(3))1160returnerror("bad index version");1161git_SHA1_Init(&c);1162git_SHA1_Update(&c, hdr, size -20);1163git_SHA1_Final(sha1, &c);1164if(hashcmp(sha1, (unsigned char*)hdr + size -20))1165returnerror("bad index file sha1 signature");1166return0;1167}11681169static intread_index_extension(struct index_state *istate,1170const char*ext,void*data,unsigned long sz)1171{1172switch(CACHE_EXT(ext)) {1173case CACHE_EXT_TREE:1174 istate->cache_tree =cache_tree_read(data, sz);1175break;1176case CACHE_EXT_RESOLVE_UNDO:1177 istate->resolve_undo =resolve_undo_read(data, sz);1178break;1179default:1180if(*ext <'A'||'Z'< *ext)1181returnerror("index uses %.4s extension, which we do not understand",1182 ext);1183fprintf(stderr,"ignoring %.4s extension\n", ext);1184break;1185}1186return0;1187}11881189intread_index(struct index_state *istate)1190{1191returnread_index_from(istate,get_index_file());1192}11931194static voidconvert_from_disk(struct ondisk_cache_entry *ondisk,struct cache_entry *ce)1195{1196size_t len;1197const char*name;11981199 ce->ce_ctime.sec =ntohl(ondisk->ctime.sec);1200 ce->ce_mtime.sec =ntohl(ondisk->mtime.sec);1201 ce->ce_ctime.nsec =ntohl(ondisk->ctime.nsec);1202 ce->ce_mtime.nsec =ntohl(ondisk->mtime.nsec);1203 ce->ce_dev =ntohl(ondisk->dev);1204 ce->ce_ino =ntohl(ondisk->ino);1205 ce->ce_mode =ntohl(ondisk->mode);1206 ce->ce_uid =ntohl(ondisk->uid);1207 ce->ce_gid =ntohl(ondisk->gid);1208 ce->ce_size =ntohl(ondisk->size);1209/* On-disk flags are just 16 bits */1210 ce->ce_flags =ntohs(ondisk->flags);12111212hashcpy(ce->sha1, ondisk->sha1);12131214 len = ce->ce_flags & CE_NAMEMASK;12151216if(ce->ce_flags & CE_EXTENDED) {1217struct ondisk_cache_entry_extended *ondisk2;1218int extended_flags;1219 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1220 extended_flags =ntohs(ondisk2->flags2) <<16;1221/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */1222if(extended_flags & ~CE_EXTENDED_FLAGS)1223die("Unknown index entry format%08x", extended_flags);1224 ce->ce_flags |= extended_flags;1225 name = ondisk2->name;1226}1227else1228 name = ondisk->name;12291230if(len == CE_NAMEMASK)1231 len =strlen(name);1232/*1233 * NEEDSWORK: If the original index is crafted, this copy could1234 * go unchecked.1235 */1236memcpy(ce->name, name, len +1);1237}12381239staticinlinesize_testimate_cache_size(size_t ondisk_size,unsigned int entries)1240{1241long per_entry;12421243 per_entry =sizeof(struct cache_entry) -sizeof(struct ondisk_cache_entry);12441245/*1246 * Alignment can cause differences. This should be "alignof", but1247 * since that's a gcc'ism, just use the size of a pointer.1248 */1249 per_entry +=sizeof(void*);1250return ondisk_size + entries*per_entry;1251}12521253/* remember to discard_cache() before reading a different cache! */1254intread_index_from(struct index_state *istate,const char*path)1255{1256int fd, i;1257struct stat st;1258unsigned long src_offset, dst_offset;1259struct cache_header *hdr;1260void*mmap;1261size_t mmap_size;12621263 errno = EBUSY;1264if(istate->initialized)1265return istate->cache_nr;12661267 errno = ENOENT;1268 istate->timestamp.sec =0;1269 istate->timestamp.nsec =0;1270 fd =open(path, O_RDONLY);1271if(fd <0) {1272if(errno == ENOENT)1273return0;1274die_errno("index file open failed");1275}12761277if(fstat(fd, &st))1278die_errno("cannot stat the open index");12791280 errno = EINVAL;1281 mmap_size =xsize_t(st.st_size);1282if(mmap_size <sizeof(struct cache_header) +20)1283die("index file smaller than expected");12841285 mmap =xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,0);1286close(fd);1287if(mmap == MAP_FAILED)1288die_errno("unable to map index file");12891290 hdr = mmap;1291if(verify_hdr(hdr, mmap_size) <0)1292goto unmap;12931294 istate->cache_nr =ntohl(hdr->hdr_entries);1295 istate->cache_alloc =alloc_nr(istate->cache_nr);1296 istate->cache =xcalloc(istate->cache_alloc,sizeof(struct cache_entry *));12971298/*1299 * The disk format is actually larger than the in-memory format,1300 * due to space for nsec etc, so even though the in-memory one1301 * has room for a few more flags, we can allocate using the same1302 * index size1303 */1304 istate->alloc =xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));1305 istate->initialized =1;13061307 src_offset =sizeof(*hdr);1308 dst_offset =0;1309for(i =0; i < istate->cache_nr; i++) {1310struct ondisk_cache_entry *disk_ce;1311struct cache_entry *ce;13121313 disk_ce = (struct ondisk_cache_entry *)((char*)mmap + src_offset);1314 ce = (struct cache_entry *)((char*)istate->alloc + dst_offset);1315convert_from_disk(disk_ce, ce);1316set_index_entry(istate, i, ce);13171318 src_offset +=ondisk_ce_size(ce);1319 dst_offset +=ce_size(ce);1320}1321 istate->timestamp.sec = st.st_mtime;1322 istate->timestamp.nsec =ST_MTIME_NSEC(st);13231324while(src_offset <= mmap_size -20-8) {1325/* After an array of active_nr index entries,1326 * there can be arbitrary number of extended1327 * sections, each of which is prefixed with1328 * extension name (4-byte) and section length1329 * in 4-byte network byte order.1330 */1331unsigned long extsize;1332memcpy(&extsize, (char*)mmap + src_offset +4,4);1333 extsize =ntohl(extsize);1334if(read_index_extension(istate,1335(const char*) mmap + src_offset,1336(char*) mmap + src_offset +8,1337 extsize) <0)1338goto unmap;1339 src_offset +=8;1340 src_offset += extsize;1341}1342munmap(mmap, mmap_size);1343return istate->cache_nr;13441345unmap:1346munmap(mmap, mmap_size);1347 errno = EINVAL;1348die("index file corrupt");1349}13501351intis_index_unborn(struct index_state *istate)1352{1353return(!istate->cache_nr && !istate->alloc && !istate->timestamp.sec);1354}13551356intdiscard_index(struct index_state *istate)1357{1358resolve_undo_clear_index(istate);1359 istate->cache_nr =0;1360 istate->cache_changed =0;1361 istate->timestamp.sec =0;1362 istate->timestamp.nsec =0;1363 istate->name_hash_initialized =0;1364free_hash(&istate->name_hash);1365cache_tree_free(&(istate->cache_tree));1366free(istate->alloc);1367 istate->alloc = NULL;1368 istate->initialized =0;13691370/* no need to throw away allocated active_cache */1371return0;1372}13731374intunmerged_index(const struct index_state *istate)1375{1376int i;1377for(i =0; i < istate->cache_nr; i++) {1378if(ce_stage(istate->cache[i]))1379return1;1380}1381return0;1382}13831384#define WRITE_BUFFER_SIZE 81921385static unsigned char write_buffer[WRITE_BUFFER_SIZE];1386static unsigned long write_buffer_len;13871388static intce_write_flush(git_SHA_CTX *context,int fd)1389{1390unsigned int buffered = write_buffer_len;1391if(buffered) {1392git_SHA1_Update(context, write_buffer, buffered);1393if(write_in_full(fd, write_buffer, buffered) != buffered)1394return-1;1395 write_buffer_len =0;1396}1397return0;1398}13991400static intce_write(git_SHA_CTX *context,int fd,void*data,unsigned int len)1401{1402while(len) {1403unsigned int buffered = write_buffer_len;1404unsigned int partial = WRITE_BUFFER_SIZE - buffered;1405if(partial > len)1406 partial = len;1407memcpy(write_buffer + buffered, data, partial);1408 buffered += partial;1409if(buffered == WRITE_BUFFER_SIZE) {1410 write_buffer_len = buffered;1411if(ce_write_flush(context, fd))1412return-1;1413 buffered =0;1414}1415 write_buffer_len = buffered;1416 len -= partial;1417 data = (char*) data + partial;1418}1419return0;1420}14211422static intwrite_index_ext_header(git_SHA_CTX *context,int fd,1423unsigned int ext,unsigned int sz)1424{1425 ext =htonl(ext);1426 sz =htonl(sz);1427return((ce_write(context, fd, &ext,4) <0) ||1428(ce_write(context, fd, &sz,4) <0)) ? -1:0;1429}14301431static intce_flush(git_SHA_CTX *context,int fd)1432{1433unsigned int left = write_buffer_len;14341435if(left) {1436 write_buffer_len =0;1437git_SHA1_Update(context, write_buffer, left);1438}14391440/* Flush first if not enough space for SHA1 signature */1441if(left +20> WRITE_BUFFER_SIZE) {1442if(write_in_full(fd, write_buffer, left) != left)1443return-1;1444 left =0;1445}14461447/* Append the SHA1 signature at the end */1448git_SHA1_Final(write_buffer + left, context);1449 left +=20;1450return(write_in_full(fd, write_buffer, left) != left) ? -1:0;1451}14521453static voidce_smudge_racily_clean_entry(struct cache_entry *ce)1454{1455/*1456 * The only thing we care about in this function is to smudge the1457 * falsely clean entry due to touch-update-touch race, so we leave1458 * everything else as they are. We are called for entries whose1459 * ce_mtime match the index file mtime.1460 *1461 * Note that this actually does not do much for gitlinks, for1462 * which ce_match_stat_basic() always goes to the actual1463 * contents. The caller checks with is_racy_timestamp() which1464 * always says "no" for gitlinks, so we are not called for them ;-)1465 */1466struct stat st;14671468if(lstat(ce->name, &st) <0)1469return;1470if(ce_match_stat_basic(ce, &st))1471return;1472if(ce_modified_check_fs(ce, &st)) {1473/* This is "racily clean"; smudge it. Note that this1474 * is a tricky code. At first glance, it may appear1475 * that it can break with this sequence:1476 *1477 * $ echo xyzzy >frotz1478 * $ git-update-index --add frotz1479 * $ : >frotz1480 * $ sleep 31481 * $ echo filfre >nitfol1482 * $ git-update-index --add nitfol1483 *1484 * but it does not. When the second update-index runs,1485 * it notices that the entry "frotz" has the same timestamp1486 * as index, and if we were to smudge it by resetting its1487 * size to zero here, then the object name recorded1488 * in index is the 6-byte file but the cached stat information1489 * becomes zero --- which would then match what we would1490 * obtain from the filesystem next time we stat("frotz").1491 *1492 * However, the second update-index, before calling1493 * this function, notices that the cached size is 61494 * bytes and what is on the filesystem is an empty1495 * file, and never calls us, so the cached size information1496 * for "frotz" stays 6 which does not match the filesystem.1497 */1498 ce->ce_size =0;1499}1500}15011502static intce_write_entry(git_SHA_CTX *c,int fd,struct cache_entry *ce)1503{1504int size =ondisk_ce_size(ce);1505struct ondisk_cache_entry *ondisk =xcalloc(1, size);1506char*name;15071508 ondisk->ctime.sec =htonl(ce->ce_ctime.sec);1509 ondisk->mtime.sec =htonl(ce->ce_mtime.sec);1510 ondisk->ctime.nsec =htonl(ce->ce_ctime.nsec);1511 ondisk->mtime.nsec =htonl(ce->ce_mtime.nsec);1512 ondisk->dev =htonl(ce->ce_dev);1513 ondisk->ino =htonl(ce->ce_ino);1514 ondisk->mode =htonl(ce->ce_mode);1515 ondisk->uid =htonl(ce->ce_uid);1516 ondisk->gid =htonl(ce->ce_gid);1517 ondisk->size =htonl(ce->ce_size);1518hashcpy(ondisk->sha1, ce->sha1);1519 ondisk->flags =htons(ce->ce_flags);1520if(ce->ce_flags & CE_EXTENDED) {1521struct ondisk_cache_entry_extended *ondisk2;1522 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1523 ondisk2->flags2 =htons((ce->ce_flags & CE_EXTENDED_FLAGS) >>16);1524 name = ondisk2->name;1525}1526else1527 name = ondisk->name;1528memcpy(name, ce->name,ce_namelen(ce));15291530returnce_write(c, fd, ondisk, size);1531}15321533intwrite_index(struct index_state *istate,int newfd)1534{1535 git_SHA_CTX c;1536struct cache_header hdr;1537int i, err, removed, extended;1538struct cache_entry **cache = istate->cache;1539int entries = istate->cache_nr;1540struct stat st;15411542for(i = removed = extended =0; i < entries; i++) {1543if(cache[i]->ce_flags & CE_REMOVE)1544 removed++;15451546/* reduce extended entries if possible */1547 cache[i]->ce_flags &= ~CE_EXTENDED;1548if(cache[i]->ce_flags & CE_EXTENDED_FLAGS) {1549 extended++;1550 cache[i]->ce_flags |= CE_EXTENDED;1551}1552}15531554 hdr.hdr_signature =htonl(CACHE_SIGNATURE);1555/* for extended format, increase version so older git won't try to read it */1556 hdr.hdr_version =htonl(extended ?3:2);1557 hdr.hdr_entries =htonl(entries - removed);15581559git_SHA1_Init(&c);1560if(ce_write(&c, newfd, &hdr,sizeof(hdr)) <0)1561return-1;15621563for(i =0; i < entries; i++) {1564struct cache_entry *ce = cache[i];1565if(ce->ce_flags & CE_REMOVE)1566continue;1567if(!ce_uptodate(ce) &&is_racy_timestamp(istate, ce))1568ce_smudge_racily_clean_entry(ce);1569if(ce_write_entry(&c, newfd, ce) <0)1570return-1;1571}15721573/* Write extension data here */1574if(istate->cache_tree) {1575struct strbuf sb = STRBUF_INIT;15761577cache_tree_write(&sb, istate->cache_tree);1578 err =write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) <01579||ce_write(&c, newfd, sb.buf, sb.len) <0;1580strbuf_release(&sb);1581if(err)1582return-1;1583}1584if(istate->resolve_undo) {1585struct strbuf sb = STRBUF_INIT;15861587resolve_undo_write(&sb, istate->resolve_undo);1588 err =write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,1589 sb.len) <01590||ce_write(&c, newfd, sb.buf, sb.len) <0;1591strbuf_release(&sb);1592if(err)1593return-1;1594}15951596if(ce_flush(&c, newfd) ||fstat(newfd, &st))1597return-1;1598 istate->timestamp.sec = (unsigned int)st.st_mtime;1599 istate->timestamp.nsec =ST_MTIME_NSEC(st);1600return0;1601}16021603/*1604 * Read the index file that is potentially unmerged into given1605 * index_state, dropping any unmerged entries. Returns true if1606 * the index is unmerged. Callers who want to refuse to work1607 * from an unmerged state can call this and check its return value,1608 * instead of calling read_cache().1609 */1610intread_index_unmerged(struct index_state *istate)1611{1612int i;1613int unmerged =0;16141615read_index(istate);1616for(i =0; i < istate->cache_nr; i++) {1617struct cache_entry *ce = istate->cache[i];1618struct cache_entry *new_ce;1619int size, len;16201621if(!ce_stage(ce))1622continue;1623 unmerged =1;1624 len =strlen(ce->name);1625 size =cache_entry_size(len);1626 new_ce =xcalloc(1, size);1627hashcpy(new_ce->sha1, ce->sha1);1628memcpy(new_ce->name, ce->name, len);1629 new_ce->ce_flags =create_ce_flags(len,0);1630 new_ce->ce_mode = ce->ce_mode;1631if(add_index_entry(istate, new_ce,0))1632returnerror("%s: cannot drop to stage #0",1633 ce->name);1634 i =index_name_pos(istate, new_ce->name, len);1635}1636return unmerged;1637}16381639struct update_callback_data1640{1641int flags;1642int add_errors;1643};16441645static voidupdate_callback(struct diff_queue_struct *q,1646struct diff_options *opt,void*cbdata)1647{1648int i;1649struct update_callback_data *data = cbdata;16501651for(i =0; i < q->nr; i++) {1652struct diff_filepair *p = q->queue[i];1653const char*path = p->one->path;1654switch(p->status) {1655default:1656die("unexpected diff status%c", p->status);1657case DIFF_STATUS_UNMERGED:1658/*1659 * ADD_CACHE_IGNORE_REMOVAL is unset if "git1660 * add -u" is calling us, In such a case, a1661 * missing work tree file needs to be removed1662 * if there is an unmerged entry at stage #2,1663 * but such a diff record is followed by1664 * another with DIFF_STATUS_DELETED (and if1665 * there is no stage #2, we won't see DELETED1666 * nor MODIFIED). We can simply continue1667 * either way.1668 */1669if(!(data->flags & ADD_CACHE_IGNORE_REMOVAL))1670continue;1671/*1672 * Otherwise, it is "git add path" is asking1673 * to explicitly add it; we fall through. A1674 * missing work tree file is an error and is1675 * caught by add_file_to_index() in such a1676 * case.1677 */1678case DIFF_STATUS_MODIFIED:1679case DIFF_STATUS_TYPE_CHANGED:1680if(add_file_to_index(&the_index, path, data->flags)) {1681if(!(data->flags & ADD_CACHE_IGNORE_ERRORS))1682die("updating files failed");1683 data->add_errors++;1684}1685break;1686case DIFF_STATUS_DELETED:1687if(data->flags & ADD_CACHE_IGNORE_REMOVAL)1688break;1689if(!(data->flags & ADD_CACHE_PRETEND))1690remove_file_from_index(&the_index, path);1691if(data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))1692printf("remove '%s'\n", path);1693break;1694}1695}1696}16971698intadd_files_to_cache(const char*prefix,const char**pathspec,int flags)1699{1700struct update_callback_data data;1701struct rev_info rev;1702init_revisions(&rev, prefix);1703setup_revisions(0, NULL, &rev, NULL);1704 rev.prune_data = pathspec;1705 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;1706 rev.diffopt.format_callback = update_callback;1707 data.flags = flags;1708 data.add_errors =0;1709 rev.diffopt.format_callback_data = &data;1710run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);1711return!!data.add_errors;1712}17131714/*1715 * Returns 1 if the path is an "other" path with respect to1716 * the index; that is, the path is not mentioned in the index at all,1717 * either as a file, a directory with some files in the index,1718 * or as an unmerged entry.1719 *1720 * We helpfully remove a trailing "/" from directories so that1721 * the output of read_directory can be used as-is.1722 */1723intindex_name_is_other(const struct index_state *istate,const char*name,1724int namelen)1725{1726int pos;1727if(namelen && name[namelen -1] =='/')1728 namelen--;1729 pos =index_name_pos(istate, name, namelen);1730if(0<= pos)1731return0;/* exact match */1732 pos = -pos -1;1733if(pos < istate->cache_nr) {1734struct cache_entry *ce = istate->cache[pos];1735if(ce_namelen(ce) == namelen &&1736!memcmp(ce->name, name, namelen))1737return0;/* Yup, this one exists unmerged */1738}1739return1;1740}