summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix MAX 32 bit build problem described in libgit2/libgit2#2917ntk/macosx_build_cherrypickedJeff Hostetler2015-02-201-1/+1
* Merge pull request #2907 from jasonhaslam/git_packfile_unpack_raceCarlos Martín Nieto2015-02-201-2/+9
|\
| * Fix race in git_packfile_unpack.Jason Haslam2015-02-141-2/+9
* | Merge pull request #2911 from ethomson/streaming_filtersCarlos Martín Nieto2015-02-1920-171/+728
|\ \
| * | tests: separate INVASIVE filesystem testsEdward Thomson2015-02-194-3/+5
| * | filter: take `temp_buf` in `git_filter_options`Edward Thomson2015-02-193-13/+9
| * | filter: add `git_filter_list__load_ext`Edward Thomson2015-02-193-16/+32
| * | git_filter_opt_t -> git_filter_flag_tEdward Thomson2015-02-1911-27/+27
| * | buffer: introduce git_buf_attach_notownedEdward Thomson2015-02-196-37/+35
| * | checkout: let the stream writer close the fdEdward Thomson2015-02-181-2/+1
| * | filter streams: base -> parentEdward Thomson2015-02-182-12/+12
| * | git_writestream: from git_filter_streamEdward Thomson2015-02-186-51/+51
| * | filter: test a large file through the streamEdward Thomson2015-02-171-0/+221
| * | checkout: maintain temporary buffer for filtersEdward Thomson2015-02-173-12/+27
| * | checkout: stream the blob into the filtersEdward Thomson2015-02-172-39/+84
| * | filters: stream internallyEdward Thomson2015-02-171-73/+81
| * | filters: introduce streaming filtersEdward Thomson2015-02-174-7/+264
* | | Merge pull request #2820 from leoyanggit/mac_buildCarlos Martín Nieto2015-02-191-1/+2
|\ \ \ | |/ / |/| |
| * | Fix Mac build without OpenSSLLeo Yang2015-02-171-1/+2
| |/
* | Merge pull request #2909 from stewid/remove_extra_semicolonCarlos Martín Nieto2015-02-1622-24/+24
|\ \
| * | Remove extra semicolon outside of a functionStefan Widgren2015-02-1522-24/+24
|/ /
* | Merge pull request #2831 from ethomson/merge_lockCarlos Martín Nieto2015-02-1511-64/+332
|\ \
| * | indexwriter: an indexwriter for repo operationsEdward Thomson2015-02-146-92/+79
| * | merge-like operations: lock index while workingEdward Thomson2015-02-143-11/+67
| * | merge: lock the index at the start of the mergeEdward Thomson2015-02-142-2/+68
| * | checkout: introduce GIT_CHECKOUT_DONT_WRITE_INDEXEdward Thomson2015-02-143-2/+91
| * | git_indexwriter: lock then write the indexEdward Thomson2015-02-143-29/+100
| * | merge test: test an actual failure, not conflictEdward Thomson2015-02-131-6/+5
| |/
* | Merge pull request #2895 from ethomson/alloc_overflowCarlos Martín Nieto2015-02-1557-296/+888
|\ \
| * | pack-objects: unlock the cache on integer overflowEdward Thomson2015-02-131-4/+5
| * | buf test: cleanup memory leakEdward Thomson2015-02-131-0/+2
| * | integer overflow: use compiler intrinsics if supportedEdward Thomson2015-02-132-0/+20
| * | filebuf: use an int for return checkEdward Thomson2015-02-131-2/+2
| * | Make our overflow check look more like gcc/clang'sEdward Thomson2015-02-1336-347/+352
| * | Update `khash.h` to pull request 42Edward Thomson2015-02-124-5/+11
| * | khash: update to klib f28c067Edward Thomson2015-02-121-24/+33
| * | Introduce git__add_sizet_overflow and friendsEdward Thomson2015-02-124-32/+83
| * | p_read: ensure requested len is ssize_tEdward Thomson2015-02-123-1/+23
| * | Use `size_t` to hold size of arraysEdward Thomson2015-02-124-14/+30
| * | overflow checking: don't make callers set oomEdward Thomson2015-02-1212-43/+36
| * | git_buf_grow_by: increase buf asize incrementallyEdward Thomson2015-02-127-15/+62
| * | git__*allocarray: safer realloc and mallocEdward Thomson2015-02-127-23/+32
| * | odb__hashlink: check st.st_size before castingEdward Thomson2015-02-121-9/+9
| * | allocations: test for overflow of requested sizeEdward Thomson2015-02-1248-117/+528
* | | Merge pull request #2903 from ethomson/rebaseCarlos Martín Nieto2015-02-154-20/+108
|\ \ \ | |_|/ |/| |
| * | rebase: `CHECKOUT_SAFE` instead of `FORCE`Edward Thomson2015-02-131-8/+12
| * | rebase: allow `NULL` branch to indicate `HEAD`Edward Thomson2015-02-133-3/+67
| * | rebase: provide NULL `exec` on non-EXEC operationsEdward Thomson2015-02-132-9/+29
|/ /
* | Merge pull request #2901 from ethomson/win32_mode_bitsCarlos Martín Nieto2015-02-131-3/+11
|\ \
| * | win32: limit the mode to `_wopen`/`_waccess`Edward Thomson2015-02-131-3/+11
|/ /
View Lorry Controller Status