summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
* unpack-trees: fix oneway_merge accidentally carry over stage indexNguyễn Thái Ngọc Duy2019-03-211-1/+1
* Merge branch 'tg/checkout-no-overlay'Junio C Hamano2019-03-071-20/+1
|\
| * read-cache: add invalidate parameter to remove_marked_cache_entriesThomas Gummerer2019-01-021-1/+1
| * entry: factor out unlink_entry functionThomas Gummerer2019-01-021-19/+0
* | Merge branch 'nd/the-index-final'Junio C Hamano2019-02-061-1/+0
|\ \
| * | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-1/+0
* | | Merge branch 'bc/tree-walk-oid'Junio C Hamano2019-01-291-3/+3
|\ \ \
| * | | tree-walk: store object_id in a separate memberbrian m. carlson2019-01-151-3/+3
| |/ /
* | | Merge branch 'nd/checkout-noisy'Junio C Hamano2019-01-141-3/+3
|\ \ \
| * | | checkout: print something when checking out pathsNguyễn Thái Ngọc Duy2018-11-141-3/+3
| | |/ | |/|
* | | Merge branch 'nd/attr-pathspec-in-tree-walk'Junio C Hamano2019-01-141-3/+3
|\ \ \ | |_|/ |/| |
| * | tree-walk.c: make tree_entry_interesting() take an indexNguyễn Thái Ngọc Duy2018-11-191-3/+3
| |/
* | cache-tree.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+1
|/
* unpack-trees: avoid dead store for struct progressCarlo Marcelo Arenas Belón2018-10-191-1/+1
* Merge branch 'jt/lazy-object-fetch-fix'Junio C Hamano2018-09-241-1/+1
|\
| * fetch-object: unify fetch_object[s] functionsJonathan Tan2018-09-131-1/+1
* | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-3/+3
|\ \
| * | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-3/+3
| |/
* | Merge branch 'nd/unpack-trees-with-cache-tree'Junio C Hamano2018-09-171-2/+152
|\ \
| * | Document update for nd/unpack-trees-with-cache-treeNguyễn Thái Ngọc Duy2018-08-271-2/+2
| * | cache-tree: verify valid cache-tree in the test suiteNguyễn Thái Ngọc Duy2018-08-181-0/+2
| * | unpack-trees: add missing cache invalidationNguyễ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-1/+1
| * | unpack-trees: reduce malloc in cache-tree walkNguyễn Thái Ngọc Duy2018-08-181-9/+20
| * | unpack-trees: optimize walking same trees with cache-treeNguyễn Thái Ngọc Duy2018-08-181-0/+127
| * | unpack-trees: add performance tracingNguyễn Thái Ngọc Duy2018-08-181-1/+8
* | | Merge branch 'nd/clone-case-smashing-warning'Junio C Hamano2018-09-171-0/+47
|\ \ \ | |_|/ |/| |
| * | clone: report duplicate entries on case-insensitive filesystemsDuy Nguyen2018-08-171-0/+47
* | | attr: remove index from git_attr_set_direction()Nguyễn Thái Ngọc Duy2018-08-131-2/+2
* | | unpack-trees: avoid the_index in verify_absent()Nguyễn Thái Ngọc Duy2018-08-131-2/+2
* | | unpack-trees: convert clear_ce_flags* to avoid the_indexNguyễn Thái Ngọc Duy2018-08-131-13/+18
* | | unpack-trees: don't shadow global var the_indexNguyễn Thái Ngọc Duy2018-08-131-5/+4
* | | unpack-trees: add a note about path invalidationNguyễn Thái Ngọc Duy2018-08-131-0/+11
| |/ |/|
* | Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano2018-08-021-17/+23
|\ \ | |/ |/|
| * block alloc: allocate cache entries from mem_poolJameson Miller2018-07-031-11/+2
| * block alloc: add lifecycle APIs for cache_entry structsJameson Miller2018-07-031-10/+25
* | Merge branch 'mk/merge-in-sparse-checkout'Junio C Hamano2018-07-241-1/+1
|\ \
| * | unpack-trees: do not fail reset because of unmerged skipped entryMax Kirillov2018-07-111-1/+1
| |/
* | 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 'ma/unpack-trees-free-msgs'Junio C Hamano2018-05-301-3/+14
|\ \
| * | unpack_trees_options: free messages when doneMartin Ågren2018-05-221-3/+14
* | | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-1/+1
|\ \ \
| * | | Update struct index_state to use struct object_idbrian m. carlson2018-05-021-1/+1
| | |/ | |/|
* | | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-1/+1
|\ \ \
| * | | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-1/+1
| |/ /
* | | Merge branch 'en/unpack-trees-split-index-fix'Junio C Hamano2018-05-231-4/+15
|\ \ \
| * | | unpack_trees: fix breakage when o->src_index != o->dst_indexElijah Newren2018-05-021-4/+15
* | | | Merge branch 'en/rename-directory-detection-reboot'Junio C Hamano2018-05-231-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-05-081-2/+2
| | |/ | |/|