summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jt/commit-graph-per-object-store'Junio C Hamano2018-08-021-1/+0
|\
| * commit-graph: add repo arg to graph readersJonathan Tan2018-07-171-1/+0
| * Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-118/+1
| |\
* | \ Merge branch 'en/dirty-merge-fixes'Junio C Hamano2018-08-021-6/+10
|\ \ \
| * | | merge-recursive: fix assumption that head tree being merged is HEADElijah Newren2018-07-111-4/+7
| * | | index_has_changes(): avoid assuming operating on the_indexElijah Newren2018-07-031-5/+6
* | | | Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano2018-08-021-2/+62
|\ \ \ \
| * | | | block alloc: add validations around cache_entry lifecyleJameson Miller2018-07-031-0/+6
| * | | | block alloc: allocate cache entries from mem_poolJameson Miller2018-07-031-0/+21
| * | | | block alloc: add lifecycle APIs for cache_entry structsJameson Miller2018-07-031-6/+34
| * | | | read-cache: teach make_cache_entry to take object_idJameson Miller2018-07-031-1/+6
| * | | | read-cache: teach refresh_cache_entry to take istateJameson Miller2018-07-031-1/+1
* | | | | Merge branch 'bc/object-id'Junio C Hamano2018-08-021-3/+3
|\ \ \ \ \
| * | | | | cache: update object ID functions for the_hash_algobrian m. carlson2018-07-161-3/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-118/+1
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | cache: convert get_graft_file to handle arbitrary repositoriesStefan Beller2018-05-181-1/+1
| * | | object-store: move object access functions to object-store.hStefan Beller2018-05-161-117/+0
* | | | Merge branch 'sb/object-store-alloc'Junio C Hamano2018-06-251-9/+0
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | alloc: allow arbitrary repositories for alloc functionsStefan Beller2018-05-161-16/+0
| * | alloc: add repository argument to alloc_commit_indexStefan Beller2018-05-091-1/+2
| * | alloc: add repository argument to alloc_reportStefan Beller2018-05-091-1/+2
| * | alloc: add repository argument to alloc_object_nodeStefan Beller2018-05-091-1/+2
| * | alloc: add repository argument to alloc_tag_nodeStefan Beller2018-05-091-1/+2
| * | alloc: add repository argument to alloc_commit_nodeStefan Beller2018-05-091-1/+2
| * | alloc: add repository argument to alloc_tree_nodeStefan Beller2018-05-091-1/+2
| * | alloc: add repository argument to alloc_blob_nodeStefan Beller2018-05-091-1/+2
* | | Merge branch 'nd/command-list'Junio C Hamano2018-06-011-5/+0
|\ \ \
| * | | Move declaration for alias.c to alias.hNguyễn Thái Ngọc Duy2018-05-211-5/+0
* | | | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-19/+9
|\ \ \ \
| * | | | sha1_file: only expose empty object constants through git_hash_algobrian m. carlson2018-05-021-16/+0
| * | | | sha1-file: add functions for hex empty tree and blob OIDsbrian m. carlson2018-05-021-0/+3
| * | | | Update struct index_state to use struct object_idbrian m. carlson2018-05-021-1/+1
| * | | | sha1-file: convert freshen functions to object_idbrian m. carlson2018-05-021-1/+1
| * | | | packfile: remove unused member from struct pack_entrybrian m. carlson2018-05-021-1/+0
| * | | | Remove unused member in struct object_contextbrian m. carlson2018-05-021-1/+0
| * | | | cache: add a function to read an object ID from a bufferbrian m. carlson2018-05-021-0/+5
| |/ / /
* | | | Sync with Git 2.17.1Junio C Hamano2018-05-291-2/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | Sync with Git 2.16.4Junio C Hamano2018-05-221-2/+10
| |\ \ \
| | * \ \ Sync with Git 2.15.2Junio C Hamano2018-05-221-2/+10
| | |\ \ \
| | | * \ \ Sync with Git 2.14.4Junio C Hamano2018-05-221-2/+10
| | | |\ \ \
| | | | * \ \ Sync with Git 2.13.7Junio C Hamano2018-05-221-2/+10
| | | | |\ \ \
| | | | | * | | verify_path: disallow symlinks in .gitmodulesJeff King2018-05-211-1/+1
| | | | | * | | is_ntfs_dotgit: match other .git filesJohannes Schindelin2018-05-211-1/+9
| | * | | | | | Merge branch 'tg/split-index-fixes' into maintJunio C Hamano2018-03-221-3/+5
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge branch 'nd/pack-objects-pack-struct'Junio C Hamano2018-05-231-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pack-objects: turn type and in_pack_type to bitfieldsNguyễn Thái Ngọc Duy2018-04-161-0/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/oid-object-info'Junio C Hamano2018-05-231-2/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | cache.h: allow oid_object_info to handle arbitrary repositoriesStefan Beller2018-04-261-5/+4
| * | | | | | | | cache.h: add repository argument to oid_object_infoStefan Beller2018-04-261-1/+2
| * | | | | | | | cache.h: add repository argument to oid_object_info_extendedStefan Beller2018-04-261-1/+4