summaryrefslogtreecommitdiffstats
path: root/read-cache.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/cocci'Junio C Hamano2018-09-171-6/+6
|\
| * read-cache: use oideq() in ce_compare functionsJeff King2018-08-291-2/+2
| * convert "hashcmp() != 0" to "!hasheq()"Jeff King2018-08-291-2/+2
| * convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-1/+1
| * convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-1/+1
* | Merge branch 'nd/unpack-trees-with-cache-tree'Junio C Hamano2018-09-171-5/+11
|\ \ | |/ |/|
| * cache-tree: verify valid cache-tree in the test suiteNguyễn Thái Ngọc Duy2018-08-181-0/+3
| * unpack-trees: reuse (still valid) cache-tree from src_indexNguyễn Thái Ngọc Duy2018-08-181-0/+2
| * trace.h: support nested performance tracingNguyễn Thái Ngọc Duy2018-08-181-5/+6
* | Merge branch 'nd/no-the-index'Junio C Hamano2018-08-201-1/+1
|\ \ | |/ |/|
| * dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy2018-08-131-1/+1
* | Merge branch 'en/abort-df-conflict-fixes'Junio C Hamano2018-08-171-5/+8
|\ \ | |/ |/|
| * read-cache: fix directory/file conflict handling in read_index_unmerged()Elijah Newren2018-07-311-5/+8
* | Merge branch 'en/dirty-merge-fixes'Junio C Hamano2018-08-031-0/+40
|\ \
| * | merge-recursive: fix assumption that head tree being merged is HEADElijah Newren2018-07-111-4/+8
| * | index_has_changes(): avoid assuming operating on the_indexElijah Newren2018-07-031-4/+7
| * | read-cache.c: move index_has_changes() from merge.cElijah Newren2018-07-031-0/+33
* | | Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano2018-08-031-46/+218
|\ \ \
| * | | block alloc: add validations around cache_entry lifecyleJameson Miller2018-07-031-2/+53
| * | | block alloc: allocate cache entries from mem_poolJameson Miller2018-07-031-19/+100
| * | | block alloc: add lifecycle APIs for cache_entry structsJameson Miller2018-07-031-28/+65
| * | | read-cache: teach make_cache_entry to take object_idJameson Miller2018-07-031-3/+5
| * | | read-cache: teach refresh_cache_entry to take istateJameson Miller2018-07-031-4/+5
| | |/ | |/|
* | | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-0/+1
|\ \ \ | |/ / |/| |
| * | object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-17/+17
|\ \ \
| * | | Update struct index_state to use struct object_idbrian m. carlson2018-05-021-8/+8
| * | | split-index: convert struct split_index to object_idbrian m. carlson2018-05-021-11/+11
| |/ /
* | | Sync with Git 2.17.1Junio C Hamano2018-05-291-13/+38
|\ \ \ | | |/ | |/|
| * | Sync with Git 2.16.4Junio C Hamano2018-05-221-13/+38
| |\ \
| | * \ Sync with Git 2.15.2Junio C Hamano2018-05-221-13/+38
| | |\ \
| | | * \ Sync with Git 2.14.4Junio C Hamano2018-05-221-13/+38
| | | |\ \
| | | | * \ Sync with Git 2.13.7Junio C Hamano2018-05-221-13/+38
| | | | |\ \
| | | | | * | verify_path: disallow symlinks in .gitmodulesJeff King2018-05-221-9/+31
| | | | | * | verify_dotfile: mention case-insensitivity in commentJeff King2018-05-221-1/+4
| | | | | * | verify_path: drop clever fallthroughJeff King2018-05-221-4/+4
| | * | | | | Merge branch 'nd/shared-index-fix' into maintJunio C Hamano2018-03-221-18/+22
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'tg/split-index-fixes' into maintJunio C Hamano2018-03-221-11/+14
| | |\ \ \ \ \ \
* | | | | | | | | read-cache.c: make $GIT_TEST_SPLIT_INDEX booleanNguyễn Thái Ngọc Duy2018-04-161-2/+2
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2018-04-101-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-2/+2
* | | | | | | | Merge branch 'rj/warning-uninitialized-fix'Junio C Hamano2018-03-211-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | read-cache: fix an -Wmaybe-uninitialized warningRamsay Jones2018-03-201-2/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bp/refresh-cache-ent-rehash-fix'Junio C Hamano2018-03-211-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bugs preventing adding updated cache entries to the name hashBen Peart2018-03-151-1/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'ma/skip-writing-unchanged-index'Junio C Hamano2018-03-211-0/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | write_locked_index(): add flag to avoid writing unchanged indexMartin Ågren2018-03-011-0/+6
* | | | | | | | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-20/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | read-cache: rename 'new' variablesBrandon Williams2018-02-221-20/+20
| |/ / / / / /
* | | | | | | Merge branch 'bc/hash-algo'Junio C Hamano2018-02-151-29/+29
|\ \ \ \ \ \ \