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 = st->st_ctime; 71 ce->ce_mtime = st->st_mtime; 72 ce->ce_dev = st->st_dev; 73 ce->ce_ino = st->st_ino; 74 ce->ce_uid = st->st_uid; 75 ce->ce_gid = st->st_gid; 76 ce->ce_size = st->st_size; 77 78if(assume_unchanged) 79 ce->ce_flags |= CE_VALID; 80 81if(S_ISREG(st->st_mode)) 82ce_mark_uptodate(ce); 83} 84 85static intce_compare_data(struct cache_entry *ce,struct stat *st) 86{ 87int match = -1; 88int fd =open(ce->name, O_RDONLY); 89 90if(fd >=0) { 91unsigned char sha1[20]; 92if(!index_fd(sha1, fd, st,0, OBJ_BLOB, ce->name)) 93 match =hashcmp(sha1, ce->sha1); 94/* index_fd() closed the file descriptor already */ 95} 96return match; 97} 98 99static intce_compare_link(struct cache_entry *ce,size_t expected_size) 100{ 101int match = -1; 102void*buffer; 103unsigned long size; 104enum object_type type; 105struct strbuf sb = STRBUF_INIT; 106 107if(strbuf_readlink(&sb, ce->name, expected_size)) 108return-1; 109 110 buffer =read_sha1_file(ce->sha1, &type, &size); 111if(buffer) { 112if(size == sb.len) 113 match =memcmp(buffer, sb.buf, size); 114free(buffer); 115} 116strbuf_release(&sb); 117return match; 118} 119 120static intce_compare_gitlink(struct cache_entry *ce) 121{ 122unsigned char sha1[20]; 123 124/* 125 * We don't actually require that the .git directory 126 * under GITLINK directory be a valid git directory. It 127 * might even be missing (in case nobody populated that 128 * sub-project). 129 * 130 * If so, we consider it always to match. 131 */ 132if(resolve_gitlink_ref(ce->name,"HEAD", sha1) <0) 133return0; 134returnhashcmp(sha1, ce->sha1); 135} 136 137static intce_modified_check_fs(struct cache_entry *ce,struct stat *st) 138{ 139switch(st->st_mode & S_IFMT) { 140case S_IFREG: 141if(ce_compare_data(ce, st)) 142return DATA_CHANGED; 143break; 144case S_IFLNK: 145if(ce_compare_link(ce,xsize_t(st->st_size))) 146return DATA_CHANGED; 147break; 148case S_IFDIR: 149if(S_ISGITLINK(ce->ce_mode)) 150returnce_compare_gitlink(ce) ? DATA_CHANGED :0; 151default: 152return TYPE_CHANGED; 153} 154return0; 155} 156 157intis_empty_blob_sha1(const unsigned char*sha1) 158{ 159static const unsigned char empty_blob_sha1[20] = { 1600xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b, 1610x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91 162}; 163 164return!hashcmp(sha1, empty_blob_sha1); 165} 166 167static intce_match_stat_basic(struct cache_entry *ce,struct stat *st) 168{ 169unsigned int changed =0; 170 171if(ce->ce_flags & CE_REMOVE) 172return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED; 173 174switch(ce->ce_mode & S_IFMT) { 175case S_IFREG: 176 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED :0; 177/* We consider only the owner x bit to be relevant for 178 * "mode changes" 179 */ 180if(trust_executable_bit && 181(0100& (ce->ce_mode ^ st->st_mode))) 182 changed |= MODE_CHANGED; 183break; 184case S_IFLNK: 185if(!S_ISLNK(st->st_mode) && 186(has_symlinks || !S_ISREG(st->st_mode))) 187 changed |= TYPE_CHANGED; 188break; 189case S_IFGITLINK: 190/* We ignore most of the st_xxx fields for gitlinks */ 191if(!S_ISDIR(st->st_mode)) 192 changed |= TYPE_CHANGED; 193else if(ce_compare_gitlink(ce)) 194 changed |= DATA_CHANGED; 195return changed; 196default: 197die("internal error: ce_mode is%o", ce->ce_mode); 198} 199if(ce->ce_mtime != (unsigned int) st->st_mtime) 200 changed |= MTIME_CHANGED; 201if(trust_ctime && ce->ce_ctime != (unsigned int) st->st_ctime) 202 changed |= CTIME_CHANGED; 203 204if(ce->ce_uid != (unsigned int) st->st_uid || 205 ce->ce_gid != (unsigned int) st->st_gid) 206 changed |= OWNER_CHANGED; 207if(ce->ce_ino != (unsigned int) st->st_ino) 208 changed |= INODE_CHANGED; 209 210#ifdef USE_STDEV 211/* 212 * st_dev breaks on network filesystems where different 213 * clients will have different views of what "device" 214 * the filesystem is on 215 */ 216if(ce->ce_dev != (unsigned int) st->st_dev) 217 changed |= INODE_CHANGED; 218#endif 219 220if(ce->ce_size != (unsigned int) st->st_size) 221 changed |= DATA_CHANGED; 222 223/* Racily smudged entry? */ 224if(!ce->ce_size) { 225if(!is_empty_blob_sha1(ce->sha1)) 226 changed |= DATA_CHANGED; 227} 228 229return changed; 230} 231 232static intis_racy_timestamp(const struct index_state *istate,struct cache_entry *ce) 233{ 234return(!S_ISGITLINK(ce->ce_mode) && 235 istate->timestamp && 236((unsigned int)istate->timestamp) <= ce->ce_mtime); 237} 238 239intie_match_stat(const struct index_state *istate, 240struct cache_entry *ce,struct stat *st, 241unsigned int options) 242{ 243unsigned int changed; 244int ignore_valid = options & CE_MATCH_IGNORE_VALID; 245int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY; 246 247/* 248 * If it's marked as always valid in the index, it's 249 * valid whatever the checked-out copy says. 250 */ 251if(!ignore_valid && (ce->ce_flags & CE_VALID)) 252return0; 253 254/* 255 * Intent-to-add entries have not been added, so the index entry 256 * by definition never matches what is in the work tree until it 257 * actually gets added. 258 */ 259if(ce->ce_flags & CE_INTENT_TO_ADD) 260return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED; 261 262 changed =ce_match_stat_basic(ce, st); 263 264/* 265 * Within 1 second of this sequence: 266 * echo xyzzy >file && git-update-index --add file 267 * running this command: 268 * echo frotz >file 269 * would give a falsely clean cache entry. The mtime and 270 * length match the cache, and other stat fields do not change. 271 * 272 * We could detect this at update-index time (the cache entry 273 * being registered/updated records the same time as "now") 274 * and delay the return from git-update-index, but that would 275 * effectively mean we can make at most one commit per second, 276 * which is not acceptable. Instead, we check cache entries 277 * whose mtime are the same as the index file timestamp more 278 * carefully than others. 279 */ 280if(!changed &&is_racy_timestamp(istate, ce)) { 281if(assume_racy_is_modified) 282 changed |= DATA_CHANGED; 283else 284 changed |=ce_modified_check_fs(ce, st); 285} 286 287return changed; 288} 289 290intie_modified(const struct index_state *istate, 291struct cache_entry *ce,struct stat *st,unsigned int options) 292{ 293int changed, changed_fs; 294 295 changed =ie_match_stat(istate, ce, st, options); 296if(!changed) 297return0; 298/* 299 * If the mode or type has changed, there's no point in trying 300 * to refresh the entry - it's not going to match 301 */ 302if(changed & (MODE_CHANGED | TYPE_CHANGED)) 303return changed; 304 305/* 306 * Immediately after read-tree or update-index --cacheinfo, 307 * the length field is zero, as we have never even read the 308 * lstat(2) information once, and we cannot trust DATA_CHANGED 309 * returned by ie_match_stat() which in turn was returned by 310 * ce_match_stat_basic() to signal that the filesize of the 311 * blob changed. We have to actually go to the filesystem to 312 * see if the contents match, and if so, should answer "unchanged". 313 * 314 * The logic does not apply to gitlinks, as ce_match_stat_basic() 315 * already has checked the actual HEAD from the filesystem in the 316 * subproject. If ie_match_stat() already said it is different, 317 * then we know it is. 318 */ 319if((changed & DATA_CHANGED) && 320(S_ISGITLINK(ce->ce_mode) || ce->ce_size !=0)) 321return changed; 322 323 changed_fs =ce_modified_check_fs(ce, st); 324if(changed_fs) 325return changed | changed_fs; 326return0; 327} 328 329intbase_name_compare(const char*name1,int len1,int mode1, 330const char*name2,int len2,int mode2) 331{ 332unsigned char c1, c2; 333int len = len1 < len2 ? len1 : len2; 334int cmp; 335 336 cmp =memcmp(name1, name2, len); 337if(cmp) 338return cmp; 339 c1 = name1[len]; 340 c2 = name2[len]; 341if(!c1 &&S_ISDIR(mode1)) 342 c1 ='/'; 343if(!c2 &&S_ISDIR(mode2)) 344 c2 ='/'; 345return(c1 < c2) ? -1: (c1 > c2) ?1:0; 346} 347 348/* 349 * df_name_compare() is identical to base_name_compare(), except it 350 * compares conflicting directory/file entries as equal. Note that 351 * while a directory name compares as equal to a regular file, they 352 * then individually compare _differently_ to a filename that has 353 * a dot after the basename (because '\0' < '.' < '/'). 354 * 355 * This is used by routines that want to traverse the git namespace 356 * but then handle conflicting entries together when possible. 357 */ 358intdf_name_compare(const char*name1,int len1,int mode1, 359const char*name2,int len2,int mode2) 360{ 361int len = len1 < len2 ? len1 : len2, cmp; 362unsigned char c1, c2; 363 364 cmp =memcmp(name1, name2, len); 365if(cmp) 366return cmp; 367/* Directories and files compare equal (same length, same name) */ 368if(len1 == len2) 369return0; 370 c1 = name1[len]; 371if(!c1 &&S_ISDIR(mode1)) 372 c1 ='/'; 373 c2 = name2[len]; 374if(!c2 &&S_ISDIR(mode2)) 375 c2 ='/'; 376if(c1 =='/'&& !c2) 377return0; 378if(c2 =='/'&& !c1) 379return0; 380return c1 - c2; 381} 382 383intcache_name_compare(const char*name1,int flags1,const char*name2,int flags2) 384{ 385int len1 = flags1 & CE_NAMEMASK; 386int len2 = flags2 & CE_NAMEMASK; 387int len = len1 < len2 ? len1 : len2; 388int cmp; 389 390 cmp =memcmp(name1, name2, len); 391if(cmp) 392return cmp; 393if(len1 < len2) 394return-1; 395if(len1 > len2) 396return1; 397 398/* Compare stages */ 399 flags1 &= CE_STAGEMASK; 400 flags2 &= CE_STAGEMASK; 401 402if(flags1 < flags2) 403return-1; 404if(flags1 > flags2) 405return1; 406return0; 407} 408 409intindex_name_pos(const struct index_state *istate,const char*name,int namelen) 410{ 411int first, last; 412 413 first =0; 414 last = istate->cache_nr; 415while(last > first) { 416int next = (last + first) >>1; 417struct cache_entry *ce = istate->cache[next]; 418int cmp =cache_name_compare(name, namelen, ce->name, ce->ce_flags); 419if(!cmp) 420return next; 421if(cmp <0) { 422 last = next; 423continue; 424} 425 first = next+1; 426} 427return-first-1; 428} 429 430/* Remove entry, return true if there are more entries to go.. */ 431intremove_index_entry_at(struct index_state *istate,int pos) 432{ 433struct cache_entry *ce = istate->cache[pos]; 434 435remove_name_hash(ce); 436 istate->cache_changed =1; 437 istate->cache_nr--; 438if(pos >= istate->cache_nr) 439return0; 440memmove(istate->cache + pos, 441 istate->cache + pos +1, 442(istate->cache_nr - pos) *sizeof(struct cache_entry *)); 443return1; 444} 445 446intremove_file_from_index(struct index_state *istate,const char*path) 447{ 448int pos =index_name_pos(istate, path,strlen(path)); 449if(pos <0) 450 pos = -pos-1; 451cache_tree_invalidate_path(istate->cache_tree, path); 452while(pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path)) 453remove_index_entry_at(istate, pos); 454return0; 455} 456 457static intcompare_name(struct cache_entry *ce,const char*path,int namelen) 458{ 459return namelen !=ce_namelen(ce) ||memcmp(path, ce->name, namelen); 460} 461 462static intindex_name_pos_also_unmerged(struct index_state *istate, 463const char*path,int namelen) 464{ 465int pos =index_name_pos(istate, path, namelen); 466struct cache_entry *ce; 467 468if(pos >=0) 469return pos; 470 471/* maybe unmerged? */ 472 pos = -1- pos; 473if(pos >= istate->cache_nr || 474compare_name((ce = istate->cache[pos]), path, namelen)) 475return-1; 476 477/* order of preference: stage 2, 1, 3 */ 478if(ce_stage(ce) ==1&& pos +1< istate->cache_nr && 479ce_stage((ce = istate->cache[pos +1])) ==2&& 480!compare_name(ce, path, namelen)) 481 pos++; 482return pos; 483} 484 485static intdifferent_name(struct cache_entry *ce,struct cache_entry *alias) 486{ 487int len =ce_namelen(ce); 488returnce_namelen(alias) != len ||memcmp(ce->name, alias->name, len); 489} 490 491/* 492 * If we add a filename that aliases in the cache, we will use the 493 * name that we already have - but we don't want to update the same 494 * alias twice, because that implies that there were actually two 495 * different files with aliasing names! 496 * 497 * So we use the CE_ADDED flag to verify that the alias was an old 498 * one before we accept it as 499 */ 500static struct cache_entry *create_alias_ce(struct cache_entry *ce,struct cache_entry *alias) 501{ 502int len; 503struct cache_entry *new; 504 505if(alias->ce_flags & CE_ADDED) 506die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name); 507 508/* Ok, create the new entry using the name of the existing alias */ 509 len =ce_namelen(alias); 510new=xcalloc(1,cache_entry_size(len)); 511memcpy(new->name, alias->name, len); 512copy_cache_entry(new, ce); 513free(ce); 514return new; 515} 516 517static voidrecord_intent_to_add(struct cache_entry *ce) 518{ 519unsigned char sha1[20]; 520if(write_sha1_file("",0, blob_type, sha1)) 521die("cannot create an empty blob in the object database"); 522hashcpy(ce->sha1, sha1); 523} 524 525intadd_to_index(struct index_state *istate,const char*path,struct stat *st,int flags) 526{ 527int size, namelen, was_same; 528 mode_t st_mode = st->st_mode; 529struct cache_entry *ce, *alias; 530unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY; 531int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND); 532int pretend = flags & ADD_CACHE_PRETEND; 533int intent_only = flags & ADD_CACHE_INTENT; 534int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE| 535(intent_only ? ADD_CACHE_NEW_ONLY :0)); 536 537if(!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode)) 538returnerror("%s: can only add regular files, symbolic links or git-directories", path); 539 540 namelen =strlen(path); 541if(S_ISDIR(st_mode)) { 542while(namelen && path[namelen-1] =='/') 543 namelen--; 544} 545 size =cache_entry_size(namelen); 546 ce =xcalloc(1, size); 547memcpy(ce->name, path, namelen); 548 ce->ce_flags = namelen; 549if(!intent_only) 550fill_stat_cache_info(ce, st); 551else 552 ce->ce_flags |= CE_INTENT_TO_ADD; 553 554if(trust_executable_bit && has_symlinks) 555 ce->ce_mode =create_ce_mode(st_mode); 556else{ 557/* If there is an existing entry, pick the mode bits and type 558 * from it, otherwise assume unexecutable regular file. 559 */ 560struct cache_entry *ent; 561int pos =index_name_pos_also_unmerged(istate, path, namelen); 562 563 ent = (0<= pos) ? istate->cache[pos] : NULL; 564 ce->ce_mode =ce_mode_from_stat(ent, st_mode); 565} 566 567 alias =index_name_exists(istate, ce->name,ce_namelen(ce), ignore_case); 568if(alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) { 569/* Nothing changed, really */ 570free(ce); 571ce_mark_uptodate(alias); 572 alias->ce_flags |= CE_ADDED; 573return0; 574} 575if(!intent_only) { 576if(index_path(ce->sha1, path, st,1)) 577returnerror("unable to index file%s", path); 578}else 579record_intent_to_add(ce); 580 581if(ignore_case && alias &&different_name(ce, alias)) 582 ce =create_alias_ce(ce, alias); 583 ce->ce_flags |= CE_ADDED; 584 585/* It was suspected to be racily clean, but it turns out to be Ok */ 586 was_same = (alias && 587!ce_stage(alias) && 588!hashcmp(alias->sha1, ce->sha1) && 589 ce->ce_mode == alias->ce_mode); 590 591if(pretend) 592; 593else if(add_index_entry(istate, ce, add_option)) 594returnerror("unable to add%sto index",path); 595if(verbose && !was_same) 596printf("add '%s'\n", path); 597return0; 598} 599 600intadd_file_to_index(struct index_state *istate,const char*path,int flags) 601{ 602struct stat st; 603if(lstat(path, &st)) 604die("%s: unable to stat (%s)", path,strerror(errno)); 605returnadd_to_index(istate, path, &st, flags); 606} 607 608struct cache_entry *make_cache_entry(unsigned int mode, 609const unsigned char*sha1,const char*path,int stage, 610int refresh) 611{ 612int size, len; 613struct cache_entry *ce; 614 615if(!verify_path(path)) { 616error("Invalid path '%s'", path); 617return NULL; 618} 619 620 len =strlen(path); 621 size =cache_entry_size(len); 622 ce =xcalloc(1, size); 623 624hashcpy(ce->sha1, sha1); 625memcpy(ce->name, path, len); 626 ce->ce_flags =create_ce_flags(len, stage); 627 ce->ce_mode =create_ce_mode(mode); 628 629if(refresh) 630returnrefresh_cache_entry(ce,0); 631 632return ce; 633} 634 635intce_same_name(struct cache_entry *a,struct cache_entry *b) 636{ 637int len =ce_namelen(a); 638returnce_namelen(b) == len && !memcmp(a->name, b->name, len); 639} 640 641intce_path_match(const struct cache_entry *ce,const char**pathspec) 642{ 643const char*match, *name; 644int len; 645 646if(!pathspec) 647return1; 648 649 len =ce_namelen(ce); 650 name = ce->name; 651while((match = *pathspec++) != NULL) { 652int matchlen =strlen(match); 653if(matchlen > len) 654continue; 655if(memcmp(name, match, matchlen)) 656continue; 657if(matchlen && name[matchlen-1] =='/') 658return1; 659if(name[matchlen] =='/'|| !name[matchlen]) 660return1; 661if(!matchlen) 662return1; 663} 664return0; 665} 666 667/* 668 * We fundamentally don't like some paths: we don't want 669 * dot or dot-dot anywhere, and for obvious reasons don't 670 * want to recurse into ".git" either. 671 * 672 * Also, we don't want double slashes or slashes at the 673 * end that can make pathnames ambiguous. 674 */ 675static intverify_dotfile(const char*rest) 676{ 677/* 678 * The first character was '.', but that 679 * has already been discarded, we now test 680 * the rest. 681 */ 682switch(*rest) { 683/* "." is not allowed */ 684case'\0':case'/': 685return0; 686 687/* 688 * ".git" followed by NUL or slash is bad. This 689 * shares the path end test with the ".." case. 690 */ 691case'g': 692if(rest[1] !='i') 693break; 694if(rest[2] !='t') 695break; 696 rest +=2; 697/* fallthrough */ 698case'.': 699if(rest[1] =='\0'|| rest[1] =='/') 700return0; 701} 702return1; 703} 704 705intverify_path(const char*path) 706{ 707char c; 708 709goto inside; 710for(;;) { 711if(!c) 712return1; 713if(c =='/') { 714inside: 715 c = *path++; 716switch(c) { 717default: 718continue; 719case'/':case'\0': 720break; 721case'.': 722if(verify_dotfile(path)) 723continue; 724} 725return0; 726} 727 c = *path++; 728} 729} 730 731/* 732 * Do we have another file that has the beginning components being a 733 * proper superset of the name we're trying to add? 734 */ 735static inthas_file_name(struct index_state *istate, 736const struct cache_entry *ce,int pos,int ok_to_replace) 737{ 738int retval =0; 739int len =ce_namelen(ce); 740int stage =ce_stage(ce); 741const char*name = ce->name; 742 743while(pos < istate->cache_nr) { 744struct cache_entry *p = istate->cache[pos++]; 745 746if(len >=ce_namelen(p)) 747break; 748if(memcmp(name, p->name, len)) 749break; 750if(ce_stage(p) != stage) 751continue; 752if(p->name[len] !='/') 753continue; 754if(p->ce_flags & CE_REMOVE) 755continue; 756 retval = -1; 757if(!ok_to_replace) 758break; 759remove_index_entry_at(istate, --pos); 760} 761return retval; 762} 763 764/* 765 * Do we have another file with a pathname that is a proper 766 * subset of the name we're trying to add? 767 */ 768static inthas_dir_name(struct index_state *istate, 769const struct cache_entry *ce,int pos,int ok_to_replace) 770{ 771int retval =0; 772int stage =ce_stage(ce); 773const char*name = ce->name; 774const char*slash = name +ce_namelen(ce); 775 776for(;;) { 777int len; 778 779for(;;) { 780if(*--slash =='/') 781break; 782if(slash <= ce->name) 783return retval; 784} 785 len = slash - name; 786 787 pos =index_name_pos(istate, name,create_ce_flags(len, stage)); 788if(pos >=0) { 789/* 790 * Found one, but not so fast. This could 791 * be a marker that says "I was here, but 792 * I am being removed". Such an entry is 793 * not a part of the resulting tree, and 794 * it is Ok to have a directory at the same 795 * path. 796 */ 797if(!(istate->cache[pos]->ce_flags & CE_REMOVE)) { 798 retval = -1; 799if(!ok_to_replace) 800break; 801remove_index_entry_at(istate, pos); 802continue; 803} 804} 805else 806 pos = -pos-1; 807 808/* 809 * Trivial optimization: if we find an entry that 810 * already matches the sub-directory, then we know 811 * we're ok, and we can exit. 812 */ 813while(pos < istate->cache_nr) { 814struct cache_entry *p = istate->cache[pos]; 815if((ce_namelen(p) <= len) || 816(p->name[len] !='/') || 817memcmp(p->name, name, len)) 818break;/* not our subdirectory */ 819if(ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) 820/* 821 * p is at the same stage as our entry, and 822 * is a subdirectory of what we are looking 823 * at, so we cannot have conflicts at our 824 * level or anything shorter. 825 */ 826return retval; 827 pos++; 828} 829} 830return retval; 831} 832 833/* We may be in a situation where we already have path/file and path 834 * is being added, or we already have path and path/file is being 835 * added. Either one would result in a nonsense tree that has path 836 * twice when git-write-tree tries to write it out. Prevent it. 837 * 838 * If ok-to-replace is specified, we remove the conflicting entries 839 * from the cache so the caller should recompute the insert position. 840 * When this happens, we return non-zero. 841 */ 842static intcheck_file_directory_conflict(struct index_state *istate, 843const struct cache_entry *ce, 844int pos,int ok_to_replace) 845{ 846int retval; 847 848/* 849 * When ce is an "I am going away" entry, we allow it to be added 850 */ 851if(ce->ce_flags & CE_REMOVE) 852return0; 853 854/* 855 * We check if the path is a sub-path of a subsequent pathname 856 * first, since removing those will not change the position 857 * in the array. 858 */ 859 retval =has_file_name(istate, ce, pos, ok_to_replace); 860 861/* 862 * Then check if the path might have a clashing sub-directory 863 * before it. 864 */ 865return retval +has_dir_name(istate, ce, pos, ok_to_replace); 866} 867 868static intadd_index_entry_with_check(struct index_state *istate,struct cache_entry *ce,int option) 869{ 870int pos; 871int ok_to_add = option & ADD_CACHE_OK_TO_ADD; 872int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; 873int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; 874int new_only = option & ADD_CACHE_NEW_ONLY; 875 876cache_tree_invalidate_path(istate->cache_tree, ce->name); 877 pos =index_name_pos(istate, ce->name, ce->ce_flags); 878 879/* existing match? Just replace it. */ 880if(pos >=0) { 881if(!new_only) 882replace_index_entry(istate, pos, ce); 883return0; 884} 885 pos = -pos-1; 886 887/* 888 * Inserting a merged entry ("stage 0") into the index 889 * will always replace all non-merged entries.. 890 */ 891if(pos < istate->cache_nr &&ce_stage(ce) ==0) { 892while(ce_same_name(istate->cache[pos], ce)) { 893 ok_to_add =1; 894if(!remove_index_entry_at(istate, pos)) 895break; 896} 897} 898 899if(!ok_to_add) 900return-1; 901if(!verify_path(ce->name)) 902returnerror("Invalid path '%s'", ce->name); 903 904if(!skip_df_check && 905check_file_directory_conflict(istate, ce, pos, ok_to_replace)) { 906if(!ok_to_replace) 907returnerror("'%s' appears as both a file and as a directory", 908 ce->name); 909 pos =index_name_pos(istate, ce->name, ce->ce_flags); 910 pos = -pos-1; 911} 912return pos +1; 913} 914 915intadd_index_entry(struct index_state *istate,struct cache_entry *ce,int option) 916{ 917int pos; 918 919if(option & ADD_CACHE_JUST_APPEND) 920 pos = istate->cache_nr; 921else{ 922int ret; 923 ret =add_index_entry_with_check(istate, ce, option); 924if(ret <=0) 925return ret; 926 pos = ret -1; 927} 928 929/* Make sure the array is big enough .. */ 930if(istate->cache_nr == istate->cache_alloc) { 931 istate->cache_alloc =alloc_nr(istate->cache_alloc); 932 istate->cache =xrealloc(istate->cache, 933 istate->cache_alloc *sizeof(struct cache_entry *)); 934} 935 936/* Add it in.. */ 937 istate->cache_nr++; 938if(istate->cache_nr > pos +1) 939memmove(istate->cache + pos +1, 940 istate->cache + pos, 941(istate->cache_nr - pos -1) *sizeof(ce)); 942set_index_entry(istate, pos, ce); 943 istate->cache_changed =1; 944return0; 945} 946 947/* 948 * "refresh" does not calculate a new sha1 file or bring the 949 * cache up-to-date for mode/content changes. But what it 950 * _does_ do is to "re-match" the stat information of a file 951 * with the cache, so that you can refresh the cache for a 952 * file that hasn't been changed but where the stat entry is 953 * out of date. 954 * 955 * For example, you'd want to do this after doing a "git-read-tree", 956 * to link up the stat cache details with the proper files. 957 */ 958static struct cache_entry *refresh_cache_ent(struct index_state *istate, 959struct cache_entry *ce, 960unsigned int options,int*err) 961{ 962struct stat st; 963struct cache_entry *updated; 964int changed, size; 965int ignore_valid = options & CE_MATCH_IGNORE_VALID; 966 967if(ce_uptodate(ce)) 968return ce; 969 970/* 971 * CE_VALID means the user promised us that the change to 972 * the work tree does not matter and told us not to worry. 973 */ 974if(!ignore_valid && (ce->ce_flags & CE_VALID)) { 975ce_mark_uptodate(ce); 976return ce; 977} 978 979if(lstat(ce->name, &st) <0) { 980if(err) 981*err = errno; 982return NULL; 983} 984 985 changed =ie_match_stat(istate, ce, &st, options); 986if(!changed) { 987/* 988 * The path is unchanged. If we were told to ignore 989 * valid bit, then we did the actual stat check and 990 * found that the entry is unmodified. If the entry 991 * is not marked VALID, this is the place to mark it 992 * valid again, under "assume unchanged" mode. 993 */ 994if(ignore_valid && assume_unchanged && 995!(ce->ce_flags & CE_VALID)) 996;/* mark this one VALID again */ 997else{ 998/* 999 * We do not mark the index itself "modified"1000 * because CE_UPTODATE flag is in-core only;1001 * we are not going to write this change out.1002 */1003ce_mark_uptodate(ce);1004return ce;1005}1006}10071008if(ie_modified(istate, ce, &st, options)) {1009if(err)1010*err = EINVAL;1011return NULL;1012}10131014 size =ce_size(ce);1015 updated =xmalloc(size);1016memcpy(updated, ce, size);1017fill_stat_cache_info(updated, &st);1018/*1019 * If ignore_valid is not set, we should leave CE_VALID bit1020 * alone. Otherwise, paths marked with --no-assume-unchanged1021 * (i.e. things to be edited) will reacquire CE_VALID bit1022 * automatically, which is not really what we want.1023 */1024if(!ignore_valid && assume_unchanged &&1025!(ce->ce_flags & CE_VALID))1026 updated->ce_flags &= ~CE_VALID;10271028return updated;1029}10301031intrefresh_index(struct index_state *istate,unsigned int flags,const char**pathspec,char*seen)1032{1033int i;1034int has_errors =0;1035int really = (flags & REFRESH_REALLY) !=0;1036int allow_unmerged = (flags & REFRESH_UNMERGED) !=0;1037int quiet = (flags & REFRESH_QUIET) !=0;1038int not_new = (flags & REFRESH_IGNORE_MISSING) !=0;1039int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) !=0;1040unsigned int options = really ? CE_MATCH_IGNORE_VALID :0;1041const char*needs_update_message;10421043 needs_update_message = ((flags & REFRESH_SAY_CHANGED)1044?"locally modified":"needs update");1045for(i =0; i < istate->cache_nr; i++) {1046struct cache_entry *ce, *new;1047int cache_errno =0;10481049 ce = istate->cache[i];1050if(ignore_submodules &&S_ISGITLINK(ce->ce_mode))1051continue;10521053if(ce_stage(ce)) {1054while((i < istate->cache_nr) &&1055!strcmp(istate->cache[i]->name, ce->name))1056 i++;1057 i--;1058if(allow_unmerged)1059continue;1060printf("%s: needs merge\n", ce->name);1061 has_errors =1;1062continue;1063}10641065if(pathspec && !match_pathspec(pathspec, ce->name,strlen(ce->name),0, seen))1066continue;10671068new=refresh_cache_ent(istate, ce, options, &cache_errno);1069if(new== ce)1070continue;1071if(!new) {1072if(not_new && cache_errno == ENOENT)1073continue;1074if(really && cache_errno == EINVAL) {1075/* If we are doing --really-refresh that1076 * means the index is not valid anymore.1077 */1078 ce->ce_flags &= ~CE_VALID;1079 istate->cache_changed =1;1080}1081if(quiet)1082continue;1083printf("%s:%s\n", ce->name, needs_update_message);1084 has_errors =1;1085continue;1086}10871088replace_index_entry(istate, i,new);1089}1090return has_errors;1091}10921093struct cache_entry *refresh_cache_entry(struct cache_entry *ce,int really)1094{1095returnrefresh_cache_ent(&the_index, ce, really, NULL);1096}10971098static intverify_hdr(struct cache_header *hdr,unsigned long size)1099{1100 git_SHA_CTX c;1101unsigned char sha1[20];11021103if(hdr->hdr_signature !=htonl(CACHE_SIGNATURE))1104returnerror("bad signature");1105if(hdr->hdr_version !=htonl(2) && hdr->hdr_version !=htonl(3))1106returnerror("bad index version");1107git_SHA1_Init(&c);1108git_SHA1_Update(&c, hdr, size -20);1109git_SHA1_Final(sha1, &c);1110if(hashcmp(sha1, (unsigned char*)hdr + size -20))1111returnerror("bad index file sha1 signature");1112return0;1113}11141115static intread_index_extension(struct index_state *istate,1116const char*ext,void*data,unsigned long sz)1117{1118switch(CACHE_EXT(ext)) {1119case CACHE_EXT_TREE:1120 istate->cache_tree =cache_tree_read(data, sz);1121break;1122default:1123if(*ext <'A'||'Z'< *ext)1124returnerror("index uses %.4s extension, which we do not understand",1125 ext);1126fprintf(stderr,"ignoring %.4s extension\n", ext);1127break;1128}1129return0;1130}11311132intread_index(struct index_state *istate)1133{1134returnread_index_from(istate,get_index_file());1135}11361137static voidconvert_from_disk(struct ondisk_cache_entry *ondisk,struct cache_entry *ce)1138{1139size_t len;1140const char*name;11411142 ce->ce_ctime =ntohl(ondisk->ctime.sec);1143 ce->ce_mtime =ntohl(ondisk->mtime.sec);1144 ce->ce_dev =ntohl(ondisk->dev);1145 ce->ce_ino =ntohl(ondisk->ino);1146 ce->ce_mode =ntohl(ondisk->mode);1147 ce->ce_uid =ntohl(ondisk->uid);1148 ce->ce_gid =ntohl(ondisk->gid);1149 ce->ce_size =ntohl(ondisk->size);1150/* On-disk flags are just 16 bits */1151 ce->ce_flags =ntohs(ondisk->flags);11521153hashcpy(ce->sha1, ondisk->sha1);11541155 len = ce->ce_flags & CE_NAMEMASK;11561157if(ce->ce_flags & CE_EXTENDED) {1158struct ondisk_cache_entry_extended *ondisk2;1159int extended_flags;1160 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1161 extended_flags =ntohs(ondisk2->flags2) <<16;1162/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */1163if(extended_flags & ~CE_EXTENDED_FLAGS)1164die("Unknown index entry format%08x", extended_flags);1165 ce->ce_flags |= extended_flags;1166 name = ondisk2->name;1167}1168else1169 name = ondisk->name;11701171if(len == CE_NAMEMASK)1172 len =strlen(name);1173/*1174 * NEEDSWORK: If the original index is crafted, this copy could1175 * go unchecked.1176 */1177memcpy(ce->name, name, len +1);1178}11791180staticinlinesize_testimate_cache_size(size_t ondisk_size,unsigned int entries)1181{1182long per_entry;11831184 per_entry =sizeof(struct cache_entry) -sizeof(struct ondisk_cache_entry);11851186/*1187 * Alignment can cause differences. This should be "alignof", but1188 * since that's a gcc'ism, just use the size of a pointer.1189 */1190 per_entry +=sizeof(void*);1191return ondisk_size + entries*per_entry;1192}11931194/* remember to discard_cache() before reading a different cache! */1195intread_index_from(struct index_state *istate,const char*path)1196{1197int fd, i;1198struct stat st;1199unsigned long src_offset, dst_offset;1200struct cache_header *hdr;1201void*mmap;1202size_t mmap_size;12031204 errno = EBUSY;1205if(istate->initialized)1206return istate->cache_nr;12071208 errno = ENOENT;1209 istate->timestamp =0;1210 fd =open(path, O_RDONLY);1211if(fd <0) {1212if(errno == ENOENT)1213return0;1214die("index file open failed (%s)",strerror(errno));1215}12161217if(fstat(fd, &st))1218die("cannot stat the open index (%s)",strerror(errno));12191220 errno = EINVAL;1221 mmap_size =xsize_t(st.st_size);1222if(mmap_size <sizeof(struct cache_header) +20)1223die("index file smaller than expected");12241225 mmap =xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,0);1226close(fd);1227if(mmap == MAP_FAILED)1228die("unable to map index file");12291230 hdr = mmap;1231if(verify_hdr(hdr, mmap_size) <0)1232goto unmap;12331234 istate->cache_nr =ntohl(hdr->hdr_entries);1235 istate->cache_alloc =alloc_nr(istate->cache_nr);1236 istate->cache =xcalloc(istate->cache_alloc,sizeof(struct cache_entry *));12371238/*1239 * The disk format is actually larger than the in-memory format,1240 * due to space for nsec etc, so even though the in-memory one1241 * has room for a few more flags, we can allocate using the same1242 * index size1243 */1244 istate->alloc =xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));1245 istate->initialized =1;12461247 src_offset =sizeof(*hdr);1248 dst_offset =0;1249for(i =0; i < istate->cache_nr; i++) {1250struct ondisk_cache_entry *disk_ce;1251struct cache_entry *ce;12521253 disk_ce = (struct ondisk_cache_entry *)((char*)mmap + src_offset);1254 ce = (struct cache_entry *)((char*)istate->alloc + dst_offset);1255convert_from_disk(disk_ce, ce);1256set_index_entry(istate, i, ce);12571258 src_offset +=ondisk_ce_size(ce);1259 dst_offset +=ce_size(ce);1260}1261 istate->timestamp = st.st_mtime;1262while(src_offset <= mmap_size -20-8) {1263/* After an array of active_nr index entries,1264 * there can be arbitrary number of extended1265 * sections, each of which is prefixed with1266 * extension name (4-byte) and section length1267 * in 4-byte network byte order.1268 */1269unsigned long extsize;1270memcpy(&extsize, (char*)mmap + src_offset +4,4);1271 extsize =ntohl(extsize);1272if(read_index_extension(istate,1273(const char*) mmap + src_offset,1274(char*) mmap + src_offset +8,1275 extsize) <0)1276goto unmap;1277 src_offset +=8;1278 src_offset += extsize;1279}1280munmap(mmap, mmap_size);1281return istate->cache_nr;12821283unmap:1284munmap(mmap, mmap_size);1285 errno = EINVAL;1286die("index file corrupt");1287}12881289intis_index_unborn(struct index_state *istate)1290{1291return(!istate->cache_nr && !istate->alloc && !istate->timestamp);1292}12931294intdiscard_index(struct index_state *istate)1295{1296 istate->cache_nr =0;1297 istate->cache_changed =0;1298 istate->timestamp =0;1299 istate->name_hash_initialized =0;1300free_hash(&istate->name_hash);1301cache_tree_free(&(istate->cache_tree));1302free(istate->alloc);1303 istate->alloc = NULL;1304 istate->initialized =0;13051306/* no need to throw away allocated active_cache */1307return0;1308}13091310intunmerged_index(const struct index_state *istate)1311{1312int i;1313for(i =0; i < istate->cache_nr; i++) {1314if(ce_stage(istate->cache[i]))1315return1;1316}1317return0;1318}13191320#define WRITE_BUFFER_SIZE 81921321static unsigned char write_buffer[WRITE_BUFFER_SIZE];1322static unsigned long write_buffer_len;13231324static intce_write_flush(git_SHA_CTX *context,int fd)1325{1326unsigned int buffered = write_buffer_len;1327if(buffered) {1328git_SHA1_Update(context, write_buffer, buffered);1329if(write_in_full(fd, write_buffer, buffered) != buffered)1330return-1;1331 write_buffer_len =0;1332}1333return0;1334}13351336static intce_write(git_SHA_CTX *context,int fd,void*data,unsigned int len)1337{1338while(len) {1339unsigned int buffered = write_buffer_len;1340unsigned int partial = WRITE_BUFFER_SIZE - buffered;1341if(partial > len)1342 partial = len;1343memcpy(write_buffer + buffered, data, partial);1344 buffered += partial;1345if(buffered == WRITE_BUFFER_SIZE) {1346 write_buffer_len = buffered;1347if(ce_write_flush(context, fd))1348return-1;1349 buffered =0;1350}1351 write_buffer_len = buffered;1352 len -= partial;1353 data = (char*) data + partial;1354}1355return0;1356}13571358static intwrite_index_ext_header(git_SHA_CTX *context,int fd,1359unsigned int ext,unsigned int sz)1360{1361 ext =htonl(ext);1362 sz =htonl(sz);1363return((ce_write(context, fd, &ext,4) <0) ||1364(ce_write(context, fd, &sz,4) <0)) ? -1:0;1365}13661367static intce_flush(git_SHA_CTX *context,int fd)1368{1369unsigned int left = write_buffer_len;13701371if(left) {1372 write_buffer_len =0;1373git_SHA1_Update(context, write_buffer, left);1374}13751376/* Flush first if not enough space for SHA1 signature */1377if(left +20> WRITE_BUFFER_SIZE) {1378if(write_in_full(fd, write_buffer, left) != left)1379return-1;1380 left =0;1381}13821383/* Append the SHA1 signature at the end */1384git_SHA1_Final(write_buffer + left, context);1385 left +=20;1386return(write_in_full(fd, write_buffer, left) != left) ? -1:0;1387}13881389static voidce_smudge_racily_clean_entry(struct cache_entry *ce)1390{1391/*1392 * The only thing we care about in this function is to smudge the1393 * falsely clean entry due to touch-update-touch race, so we leave1394 * everything else as they are. We are called for entries whose1395 * ce_mtime match the index file mtime.1396 *1397 * Note that this actually does not do much for gitlinks, for1398 * which ce_match_stat_basic() always goes to the actual1399 * contents. The caller checks with is_racy_timestamp() which1400 * always says "no" for gitlinks, so we are not called for them ;-)1401 */1402struct stat st;14031404if(lstat(ce->name, &st) <0)1405return;1406if(ce_match_stat_basic(ce, &st))1407return;1408if(ce_modified_check_fs(ce, &st)) {1409/* This is "racily clean"; smudge it. Note that this1410 * is a tricky code. At first glance, it may appear1411 * that it can break with this sequence:1412 *1413 * $ echo xyzzy >frotz1414 * $ git-update-index --add frotz1415 * $ : >frotz1416 * $ sleep 31417 * $ echo filfre >nitfol1418 * $ git-update-index --add nitfol1419 *1420 * but it does not. When the second update-index runs,1421 * it notices that the entry "frotz" has the same timestamp1422 * as index, and if we were to smudge it by resetting its1423 * size to zero here, then the object name recorded1424 * in index is the 6-byte file but the cached stat information1425 * becomes zero --- which would then match what we would1426 * obtain from the filesystem next time we stat("frotz").1427 *1428 * However, the second update-index, before calling1429 * this function, notices that the cached size is 61430 * bytes and what is on the filesystem is an empty1431 * file, and never calls us, so the cached size information1432 * for "frotz" stays 6 which does not match the filesystem.1433 */1434 ce->ce_size =0;1435}1436}14371438static intce_write_entry(git_SHA_CTX *c,int fd,struct cache_entry *ce)1439{1440int size =ondisk_ce_size(ce);1441struct ondisk_cache_entry *ondisk =xcalloc(1, size);1442char*name;14431444 ondisk->ctime.sec =htonl(ce->ce_ctime);1445 ondisk->ctime.nsec =0;1446 ondisk->mtime.sec =htonl(ce->ce_mtime);1447 ondisk->mtime.nsec =0;1448 ondisk->dev =htonl(ce->ce_dev);1449 ondisk->ino =htonl(ce->ce_ino);1450 ondisk->mode =htonl(ce->ce_mode);1451 ondisk->uid =htonl(ce->ce_uid);1452 ondisk->gid =htonl(ce->ce_gid);1453 ondisk->size =htonl(ce->ce_size);1454hashcpy(ondisk->sha1, ce->sha1);1455 ondisk->flags =htons(ce->ce_flags);1456if(ce->ce_flags & CE_EXTENDED) {1457struct ondisk_cache_entry_extended *ondisk2;1458 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;1459 ondisk2->flags2 =htons((ce->ce_flags & CE_EXTENDED_FLAGS) >>16);1460 name = ondisk2->name;1461}1462else1463 name = ondisk->name;1464memcpy(name, ce->name,ce_namelen(ce));14651466returnce_write(c, fd, ondisk, size);1467}14681469intwrite_index(const struct index_state *istate,int newfd)1470{1471 git_SHA_CTX c;1472struct cache_header hdr;1473int i, err, removed, extended;1474struct cache_entry **cache = istate->cache;1475int entries = istate->cache_nr;14761477for(i = removed = extended =0; i < entries; i++) {1478if(cache[i]->ce_flags & CE_REMOVE)1479 removed++;14801481/* reduce extended entries if possible */1482 cache[i]->ce_flags &= ~CE_EXTENDED;1483if(cache[i]->ce_flags & CE_EXTENDED_FLAGS) {1484 extended++;1485 cache[i]->ce_flags |= CE_EXTENDED;1486}1487}14881489 hdr.hdr_signature =htonl(CACHE_SIGNATURE);1490/* for extended format, increase version so older git won't try to read it */1491 hdr.hdr_version =htonl(extended ?3:2);1492 hdr.hdr_entries =htonl(entries - removed);14931494git_SHA1_Init(&c);1495if(ce_write(&c, newfd, &hdr,sizeof(hdr)) <0)1496return-1;14971498for(i =0; i < entries; i++) {1499struct cache_entry *ce = cache[i];1500if(ce->ce_flags & CE_REMOVE)1501continue;1502if(!ce_uptodate(ce) &&is_racy_timestamp(istate, ce))1503ce_smudge_racily_clean_entry(ce);1504if(ce_write_entry(&c, newfd, ce) <0)1505return-1;1506}15071508/* Write extension data here */1509if(istate->cache_tree) {1510struct strbuf sb = STRBUF_INIT;15111512cache_tree_write(&sb, istate->cache_tree);1513 err =write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) <01514||ce_write(&c, newfd, sb.buf, sb.len) <0;1515strbuf_release(&sb);1516if(err)1517return-1;1518}1519returnce_flush(&c, newfd);1520}15211522/*1523 * Read the index file that is potentially unmerged into given1524 * index_state, dropping any unmerged entries. Returns true if1525 * the index is unmerged. Callers who want to refuse to work1526 * from an unmerged state can call this and check its return value,1527 * instead of calling read_cache().1528 */1529intread_index_unmerged(struct index_state *istate)1530{1531int i;1532int unmerged =0;15331534read_index(istate);1535for(i =0; i < istate->cache_nr; i++) {1536struct cache_entry *ce = istate->cache[i];1537struct cache_entry *new_ce;1538int size, len;15391540if(!ce_stage(ce))1541continue;1542 unmerged =1;1543 len =strlen(ce->name);1544 size =cache_entry_size(len);1545 new_ce =xcalloc(1, size);1546hashcpy(new_ce->sha1, ce->sha1);1547memcpy(new_ce->name, ce->name, len);1548 new_ce->ce_flags =create_ce_flags(len,0);1549 new_ce->ce_mode = ce->ce_mode;1550if(add_index_entry(istate, new_ce,0))1551returnerror("%s: cannot drop to stage #0",1552 ce->name);1553 i =index_name_pos(istate, new_ce->name, len);1554}1555return unmerged;1556}15571558struct update_callback_data1559{1560int flags;1561int add_errors;1562};15631564static voidupdate_callback(struct diff_queue_struct *q,1565struct diff_options *opt,void*cbdata)1566{1567int i;1568struct update_callback_data *data = cbdata;15691570for(i =0; i < q->nr; i++) {1571struct diff_filepair *p = q->queue[i];1572const char*path = p->one->path;1573switch(p->status) {1574default:1575die("unexpected diff status%c", p->status);1576case DIFF_STATUS_UNMERGED:1577case DIFF_STATUS_MODIFIED:1578case DIFF_STATUS_TYPE_CHANGED:1579if(add_file_to_index(&the_index, path, data->flags)) {1580if(!(data->flags & ADD_CACHE_IGNORE_ERRORS))1581die("updating files failed");1582 data->add_errors++;1583}1584break;1585case DIFF_STATUS_DELETED:1586if(data->flags & ADD_CACHE_IGNORE_REMOVAL)1587break;1588if(!(data->flags & ADD_CACHE_PRETEND))1589remove_file_from_index(&the_index, path);1590if(data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))1591printf("remove '%s'\n", path);1592break;1593}1594}1595}15961597intadd_files_to_cache(const char*prefix,const char**pathspec,int flags)1598{1599struct update_callback_data data;1600struct rev_info rev;1601init_revisions(&rev, prefix);1602setup_revisions(0, NULL, &rev, NULL);1603 rev.prune_data = pathspec;1604 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;1605 rev.diffopt.format_callback = update_callback;1606 data.flags = flags;1607 data.add_errors =0;1608 rev.diffopt.format_callback_data = &data;1609run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);1610return!!data.add_errors;1611}16121613/*1614 * Returns 1 if the path is an "other" path with respect to1615 * the index; that is, the path is not mentioned in the index at all,1616 * either as a file, a directory with some files in the index,1617 * or as an unmerged entry.1618 *1619 * We helpfully remove a trailing "/" from directories so that1620 * the output of read_directory can be used as-is.1621 */1622intindex_name_is_other(const struct index_state *istate,const char*name,1623int namelen)1624{1625int pos;1626if(namelen && name[namelen -1] =='/')1627 namelen--;1628 pos =index_name_pos(istate, name, namelen);1629if(0<= pos)1630return0;/* exact match */1631 pos = -pos -1;1632if(pos < istate->cache_nr) {1633struct cache_entry *ce = istate->cache[pos];1634if(ce_namelen(ce) == namelen &&1635!memcmp(ce->name, name, namelen))1636return0;/* Yup, this one exists unmerged */1637}1638return1;1639}