summaryrefslogtreecommitdiff
path: root/builtin/index-pack.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/finalize-temp-file'Junio C Hamano2015-08-191-2/+2
|\
| * sha1_file.c: rename move_temp_to_file() to finalize_object_file()jc/finalize-temp-fileJunio C Hamano2015-08-101-2/+2
* | Merge branch 'js/fsck-opt'Junio C Hamano2015-08-031-4/+9
|\ \
| * | fsck (receive-pack): allow demoting errors to warningsJohannes Schindelin2015-06-231-0/+4
| * | fsck: introduce fsck optionsJohannes Schindelin2015-06-221-4/+5
* | | Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'Junio C Hamano2015-07-091-8/+8
|\ \ \
| * | | index-pack: fix allocation of sorted_by_pos arrayjc/fix-alloc-sortbuf-in-index-packJunio C Hamano2015-07-041-8/+8
* | | | Merge branch 'jk/index-pack-reduce-recheck'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | index-pack: avoid excessive re-reading of pack directoryjk/index-pack-reduce-recheckJeff King2015-06-091-1/+1
| | |/ | |/|
* | | Merge branch 'nd/slim-index-pack-memory-usage'Junio C Hamano2015-06-161-2/+6
|\ \ \
| * | | index-pack: fix truncation of off_t in comparisonnd/slim-index-pack-memory-usageJeff King2015-06-041-2/+6
| | |/ | |/|
* | | Merge branch 'nd/slim-index-pack-memory-usage'Junio C Hamano2015-05-111-111/+179
|\ \ \ | |/ /
| * | index-pack: kill union delta_base to save memoryNguyễn Thái Ngọc Duy2015-04-181-100/+160
| * | index-pack: reduce object_entry size to save memoryNguyễn Thái Ngọc Duy2015-02-271-11/+19
* | | Merge branch 'rs/deflate-init-cleanup'Junio C Hamano2015-03-171-1/+0
|\ \ \ | |/ / |/| |
| * | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}rs/deflate-init-cleanupRené Scharfe2015-03-051-1/+0
| |/
* | Merge branch 'js/fsck-tag-validation'Junio C Hamano2014-12-221-2/+2
|\ \
| * | index-pack: terminate object buffers with NULjs/fsck-tag-validationDuy Nguyen2014-12-091-2/+2
* | | index-pack: fix compilation with NO_PTHREADSEtienne Buira2014-10-131-0/+3
* | | Merge branch 'rs/realloc-array'Junio C Hamano2014-09-261-3/+1
|\ \ \
| * | | use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-arrayRené Scharfe2014-09-181-3/+1
* | | | Merge branch 'js/fsck-tag-validation'Junio C Hamano2014-09-261-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | fsck_object(): allow passing object data separately from the object itselfJohannes Schindelin2014-09-101-1/+2
| |/ /
* | | Merge branch 'jk/index-pack-threading-races'Junio C Hamano2014-09-191-2/+31
|\ \ \ | |/ / |/| |
| * | index-pack: fix race condition with duplicate basesjk/index-pack-threading-racesJeff King2014-08-291-2/+31
* | | Merge branch 'maint'Junio C Hamano2014-07-211-2/+1
|\ \ \ | | |/ | |/|
| * | use xcalloc() to allocate zero-initialized memoryRené Scharfe2014-07-211-2/+1
| * | Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-161-1/+2
| |\ \
* | \ \ Merge branch 'jk/strip-suffix'Junio C Hamano2014-07-161-15/+14
|\ \ \ \
| * | | | index-pack: use strip_suffix to avoid magic numbersJeff King2014-06-301-15/+14
| * | | | replace has_extension with ends_withJeff King2014-06-301-2/+2
| |/ / /
| * | | Merge branch 'ym/fix-opportunistic-index-update-race' into maintJunio C Hamano2014-06-251-1/+1
| |\ \ \
| * \ \ \ Merge branch 'jk/index-pack-report-missing' into maintJunio C Hamano2014-06-251-2/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/index-pack-one-fd-per-thread' into maintJunio C Hamano2014-06-251-10/+17
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-021-1/+2
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | commit: record buffer length in cacheJeff King2014-06-131-1/+1
| * | | | | | provide a helper to free commit bufferJeff King2014-06-131-1/+2
| |/ / / / /
* | | | | | Merge branch 'jk/index-pack-report-missing'Junio C Hamano2014-06-061-2/+7
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | index-pack: distinguish missing objects from type errorsjk/index-pack-report-missingJeff King2014-05-121-2/+7
| * | | | | Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-031-2/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'nd/index-pack-one-fd-per-thread'Junio C Hamano2014-06-031-10/+17
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | index-pack: work around thread-unsafe pread()nd/index-pack-one-fd-per-threadNguyễn Thái Ngọc Duy2014-04-161-10/+17
| |/ / / / /
* | | | | | Merge branch 'ym/fix-opportunistic-index-update-race'Junio C Hamano2014-06-031-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | wrapper.c: add xpread() similar to xread()Yiannis Marangos2014-04-101-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'nd/index-pack-error-message'Junio C Hamano2014-03-251-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | index-pack: report error using the correct variablend/index-pack-error-messageJunio C Hamano2014-03-171-2/+2
| |/ /
* | | rename read_replace_refs to check_replace_refsMichael Haggerty2014-02-201-1/+1
| |/ |/|
* | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-4/+4
|/
* Merge branch 'jk/free-tree-buffer'Junio C Hamano2013-09-171-0/+1
|\
| * clear parsed flag when we free tree buffersjk/free-tree-bufferJeff King2013-06-061-0/+1