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 18static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,int really); 19 20/* Index extensions. 21 * 22 * The first letter should be 'A'..'Z' for extensions that are not 23 * necessary for a correct operation (i.e. optimization data). 24 * When new extensions are added that _needs_ to be understood in 25 * order to correctly interpret the index file, pick character that 26 * is outside the range, to cause the reader to abort. 27 */ 28 29#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) ) 30#define CACHE_EXT_TREE 0x54524545/* "TREE" */ 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 161static intis_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 ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE; 265int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY; 266 267/* 268 * If it's marked as always valid in the index, it's 269 * valid whatever the checked-out copy says. 270 * 271 * skip-worktree has the same effect with higher precedence 272 */ 273if(!ignore_skip_worktree &&ce_skip_worktree(ce)) 274return0; 275if(!ignore_valid && (ce->ce_flags & CE_VALID)) 276return0; 277 278/* 279 * Intent-to-add entries have not been added, so the index entry 280 * by definition never matches what is in the work tree until it 281 * actually gets added. 282 */ 283if(ce->ce_flags & CE_INTENT_TO_ADD) 284return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED; 285 286 changed =ce_match_stat_basic(ce, st); 287 288/* 289 * Within 1 second of this sequence: 290 * echo xyzzy >file && git-update-index --add file 291 * running this command: 292 * echo frotz >file 293 * would give a falsely clean cache entry. The mtime and 294 * length match the cache, and other stat fields do not change. 295 * 296 * We could detect this at update-index time (the cache entry 297 * being registered/updated records the same time as "now") 298 * and delay the return from git-update-index, but that would 299 * effectively mean we can make at most one commit per second, 300 * which is not acceptable. Instead, we check cache entries 301 * whose mtime are the same as the index file timestamp more 302 * carefully than others. 303 */ 304if(!changed &&is_racy_timestamp(istate, ce)) { 305if(assume_racy_is_modified) 306 changed |= DATA_CHANGED; 307else 308 changed |=ce_modified_check_fs(ce, st); 309} 310 311return changed; 312} 313 314intie_modified(const struct index_state *istate, 315struct cache_entry *ce,struct stat *st,unsigned int options) 316{ 317int changed, changed_fs; 318 319 changed =ie_match_stat(istate, ce, st, options); 320if(!changed) 321return0; 322/* 323 * If the mode or type has changed, there's no point in trying 324 * to refresh the entry - it's not going to match 325 */ 326if(changed & (MODE_CHANGED | TYPE_CHANGED)) 327return changed; 328 329/* 330 * Immediately after read-tree or update-index --cacheinfo, 331 * the length field is zero, as we have never even read the 332 * lstat(2) information once, and we cannot trust DATA_CHANGED 333 * returned by ie_match_stat() which in turn was returned by 334 * ce_match_stat_basic() to signal that the filesize of the 335 * blob changed. We have to actually go to the filesystem to 336 * see if the contents match, and if so, should answer "unchanged". 337 * 338 * The logic does not apply to gitlinks, as ce_match_stat_basic() 339 * already has checked the actual HEAD from the filesystem in the 340 * subproject. If ie_match_stat() already said it is different, 341 * then we know it is. 342 */ 343if((changed & DATA_CHANGED) && 344(S_ISGITLINK(ce->ce_mode) || ce->ce_size !=0)) 345return changed; 346 347 changed_fs =ce_modified_check_fs(ce, st); 348if(changed_fs) 349return changed | changed_fs; 350return0; 351} 352 353intbase_name_compare(const char*name1,int len1,int mode1, 354const char*name2,int len2,int mode2) 355{ 356unsigned char c1, c2; 357int len = len1 < len2 ? len1 : len2; 358int cmp; 359 360 cmp =memcmp(name1, name2, len); 361if(cmp) 362return cmp; 363 c1 = name1[len]; 364 c2 = name2[len]; 365if(!c1 &&S_ISDIR(mode1)) 366 c1 ='/'; 367if(!c2 &&S_ISDIR(mode2)) 368 c2 ='/'; 369return(c1 < c2) ? -1: (c1 > c2) ?1:0; 370} 371 372/* 373 * df_name_compare() is identical to base_name_compare(), except it 374 * compares conflicting directory/file entries as equal. Note that 375 * while a directory name compares as equal to a regular file, they 376 * then individually compare _differently_ to a filename that has 377 * a dot after the basename (because '\0' < '.' < '/'). 378 * 379 * This is used by routines that want to traverse the git namespace 380 * but then handle conflicting entries together when possible. 381 */ 382intdf_name_compare(const char*name1,int len1,int mode1, 383const char*name2,int len2,int mode2) 384{ 385int len = len1 < len2 ? len1 : len2, cmp; 386unsigned char c1, c2; 387 388 cmp =memcmp(name1, name2, len); 389if(cmp) 390return cmp; 391/* Directories and files compare equal (same length, same name) */ 392if(len1 == len2) 393return0; 394 c1 = name1[len]; 395if(!c1 &&S_ISDIR(mode1)) 396 c1 ='/'; 397 c2 = name2[len]; 398if(!c2 &&S_ISDIR(mode2)) 399 c2 ='/'; 400if(c1 =='/'&& !c2) 401return0; 402if(c2 =='/'&& !c1) 403return0; 404return c1 - c2; 405} 406 407intcache_name_compare(const char*name1,int flags1,const char*name2,int flags2) 408{ 409int len1 = flags1 & CE_NAMEMASK; 410int len2 = flags2 & CE_NAMEMASK; 411int len = len1 < len2 ? len1 : len2; 412int cmp; 413 414 cmp =memcmp(name1, name2, len); 415if(cmp) 416return cmp; 417if(len1 < len2) 418return-1; 419if(len1 > len2) 420return1; 421 422/* Compare stages */ 423 flags1 &= CE_STAGEMASK; 424 flags2 &= CE_STAGEMASK; 425 426if(flags1 < flags2) 427return-1; 428if(flags1 > flags2) 429return1; 430return0; 431} 432 433intindex_name_pos(const struct index_state *istate,const char*name,int namelen) 434{ 435int first, last; 436 437 first =0; 438 last = istate->cache_nr; 439while(last > first) { 440int next = (last + first) >>1; 441struct cache_entry *ce = istate->cache[next]; 442int cmp =cache_name_compare(name, namelen, ce->name, ce->ce_flags); 443if(!cmp) 444return next; 445if(cmp <0) { 446 last = next; 447continue; 448} 449 first = next+1; 450} 451return-first-1; 452} 453 454/* Remove entry, return true if there are more entries to go.. */ 455intremove_index_entry_at(struct index_state *istate,int pos) 456{ 457struct cache_entry *ce = istate->cache[pos]; 458 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 alias =index_name_exists(istate, ce->name,ce_namelen(ce), ignore_case); 612if(alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) { 613/* Nothing changed, really */ 614free(ce); 615ce_mark_uptodate(alias); 616 alias->ce_flags |= CE_ADDED; 617return0; 618} 619if(!intent_only) { 620if(index_path(ce->sha1, path, st,1)) 621returnerror("unable to index file%s", path); 622}else 623record_intent_to_add(ce); 624 625if(ignore_case && alias &&different_name(ce, alias)) 626 ce =create_alias_ce(ce, alias); 627 ce->ce_flags |= CE_ADDED; 628 629/* It was suspected to be racily clean, but it turns out to be Ok */ 630 was_same = (alias && 631!ce_stage(alias) && 632!hashcmp(alias->sha1, ce->sha1) && 633 ce->ce_mode == alias->ce_mode); 634 635if(pretend) 636; 637else if(add_index_entry(istate, ce, add_option)) 638returnerror("unable to add%sto index",path); 639if(verbose && !was_same) 640printf("add '%s'\n", path); 641return0; 642} 643 644intadd_file_to_index(struct index_state *istate,const char*path,int flags) 645{ 646struct stat st; 647if(lstat(path, &st)) 648die_errno("unable to stat '%s'", path); 649returnadd_to_index(istate, path, &st, flags); 650} 651 652struct cache_entry *make_cache_entry(unsigned int mode, 653const unsigned char*sha1,const char*path,int stage, 654int refresh) 655{ 656int size, len; 657struct cache_entry *ce; 658 659if(!verify_path(path)) { 660error("Invalid path '%s'", path); 661return NULL; 662} 663 664 len =strlen(path); 665 size =cache_entry_size(len); 666 ce =xcalloc(1, size); 667 668hashcpy(ce->sha1, sha1); 669memcpy(ce->name, path, len); 670 ce->ce_flags =create_ce_flags(len, stage); 671 ce->ce_mode =create_ce_mode(mode); 672 673if(refresh) 674returnrefresh_cache_entry(ce,0); 675 676return ce; 677} 678 679intce_same_name(struct cache_entry *a,struct cache_entry *b) 680{ 681int len =ce_namelen(a); 682returnce_namelen(b) == len && !memcmp(a->name, b->name, len); 683} 684 685intce_path_match(const struct cache_entry *ce,const char**pathspec) 686{ 687const char*match, *name; 688int len; 689 690if(!pathspec) 691return1; 692 693 len =ce_namelen(ce); 694 name = ce->name; 695while((match = *pathspec++) != NULL) { 696int matchlen =strlen(match); 697if(matchlen > len) 698continue; 699if(memcmp(name, match, matchlen)) 700continue; 701if(matchlen && name[matchlen-1] =='/') 702return1; 703if(name[matchlen] =='/'|| !name[matchlen]) 704return1; 705if(!matchlen) 706return1; 707} 708return0; 709} 710 711/* 712 * We fundamentally don't like some paths: we don't want 713 * dot or dot-dot anywhere, and for obvious reasons don't 714 * want to recurse into ".git" either. 715 * 716 * Also, we don't want double slashes or slashes at the 717 * end that can make pathnames ambiguous. 718 */ 719static intverify_dotfile(const char*rest) 720{ 721/* 722 * The first character was '.', but that 723 * has already been discarded, we now test 724 * the rest. 725 */ 726switch(*rest) { 727/* "." is not allowed */ 728case'\0':case'/': 729return0; 730 731/* 732 * ".git" followed by NUL or slash is bad. This 733 * shares the path end test with the ".." case. 734 */ 735case'g': 736if(rest[1] !='i') 737break; 738if(rest[2] !='t') 739break; 740 rest +=2; 741/* fallthrough */ 742case'.': 743if(rest[1] =='\0'|| rest[1] =='/') 744return0; 745} 746return1; 747} 748 749intverify_path(const char*path) 750{ 751char c; 752 753goto inside; 754for(;;) { 755if(!c) 756return1; 757if(c =='/') { 758inside: 759 c = *path++; 760switch(c) { 761default: 762continue; 763case'/':case'\0': 764break; 765case'.': 766if(verify_dotfile(path)) 767continue; 768} 769return0; 770} 771 c = *path++; 772} 773} 774 775/* 776 * Do we have another file that has the beginning components being a 777 * proper superset of the name we're trying to add? 778 */ 779static inthas_file_name(struct index_state *istate, 780const struct cache_entry *ce,int pos,int ok_to_replace) 781{ 782int retval =0; 783int len =ce_namelen(ce); 784int stage =ce_stage(ce); 785const char*name = ce->name; 786 787while(pos < istate->cache_nr) { 788struct cache_entry *p = istate->cache[pos++]; 789 790if(len >=ce_namelen(p)) 791break; 792if(memcmp(name, p->name, len)) 793break; 794if(ce_stage(p) != stage) 795continue; 796if(p->name[len] !='/') 797continue; 798if(p->ce_flags & CE_REMOVE) 799continue; 800 retval = -1; 801if(!ok_to_replace) 802break; 803remove_index_entry_at(istate, --pos); 804} 805return retval; 806} 807 808/* 809 * Do we have another file with a pathname that is a proper 810 * subset of the name we're trying to add? 811 */ 812static inthas_dir_name(struct index_state *istate, 813const struct cache_entry *ce,int pos,int ok_to_replace) 814{ 815int retval =0; 816int stage =ce_stage(ce); 817const char*name = ce->name; 818const char*slash = name +ce_namelen(ce); 819 820for(;;) { 821int len; 822 823for(;;) { 824if(*--slash =='/') 825break; 826if(slash <= ce->name) 827return retval; 828} 829 len = slash - name; 830 831 pos =index_name_pos(istate, name,create_ce_flags(len, stage)); 832if(pos >=0) { 833/* 834 * Found one, but not so fast. This could 835 * be a marker that says "I was here, but 836 * I am being removed". Such an entry is 837 * not a part of the resulting tree, and 838 * it is Ok to have a directory at the same 839 * path. 840 */ 841if(!(istate->cache[pos]->ce_flags & CE_REMOVE)) { 842 retval = -1; 843if(!ok_to_replace) 844break; 845remove_index_entry_at(istate, pos); 846continue; 847} 848} 849else 850 pos = -pos-1; 851 852/* 853 * Trivial optimization: if we find an entry that 854 * already matches the sub-directory, then we know 855 * we're ok, and we can exit. 856 */ 857while(pos < istate->cache_nr) { 858struct cache_entry *p = istate->cache[pos]; 859if((ce_namelen(p) <= len) || 860(p->name[len] !='/') || 861memcmp(p->name, name, len)) 862break;/* not our subdirectory */ 863if(ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) 864/* 865 * p is at the same stage as our entry, and 866 * is a subdirectory of what we are looking 867 * at, so we cannot have conflicts at our 868 * level or anything shorter. 869 */ 870return retval; 871 pos++; 872} 873} 874return retval; 875} 876 877/* We may be in a situation where we already have path/file and path 878 * is being added, or we already have path and path/file is being 879 * added. Either one would result in a nonsense tree that has path 880 * twice when git-write-tree tries to write it out. Prevent it. 881 * 882 * If ok-to-replace is specified, we remove the conflicting entries 883 * from the cache so the caller should recompute the insert position. 884 * When this happens, we return non-zero. 885 */ 886static intcheck_file_directory_conflict(struct index_state *istate, 887const struct cache_entry *ce, 888int pos,int ok_to_replace) 889{ 890int retval; 891 892/* 893 * When ce is an "I am going away" entry, we allow it to be added 894 */ 895if(ce->ce_flags & CE_REMOVE) 896return0; 897 898/* 899 * We check if the path is a sub-path of a subsequent pathname 900 * first, since removing those will not change the position 901 * in the array. 902 */ 903 retval =has_file_name(istate, ce, pos, ok_to_replace); 904 905/* 906 * Then check if the path might have a clashing sub-directory 907 * before it. 908 */ 909return retval +has_dir_name(istate, ce, pos, ok_to_replace); 910} 911 912static intadd_index_entry_with_check(struct index_state *istate,struct cache_entry *ce,int option) 913{ 914int pos; 915int ok_to_add = option & ADD_CACHE_OK_TO_ADD; 916int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; 917int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; 918int new_only = option & ADD_CACHE_NEW_ONLY; 919 920cache_tree_invalidate_path(istate->cache_tree, ce->name); 921 pos =index_name_pos(istate, ce->name, ce->ce_flags); 922 923/* existing match? Just replace it. */ 924if(pos >=0) { 925if(!new_only) 926replace_index_entry(istate, pos, ce); 927return0; 928} 929 pos = -pos-1; 930 931/* 932 * Inserting a merged entry ("stage 0") into the index 933 * will always replace all non-merged entries.. 934 */ 935if(pos < istate->cache_nr &&ce_stage(ce) ==0) { 936while(ce_same_name(istate->cache[pos], ce)) { 937 ok_to_add =1; 938if(!remove_index_entry_at(istate, pos)) 939break; 940} 941} 942 943if(!ok_to_add) 944return-1; 945if(!verify_path(ce->name)) 946returnerror("Invalid path '%s'", ce->name); 947 948if(!skip_df_check && 949check_file_directory_conflict(istate, ce, pos, ok_to_replace)) { 950if(!ok_to_replace) 951returnerror("'%s' appears as both a file and as a directory", 952 ce->name); 953 pos =index_name_pos(istate, ce->name, ce->ce_flags); 954 pos = -pos-1; 955} 956return pos +1; 957} 958 959intadd_index_entry(struct index_state *istate,struct cache_entry *ce,int option) 960{ 961int pos; 962 963if(option & ADD_CACHE_JUST_APPEND) 964 pos = istate->cache_nr; 965else{ 966int ret; 967 ret =add_index_entry_with_check(istate, ce, option); 968if(ret <=0) 969return ret; 970 pos = ret -1; 971} 972 973/* Make sure the array is big enough .. */ 974if(istate->cache_nr == istate->cache_alloc) { 975 istate->cache_alloc =alloc_nr(istate->cache_alloc); 976 istate->cache =xrealloc(istate->cache, 977 istate->cache_alloc *sizeof(struct cache_entry *)); 978} 979 980/* Add it in.. */ 981 istate->cache_nr++; 982if(istate->cache_nr > pos +1) 983memmove(istate->cache + pos +1, 984 istate->cache + pos, 985(istate->cache_nr - pos -1) *sizeof(ce)); 986set_index_entry(istate, pos, ce); 987 istate->cache_changed =1; 988return0; 989} 990 991/* 992 * "refresh" does not calculate a new sha1 file or bring the 993 * cache up-to-date for mode/content changes. But what it 994 * _does_ do is to "re-match" the stat information of a file 995 * with the cache, so that you can refresh the cache for a 996 * file that hasn't been changed but where the stat entry is 997 * out of date. 998 * 999 * For example, you'd want to do this after doing a "git-read-tree",1000 * to link up the stat cache details with the proper files.1001 */1002static struct cache_entry *refresh_cache_ent(struct index_state *istate,1003struct cache_entry *ce,1004unsigned int options,int*err)1005{1006struct stat st;1007struct cache_entry *updated;1008int changed, size;1009int ignore_valid = options & CE_MATCH_IGNORE_VALID;1010int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;10111012if(ce_uptodate(ce))1013return ce;10141015/*1016 * CE_VALID or CE_SKIP_WORKTREE means the user promised us1017 * that the change to the work tree does not matter and told1018 * us not to worry.1019 */1020if(!ignore_skip_worktree &&ce_skip_worktree(ce)) {1021ce_mark_uptodate(ce);1022return ce;1023}1024if(!ignore_valid && (ce->ce_flags & CE_VALID)) {1025ce_mark_uptodate(ce);1026return ce;1027}10281029if(lstat(ce->name, &st) <0) {1030if(err)1031*err = errno;1032return NULL;1033}10341035 changed =ie_match_stat(istate, ce, &st, options);1036if(!changed) {1037/*1038 * The path is unchanged. If we were told to ignore1039 * valid bit, then we did the actual stat check and1040 * found that the entry is unmodified. If the entry1041 * is not marked VALID, this is the place to mark it1042 * valid again, under "assume unchanged" mode.1043 */1044if(ignore_valid && assume_unchanged &&1045!(ce->ce_flags & CE_VALID))1046;/* mark this one VALID again */1047else{1048/*1049 * We do not mark the index itself "modified"1050 * because CE_UPTODATE flag is in-core only;1051 * we are not going to write this change out.1052 */1053ce_mark_uptodate(ce);1054return ce;1055}1056}10571058if(ie_modified(istate, ce, &st, options)) {1059if(err)1060*err = EINVAL;1061return NULL;1062}10631064 size =ce_size(ce);1065 updated =xmalloc(size);1066memcpy(updated, ce, size);1067fill_stat_cache_info(updated, &st);1068/*1069 * If ignore_valid is not set, we should leave CE_VALID bit1070 * alone. Otherwise, paths marked with --no-assume-unchanged1071 * (i.e. things to be edited) will reacquire CE_VALID bit1072 * automatically, which is not really what we want.1073 */1074if(!ignore_valid && assume_unchanged &&1075!(ce->ce_flags & CE_VALID))1076 updated->ce_flags &= ~CE_VALID;10771078return updated;1079}10801081static voidshow_file(const char* fmt,const char* name,int in_porcelain,1082int* first,char*header_msg)1083{1084if(in_porcelain && *first && header_msg) {1085printf("%s\n", header_msg);1086*first=0;1087}1088printf(fmt, name);1089}10901091intrefresh_index(struct index_state *istate,unsigned int flags,const char**pathspec,1092char*seen,char*header_msg)1093{1094int i;1095int has_errors =0;1096int really = (flags & REFRESH_REALLY) !=0;1097int allow_unmerged = (flags & REFRESH_UNMERGED) !=0;1098int quiet = (flags & REFRESH_QUIET) !=0;1099int not_new = (flags & REFRESH_IGNORE_MISSING) !=0;1100int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) !=0;1101int first =1;1102int in_porcelain = (flags & REFRESH_IN_PORCELAIN);1103unsigned int options = really ? CE_MATCH_IGNORE_VALID :0;1104const char*needs_update_fmt;1105const char*needs_merge_fmt;11061107 needs_update_fmt = (in_porcelain ?"M\t%s\n":"%s: needs update\n");1108 needs_merge_fmt = (in_porcelain ?"U\t%s\n":"%s: needs merge\n");1109for(i =0; i < istate->cache_nr; i++) {1110struct cache_entry *ce, *new;1111int cache_errno =0;11121113 ce = istate->cache[i];1114if(ignore_submodules &&S_ISGITLINK(ce->ce_mode))1115continue;11161117if(ce_stage(ce)) {1118while((i < istate->cache_nr) &&1119!strcmp(istate->cache[i]->name, ce->name))1120 i++;1121 i--;1122if(allow_unmerged)1123continue;1124show_file(needs_merge_fmt, ce->name, in_porcelain, &first, header_msg);1125 has_errors =1;1126continue;1127}11281129if(pathspec && !match_pathspec(pathspec, ce->name,strlen(ce->name),0, seen))1130continue;11311132new=refresh_cache_ent(istate, ce, options, &cache_errno);1133if(new== ce)1134continue;1135if(!new) {1136if(not_new && cache_errno == ENOENT)1137continue;1138if(really && cache_errno == EINVAL) {1139/* If we are doing --really-refresh that1140 * means the index is not valid anymore.1141 */1142 ce->ce_flags &= ~CE_VALID;1143 istate->cache_changed =1;1144}1145if(quiet)1146continue;1147show_file(needs_update_fmt, ce->name, in_porcelain, &first, header_msg);1148 has_errors =1;1149continue;1150}11511152replace_index_entry(istate, i,new);1153}1154return has_errors;1155}11561157static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,int really)1158{1159returnrefresh_cache_ent(&the_index, ce, really, NULL);1160}11611162static intverify_hdr(struct cache_header *hdr,unsigned long size)1163{1164 git_SHA_CTX c;1165unsigned char sha1[20];11661167if(hdr->hdr_signature !=htonl(CACHE_SIGNATURE))1168returnerror("bad signature");1169if(hdr->hdr_version !=htonl(2) && hdr->hdr_version !=htonl(3))1170returnerror("bad index version");1171git_SHA1_Init(&c);1172git_SHA1_Update(&c, hdr, size -20);1173git_SHA1_Final(sha1, &c);1174if(hashcmp(sha1, (unsigned char*)hdr + size -20))1175returnerror("bad index file sha1 signature");1176return0;1177}11781179static intread_index_extension(struct index_state *istate,1180const char*ext,void*data,unsigned long sz)1181{1182switch(CACHE_EXT(ext)) {1183case CACHE_EXT_TREE:1184 istate->cache_tree =cache_tree_read(data, sz);1185break;1186default:1187if(*ext <'A'||'Z'< *ext)1188returnerror("index uses %.4s extension, which we do not understand",1189 ext);1190fprintf(stderr,"ignoring %.4s extension\n", ext);1191break;1192}1193return0;1194}11951196intread_index(struct index_state *istate)1197{1198returnread_index_from(istate,get_index_file());1199}12001201static voidconvert_from_disk(struct ondisk_cache_entry *ondisk,struct cache_entry *ce)1202{1203size_t len;1204const char*name;12051206 ce->ce_ctime.sec =ntohl(ondisk->ctime.sec);1207 ce->ce_mtime.sec =ntohl(ondisk->mtime.sec);1208 ce->ce_ctime.nsec =ntohl(ondisk->ctime.nsec);1209 ce->ce_mtime.nsec =ntohl(ondisk->mtime.nsec);1210 ce->ce_dev =ntohl(ondisk->dev);1211 ce->ce_ino =ntohl(ondisk->ino);1212 ce->ce_mode =ntohl(ondisk->mode);1213 ce->ce_uid =ntohl(ondisk->uid);1214 ce->ce_gid =ntohl(ondisk->gid);1215 ce->ce_size =ntohl(ondisk->size);1216/* On-disk flags are just 16 bits */1217 ce->ce_flags =ntohs(ondisk->flags);12181219hashcpy(ce->sha1, ondisk->sha1);12201221 len = ce->ce_flags & CE_NAMEMASK;12221223if(ce->ce_flags & CE_EXTENDED) {1224struct ondisk_cache_entry_extended *ondisk2;1225int extended_flags;1226 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1227 extended_flags =ntohs(ondisk2->flags2) <<16;1228/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */1229if(extended_flags & ~CE_EXTENDED_FLAGS)1230die("Unknown index entry format%08x", extended_flags);1231 ce->ce_flags |= extended_flags;1232 name = ondisk2->name;1233}1234else1235 name = ondisk->name;12361237if(len == CE_NAMEMASK)1238 len =strlen(name);1239/*1240 * NEEDSWORK: If the original index is crafted, this copy could1241 * go unchecked.1242 */1243memcpy(ce->name, name, len +1);1244}12451246staticinlinesize_testimate_cache_size(size_t ondisk_size,unsigned int entries)1247{1248long per_entry;12491250 per_entry =sizeof(struct cache_entry) -sizeof(struct ondisk_cache_entry);12511252/*1253 * Alignment can cause differences. This should be "alignof", but1254 * since that's a gcc'ism, just use the size of a pointer.1255 */1256 per_entry +=sizeof(void*);1257return ondisk_size + entries*per_entry;1258}12591260/* remember to discard_cache() before reading a different cache! */1261intread_index_from(struct index_state *istate,const char*path)1262{1263int fd, i;1264struct stat st;1265unsigned long src_offset, dst_offset;1266struct cache_header *hdr;1267void*mmap;1268size_t mmap_size;12691270 errno = EBUSY;1271if(istate->initialized)1272return istate->cache_nr;12731274 errno = ENOENT;1275 istate->timestamp.sec =0;1276 istate->timestamp.nsec =0;1277 fd =open(path, O_RDONLY);1278if(fd <0) {1279if(errno == ENOENT)1280return0;1281die_errno("index file open failed");1282}12831284if(fstat(fd, &st))1285die_errno("cannot stat the open index");12861287 errno = EINVAL;1288 mmap_size =xsize_t(st.st_size);1289if(mmap_size <sizeof(struct cache_header) +20)1290die("index file smaller than expected");12911292 mmap =xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,0);1293close(fd);1294if(mmap == MAP_FAILED)1295die_errno("unable to map index file");12961297 hdr = mmap;1298if(verify_hdr(hdr, mmap_size) <0)1299goto unmap;13001301 istate->cache_nr =ntohl(hdr->hdr_entries);1302 istate->cache_alloc =alloc_nr(istate->cache_nr);1303 istate->cache =xcalloc(istate->cache_alloc,sizeof(struct cache_entry *));13041305/*1306 * The disk format is actually larger than the in-memory format,1307 * due to space for nsec etc, so even though the in-memory one1308 * has room for a few more flags, we can allocate using the same1309 * index size1310 */1311 istate->alloc =xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));1312 istate->initialized =1;13131314 src_offset =sizeof(*hdr);1315 dst_offset =0;1316for(i =0; i < istate->cache_nr; i++) {1317struct ondisk_cache_entry *disk_ce;1318struct cache_entry *ce;13191320 disk_ce = (struct ondisk_cache_entry *)((char*)mmap + src_offset);1321 ce = (struct cache_entry *)((char*)istate->alloc + dst_offset);1322convert_from_disk(disk_ce, ce);1323set_index_entry(istate, i, ce);13241325 src_offset +=ondisk_ce_size(ce);1326 dst_offset +=ce_size(ce);1327}1328 istate->timestamp.sec = st.st_mtime;1329 istate->timestamp.nsec =ST_MTIME_NSEC(st);13301331while(src_offset <= mmap_size -20-8) {1332/* After an array of active_nr index entries,1333 * there can be arbitrary number of extended1334 * sections, each of which is prefixed with1335 * extension name (4-byte) and section length1336 * in 4-byte network byte order.1337 */1338uint32_t extsize;1339memcpy(&extsize, (char*)mmap + src_offset +4,4);1340 extsize =ntohl(extsize);1341if(read_index_extension(istate,1342(const char*) mmap + src_offset,1343(char*) mmap + src_offset +8,1344 extsize) <0)1345goto unmap;1346 src_offset +=8;1347 src_offset += extsize;1348}1349munmap(mmap, mmap_size);1350return istate->cache_nr;13511352unmap:1353munmap(mmap, mmap_size);1354 errno = EINVAL;1355die("index file corrupt");1356}13571358intis_index_unborn(struct index_state *istate)1359{1360return(!istate->cache_nr && !istate->alloc && !istate->timestamp.sec);1361}13621363intdiscard_index(struct index_state *istate)1364{1365 istate->cache_nr =0;1366 istate->cache_changed =0;1367 istate->timestamp.sec =0;1368 istate->timestamp.nsec =0;1369 istate->name_hash_initialized =0;1370free_hash(&istate->name_hash);1371cache_tree_free(&(istate->cache_tree));1372free(istate->alloc);1373 istate->alloc = NULL;1374 istate->initialized =0;13751376/* no need to throw away allocated active_cache */1377return0;1378}13791380intunmerged_index(const struct index_state *istate)1381{1382int i;1383for(i =0; i < istate->cache_nr; i++) {1384if(ce_stage(istate->cache[i]))1385return1;1386}1387return0;1388}13891390#define WRITE_BUFFER_SIZE 81921391static unsigned char write_buffer[WRITE_BUFFER_SIZE];1392static unsigned long write_buffer_len;13931394static intce_write_flush(git_SHA_CTX *context,int fd)1395{1396unsigned int buffered = write_buffer_len;1397if(buffered) {1398git_SHA1_Update(context, write_buffer, buffered);1399if(write_in_full(fd, write_buffer, buffered) != buffered)1400return-1;1401 write_buffer_len =0;1402}1403return0;1404}14051406static intce_write(git_SHA_CTX *context,int fd,void*data,unsigned int len)1407{1408while(len) {1409unsigned int buffered = write_buffer_len;1410unsigned int partial = WRITE_BUFFER_SIZE - buffered;1411if(partial > len)1412 partial = len;1413memcpy(write_buffer + buffered, data, partial);1414 buffered += partial;1415if(buffered == WRITE_BUFFER_SIZE) {1416 write_buffer_len = buffered;1417if(ce_write_flush(context, fd))1418return-1;1419 buffered =0;1420}1421 write_buffer_len = buffered;1422 len -= partial;1423 data = (char*) data + partial;1424}1425return0;1426}14271428static intwrite_index_ext_header(git_SHA_CTX *context,int fd,1429unsigned int ext,unsigned int sz)1430{1431 ext =htonl(ext);1432 sz =htonl(sz);1433return((ce_write(context, fd, &ext,4) <0) ||1434(ce_write(context, fd, &sz,4) <0)) ? -1:0;1435}14361437static intce_flush(git_SHA_CTX *context,int fd)1438{1439unsigned int left = write_buffer_len;14401441if(left) {1442 write_buffer_len =0;1443git_SHA1_Update(context, write_buffer, left);1444}14451446/* Flush first if not enough space for SHA1 signature */1447if(left +20> WRITE_BUFFER_SIZE) {1448if(write_in_full(fd, write_buffer, left) != left)1449return-1;1450 left =0;1451}14521453/* Append the SHA1 signature at the end */1454git_SHA1_Final(write_buffer + left, context);1455 left +=20;1456return(write_in_full(fd, write_buffer, left) != left) ? -1:0;1457}14581459static voidce_smudge_racily_clean_entry(struct cache_entry *ce)1460{1461/*1462 * The only thing we care about in this function is to smudge the1463 * falsely clean entry due to touch-update-touch race, so we leave1464 * everything else as they are. We are called for entries whose1465 * ce_mtime match the index file mtime.1466 *1467 * Note that this actually does not do much for gitlinks, for1468 * which ce_match_stat_basic() always goes to the actual1469 * contents. The caller checks with is_racy_timestamp() which1470 * always says "no" for gitlinks, so we are not called for them ;-)1471 */1472struct stat st;14731474if(lstat(ce->name, &st) <0)1475return;1476if(ce_match_stat_basic(ce, &st))1477return;1478if(ce_modified_check_fs(ce, &st)) {1479/* This is "racily clean"; smudge it. Note that this1480 * is a tricky code. At first glance, it may appear1481 * that it can break with this sequence:1482 *1483 * $ echo xyzzy >frotz1484 * $ git-update-index --add frotz1485 * $ : >frotz1486 * $ sleep 31487 * $ echo filfre >nitfol1488 * $ git-update-index --add nitfol1489 *1490 * but it does not. When the second update-index runs,1491 * it notices that the entry "frotz" has the same timestamp1492 * as index, and if we were to smudge it by resetting its1493 * size to zero here, then the object name recorded1494 * in index is the 6-byte file but the cached stat information1495 * becomes zero --- which would then match what we would1496 * obtain from the filesystem next time we stat("frotz").1497 *1498 * However, the second update-index, before calling1499 * this function, notices that the cached size is 61500 * bytes and what is on the filesystem is an empty1501 * file, and never calls us, so the cached size information1502 * for "frotz" stays 6 which does not match the filesystem.1503 */1504 ce->ce_size =0;1505}1506}15071508static intce_write_entry(git_SHA_CTX *c,int fd,struct cache_entry *ce)1509{1510int size =ondisk_ce_size(ce);1511struct ondisk_cache_entry *ondisk =xcalloc(1, size);1512char*name;15131514 ondisk->ctime.sec =htonl(ce->ce_ctime.sec);1515 ondisk->mtime.sec =htonl(ce->ce_mtime.sec);1516 ondisk->ctime.nsec =htonl(ce->ce_ctime.nsec);1517 ondisk->mtime.nsec =htonl(ce->ce_mtime.nsec);1518 ondisk->dev =htonl(ce->ce_dev);1519 ondisk->ino =htonl(ce->ce_ino);1520 ondisk->mode =htonl(ce->ce_mode);1521 ondisk->uid =htonl(ce->ce_uid);1522 ondisk->gid =htonl(ce->ce_gid);1523 ondisk->size =htonl(ce->ce_size);1524hashcpy(ondisk->sha1, ce->sha1);1525 ondisk->flags =htons(ce->ce_flags);1526if(ce->ce_flags & CE_EXTENDED) {1527struct ondisk_cache_entry_extended *ondisk2;1528 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1529 ondisk2->flags2 =htons((ce->ce_flags & CE_EXTENDED_FLAGS) >>16);1530 name = ondisk2->name;1531}1532else1533 name = ondisk->name;1534memcpy(name, ce->name,ce_namelen(ce));15351536returnce_write(c, fd, ondisk, size);1537}15381539intwrite_index(struct index_state *istate,int newfd)1540{1541 git_SHA_CTX c;1542struct cache_header hdr;1543int i, err, removed, extended;1544struct cache_entry **cache = istate->cache;1545int entries = istate->cache_nr;1546struct stat st;15471548for(i = removed = extended =0; i < entries; i++) {1549if(cache[i]->ce_flags & CE_REMOVE)1550 removed++;15511552/* reduce extended entries if possible */1553 cache[i]->ce_flags &= ~CE_EXTENDED;1554if(cache[i]->ce_flags & CE_EXTENDED_FLAGS) {1555 extended++;1556 cache[i]->ce_flags |= CE_EXTENDED;1557}1558}15591560 hdr.hdr_signature =htonl(CACHE_SIGNATURE);1561/* for extended format, increase version so older git won't try to read it */1562 hdr.hdr_version =htonl(extended ?3:2);1563 hdr.hdr_entries =htonl(entries - removed);15641565git_SHA1_Init(&c);1566if(ce_write(&c, newfd, &hdr,sizeof(hdr)) <0)1567return-1;15681569for(i =0; i < entries; i++) {1570struct cache_entry *ce = cache[i];1571if(ce->ce_flags & CE_REMOVE)1572continue;1573if(!ce_uptodate(ce) &&is_racy_timestamp(istate, ce))1574ce_smudge_racily_clean_entry(ce);1575if(ce_write_entry(&c, newfd, ce) <0)1576return-1;1577}15781579/* Write extension data here */1580if(istate->cache_tree) {1581struct strbuf sb = STRBUF_INIT;15821583cache_tree_write(&sb, istate->cache_tree);1584 err =write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) <01585||ce_write(&c, newfd, sb.buf, sb.len) <0;1586strbuf_release(&sb);1587if(err)1588return-1;1589}15901591if(ce_flush(&c, newfd) ||fstat(newfd, &st))1592return-1;1593 istate->timestamp.sec = (unsigned int)st.st_mtime;1594 istate->timestamp.nsec =ST_MTIME_NSEC(st);1595return0;1596}15971598/*1599 * Read the index file that is potentially unmerged into given1600 * index_state, dropping any unmerged entries. Returns true if1601 * the index is unmerged. Callers who want to refuse to work1602 * from an unmerged state can call this and check its return value,1603 * instead of calling read_cache().1604 */1605intread_index_unmerged(struct index_state *istate)1606{1607int i;1608int unmerged =0;16091610read_index(istate);1611for(i =0; i < istate->cache_nr; i++) {1612struct cache_entry *ce = istate->cache[i];1613struct cache_entry *new_ce;1614int size, len;16151616if(!ce_stage(ce))1617continue;1618 unmerged =1;1619 len =strlen(ce->name);1620 size =cache_entry_size(len);1621 new_ce =xcalloc(1, size);1622memcpy(new_ce->name, ce->name, len);1623 new_ce->ce_flags =create_ce_flags(len,0) | CE_CONFLICTED;1624 new_ce->ce_mode = ce->ce_mode;1625if(add_index_entry(istate, new_ce,0))1626returnerror("%s: cannot drop to stage #0",1627 ce->name);1628 i =index_name_pos(istate, new_ce->name, len);1629}1630return unmerged;1631}16321633struct update_callback_data1634{1635int flags;1636int add_errors;1637};16381639static voidupdate_callback(struct diff_queue_struct *q,1640struct diff_options *opt,void*cbdata)1641{1642int i;1643struct update_callback_data *data = cbdata;16441645for(i =0; i < q->nr; i++) {1646struct diff_filepair *p = q->queue[i];1647const char*path = p->one->path;1648switch(p->status) {1649default:1650die("unexpected diff status%c", p->status);1651case DIFF_STATUS_UNMERGED:1652/*1653 * ADD_CACHE_IGNORE_REMOVAL is unset if "git1654 * add -u" is calling us, In such a case, a1655 * missing work tree file needs to be removed1656 * if there is an unmerged entry at stage #2,1657 * but such a diff record is followed by1658 * another with DIFF_STATUS_DELETED (and if1659 * there is no stage #2, we won't see DELETED1660 * nor MODIFIED). We can simply continue1661 * either way.1662 */1663if(!(data->flags & ADD_CACHE_IGNORE_REMOVAL))1664continue;1665/*1666 * Otherwise, it is "git add path" is asking1667 * to explicitly add it; we fall through. A1668 * missing work tree file is an error and is1669 * caught by add_file_to_index() in such a1670 * case.1671 */1672case DIFF_STATUS_MODIFIED:1673case DIFF_STATUS_TYPE_CHANGED:1674if(add_file_to_index(&the_index, path, data->flags)) {1675if(!(data->flags & ADD_CACHE_IGNORE_ERRORS))1676die("updating files failed");1677 data->add_errors++;1678}1679break;1680case DIFF_STATUS_DELETED:1681if(data->flags & ADD_CACHE_IGNORE_REMOVAL)1682break;1683if(!(data->flags & ADD_CACHE_PRETEND))1684remove_file_from_index(&the_index, path);1685if(data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))1686printf("remove '%s'\n", path);1687break;1688}1689}1690}16911692intadd_files_to_cache(const char*prefix,const char**pathspec,int flags)1693{1694struct update_callback_data data;1695struct rev_info rev;1696init_revisions(&rev, prefix);1697setup_revisions(0, NULL, &rev, NULL);1698 rev.prune_data = pathspec;1699 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;1700 rev.diffopt.format_callback = update_callback;1701 data.flags = flags;1702 data.add_errors =0;1703 rev.diffopt.format_callback_data = &data;1704run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);1705return!!data.add_errors;1706}17071708/*1709 * Returns 1 if the path is an "other" path with respect to1710 * the index; that is, the path is not mentioned in the index at all,1711 * either as a file, a directory with some files in the index,1712 * or as an unmerged entry.1713 *1714 * We helpfully remove a trailing "/" from directories so that1715 * the output of read_directory can be used as-is.1716 */1717intindex_name_is_other(const struct index_state *istate,const char*name,1718int namelen)1719{1720int pos;1721if(namelen && name[namelen -1] =='/')1722 namelen--;1723 pos =index_name_pos(istate, name, namelen);1724if(0<= pos)1725return0;/* exact match */1726 pos = -pos -1;1727if(pos < istate->cache_nr) {1728struct cache_entry *ce = istate->cache[pos];1729if(ce_namelen(ce) == namelen &&1730!memcmp(ce->name, name, namelen))1731return0;/* Yup, this one exists unmerged */1732}1733return1;1734}