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