Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/cocci' | Junio C Hamano | 2018-09-17 | 1 | -6/+6 |
|\ | |||||
| * | read-cache: use oideq() in ce_compare functions | Jeff King | 2018-08-29 | 1 | -2/+2 |
| * | convert "hashcmp() != 0" to "!hasheq()" | Jeff King | 2018-08-29 | 1 | -2/+2 |
| * | convert "oidcmp() != 0" to "!oideq()" | Jeff King | 2018-08-29 | 1 | -1/+1 |
| * | convert "oidcmp() == 0" to oideq() | Jeff King | 2018-08-29 | 1 | -1/+1 |
* | | Merge branch 'nd/unpack-trees-with-cache-tree' | Junio C Hamano | 2018-09-17 | 1 | -5/+11 |
|\ \ | |/ |/| | |||||
| * | cache-tree: verify valid cache-tree in the test suite | Nguyễn Thái Ngọc Duy | 2018-08-18 | 1 | -0/+3 |
| * | unpack-trees: reuse (still valid) cache-tree from src_index | Nguyễn Thái Ngọc Duy | 2018-08-18 | 1 | -0/+2 |
| * | trace.h: support nested performance tracing | Nguyễn Thái Ngọc Duy | 2018-08-18 | 1 | -5/+6 |
* | | Merge branch 'nd/no-the-index' | Junio C Hamano | 2018-08-20 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | dir.c: remove an implicit dependency on the_index in pathspec code | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -1/+1 |
* | | Merge branch 'en/abort-df-conflict-fixes' | Junio C Hamano | 2018-08-17 | 1 | -5/+8 |
|\ \ | |/ |/| | |||||
| * | read-cache: fix directory/file conflict handling in read_index_unmerged() | Elijah Newren | 2018-07-31 | 1 | -5/+8 |
* | | Merge branch 'en/dirty-merge-fixes' | Junio C Hamano | 2018-08-03 | 1 | -0/+40 |
|\ \ | |||||
| * | | merge-recursive: fix assumption that head tree being merged is HEAD | Elijah Newren | 2018-07-11 | 1 | -4/+8 |
| * | | index_has_changes(): avoid assuming operating on the_index | Elijah Newren | 2018-07-03 | 1 | -4/+7 |
| * | | read-cache.c: move index_has_changes() from merge.c | Elijah Newren | 2018-07-03 | 1 | -0/+33 |
* | | | Merge branch 'jm/cache-entry-from-mem-pool' | Junio C Hamano | 2018-08-03 | 1 | -46/+218 |
|\ \ \ | |||||
| * | | | block alloc: add validations around cache_entry lifecyle | Jameson Miller | 2018-07-03 | 1 | -2/+53 |
| * | | | block alloc: allocate cache entries from mem_pool | Jameson Miller | 2018-07-03 | 1 | -19/+100 |
| * | | | block alloc: add lifecycle APIs for cache_entry structs | Jameson Miller | 2018-07-03 | 1 | -28/+65 |
| * | | | read-cache: teach make_cache_entry to take object_id | Jameson Miller | 2018-07-03 | 1 | -3/+5 |
| * | | | read-cache: teach refresh_cache_entry to take istate | Jameson Miller | 2018-07-03 | 1 | -4/+5 |
| | |/ | |/| | |||||
* | | | Merge branch 'sb/object-store-grafts' | Junio C Hamano | 2018-07-18 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | object-store: move object access functions to object-store.h | Stefan Beller | 2018-05-16 | 1 | -0/+1 |
* | | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-05-30 | 1 | -17/+17 |
|\ \ \ | |||||
| * | | | Update struct index_state to use struct object_id | brian m. carlson | 2018-05-02 | 1 | -8/+8 |
| * | | | split-index: convert struct split_index to object_id | brian m. carlson | 2018-05-02 | 1 | -11/+11 |
| |/ / | |||||
* | | | Sync with Git 2.17.1 | Junio C Hamano | 2018-05-29 | 1 | -13/+38 |
|\ \ \ | | |/ | |/| | |||||
| * | | Sync with Git 2.16.4 | Junio C Hamano | 2018-05-22 | 1 | -13/+38 |
| |\ \ | |||||
| | * \ | Sync with Git 2.15.2 | Junio C Hamano | 2018-05-22 | 1 | -13/+38 |
| | |\ \ | |||||
| | | * \ | Sync with Git 2.14.4 | Junio C Hamano | 2018-05-22 | 1 | -13/+38 |
| | | |\ \ | |||||
| | | | * \ | Sync with Git 2.13.7 | Junio C Hamano | 2018-05-22 | 1 | -13/+38 |
| | | | |\ \ | |||||
| | | | | * | | verify_path: disallow symlinks in .gitmodules | Jeff King | 2018-05-22 | 1 | -9/+31 |
| | | | | * | | verify_dotfile: mention case-insensitivity in comment | Jeff King | 2018-05-22 | 1 | -1/+4 |
| | | | | * | | verify_path: drop clever fallthrough | Jeff King | 2018-05-22 | 1 | -4/+4 |
| | * | | | | | Merge branch 'nd/shared-index-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -18/+22 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'tg/split-index-fixes' into maint | Junio C Hamano | 2018-03-22 | 1 | -11/+14 |
| | |\ \ \ \ \ \ | |||||
* | | | | | | | | | read-cache.c: make $GIT_TEST_SPLIT_INDEX boolean | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -2/+2 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-04-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | sha1_file: convert read_sha1_file to struct object_id | brian m. carlson | 2018-03-14 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'rj/warning-uninitialized-fix' | Junio C Hamano | 2018-03-21 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | read-cache: fix an -Wmaybe-uninitialized warning | Ramsay Jones | 2018-03-20 | 1 | -2/+4 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'bp/refresh-cache-ent-rehash-fix' | Junio C Hamano | 2018-03-21 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix bugs preventing adding updated cache entries to the name hash | Ben Peart | 2018-03-15 | 1 | -1/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ma/skip-writing-unchanged-index' | Junio C Hamano | 2018-03-21 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | write_locked_index(): add flag to avoid writing unchanged index | Martin Ågren | 2018-03-01 | 1 | -0/+6 |
* | | | | | | | | Merge branch 'bw/c-plus-plus' | Junio C Hamano | 2018-03-06 | 1 | -20/+20 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | read-cache: rename 'new' variables | Brandon Williams | 2018-02-22 | 1 | -20/+20 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'bc/hash-algo' | Junio C Hamano | 2018-02-15 | 1 | -29/+29 |
|\ \ \ \ \ \ \ |