summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* merge: Fix memory leak in testvmg/redundantVicent Marti2015-11-021-0/+1
|
* Add test caseVicent Marti2015-11-028-0/+30
|
* merge-base: StyleVicent Marti2015-11-021-1/+6
|
* merge-base: Do not read parents from the rootVicent Marti2015-11-021-1/+1
|
* merge-base: Remove redundant merge basesVicent Marti2015-11-022-22/+166
|
* Merge pull request #3493 from ethomson/read_indexCarlos Martín Nieto2015-10-301-9/+29
|\ | | | | index: read_index must update hashes
| * index: read_index must update hashesEdward Thomson2015-10-301-9/+29
| |
* | git: put NULL check at the topCarlos Martín Nieto2015-10-301-2/+5
|/
* git: accept NULL as argument to its stream freeCarlos Martín Nieto2015-10-301-2/+2
|
* Merge pull request #3486 from srajko/reflog-segfault-fixCarlos Martín Nieto2015-10-292-1/+44
|\ | | | | Fix segfault when reading reflog with extra newlines
| * Prevent segfault when parsing a reflog with oid parse errorStjepan Rajko2015-10-292-1/+44
| | | | | | | | | | | | Using calloc instead of malloc because the parse error will lead to an immediate free of committer (and its properties, which can segfault on free if undefined - test_refs_reflog_reflog__reading_a_reflog_with_invalid_format_returns_error segfaulted before the fix). #3458
* | pool: fix documentationEdward Thomson2015-10-281-2/+2
| |
* | Merge pull request #3488 from libgit2/vmg/poolVicent Marti2015-10-2819-354/+102
|\ \ | | | | | | pool: Simplify implementation
| * | merge: Do not mallocz unecessary entriesvmg/poolVicent Marti2015-10-281-2/+2
| | |
| * | pool: update commentVicent Marti2015-10-281-1/+1
| | |
| * | pool: Dot not assume mallocs are zeroed outVicent Marti2015-10-284-24/+23
| | |
| * | pool: Handle 32 bit systemsVicent Marti2015-10-281-1/+1
| | |
| * | pool: Take into account malloc overhead & pool page sizeVicent Marti2015-10-281-1/+2
| | |
| * | repository: plug memory leakVicent Marti2015-10-281-0/+1
| | | | | | | | | | | | cc @carlosmn
| * | pool: Simplify implementationVicent Marti2015-10-2817-336/+83
|/ /
* | Merge pull request #3489 from libgit2/vmg/reuc-insertVicent Marti2015-10-283-49/+66
|\ \ | | | | | | Better REUC generation when merging
| * | merge: Plug memory leakvmg/reuc-insertVicent Marti2015-10-271-3/+3
| | |
| * | merge: Implement `GIT_MERGE_TREE_SKIP_REUC`Vicent Marti2015-10-272-28/+48
| | |
| * | reuc: Be smarter when inserting new REUC entriesVicent Marti2015-10-271-19/+16
|/ / | | | | | | | | | | | | | | | | | | Inserting new REUC entries can quickly become pathological given that each insert unsorts the REUC vector, and both subsequent lookups *and* insertions will require sorting it again before being successful. To avoid this, we're switching to `git_vector_insert_sorted`: this keeps the REUC vector constantly sorted and lets us use the `on_dup` callback to skip an extra binary search on each insertion.
* | Merge pull request #3485 from srajko/giterr_clear-typo-fixCarlos Martín Nieto2015-10-261-1/+1
|\ \ | |/ |/| Fix docs typo geterr_clear -> giterr_clear
| * Fix docs typo geterr_clear -> giterr_clearStjepan Rajko2015-10-261-1/+1
|/
* Merge pull request #3477 from linquize/inttypes.hEdward Thomson2015-10-231-1/+1
|\ | | | | inttypes.h is built-in header file since MSVC 2013
| * inttypes.h is built-in header file since MSVC 2013Linquize2015-10-221-1/+1
| | | | | | | | | | | | | | The reason is that the types defined in libgit2's inttypes.h collide with system inttypes.h 3rd party library header files may directly reference MSVC's built-in inttypes.h Fixes #3476
* | Merge pull request #3483 from ethomson/cmake_xcodeCarlos Martín Nieto2015-10-231-9/+9
|\ \ | | | | | | cmake: split sources into original paths for Xcode and MSVC
| * | cmake: split sources into original paths for Xcode and MSVCEdward Thomson2015-10-221-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | The MSVC_SPLIT_SOURCES function is helpful for other IDEs, like Xcode, and will split the source files up into their target directories, instead of merely placing them all in a "Sources" directory. Rename MSVC_SPLIT_SOURCES to IDE_SPLIT_SOURCES and enable it for Xcode.
* | | Merge pull request #3481 from ethomson/xdiff_includeCarlos Martín Nieto2015-10-231-1/+1
|\ \ \ | | | | | | | | xdiff: reference util.h in parent directory
| * | | xdiff: reference util.h in parent directoryEdward Thomson2015-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Although CMake will correctly configure include directories for us, some people may use their own build system, and we should reference `util.h` based on where it actually lives.
* | | | Merge pull request #3482 from ethomson/merge_fail_on_conflictVicent Marti2015-10-235-6/+38
|\ \ \ \ | |_|/ / |/| | | merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT
| * | | merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson2015-10-225-6/+38
|/ / / | | | | | | | | | | | | | | | Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT.
* | | Merge pull request #3480 from ethomson/nsecsCarlos Martín Nieto2015-10-2214-1/+96
|\ \ \ | |_|/ |/| | Nanoseconds in the index: ignore for diffing
| * | diff: ignore nsecs when diffingEdward Thomson2015-10-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Although our index contains the literal time present in the index, we do not read nanoseconds from disk, and thus we should not use them in any comparisons, lest we always think our working directory is dirty. Guard this behind a `GIT_USE_NSECS` for future improvement.
| * | index: test that we round-trip nsecsEdward Thomson2015-10-2213-0/+93
| |/ | | | | | | | | | | | | Test that nanoseconds are round-tripped correctly when we read an index file that contains them. We should, however, ignore them because we don't understand them, and any new entries in the index should contain a `0` nsecs field, while existing preserving entries.
* | Merge pull request #3475 from libgit2/cmn/programdata-configEdward Thomson2015-10-219-10/+123
|\ \ | | | | | | config: add a ProgramData level
| * | config: add a ProgramData levelcmn/programdata-configCarlos Martín Nieto2015-10-219-10/+123
| | | | | | | | | | | | | | | This is where portable git stores the global configuration which we can use to adhere to it even though git isn't quite installed on the system.
* | | Merge pull request #3479 from ethomson/cplusplusCarlos Martín Nieto2015-10-211-6/+8
|\ \ \ | |_|/ |/| | api: be explicit about our C linkage
| * | win32: add c linkage guard around inttypes.h inclusionEdward Thomson2015-10-211-6/+8
|/ /
* | Merge pull request #3478 from libgit2/vmg/crudVicent Marti2015-10-216-8/+30
|\ \ | |/ |/| signature: Strip crud
| * tests: Fix warningsvmg/crudVicent Marti2015-10-212-2/+3
| |
| * index: Remove unneeded constsVicent Marti2015-10-211-3/+3
| |
| * signature: Strip crud just like Git doesVicent Marti2015-10-213-3/+24
|/
* Merge pull request #3466 from libgit2/cmn/quick-parse-64Edward Thomson2015-10-153-4/+39
|\ | | | | revwalk: make commit list use 64 bits for time
| * revwalk: make commit list use 64 bits for timecmn/quick-parse-64Carlos Martín Nieto2015-10-143-4/+39
| | | | | | | | | | | | | | | | We moved the "main" parsing to use 64 bits for the timestamp, but the quick parsing for the revwalk did not. This means that for large timestamps we fail to parse the time and thus the walk. Move this parser to use 64 bits as well.
* | Merge pull request #3444 from ethomson/add_preserves_conflict_modeCarlos Martín Nieto2015-10-153-22/+171
|\ \ | | | | | | Preserve modes from a conflict in `git_index_insert`
| * | index: also try conflict mode when insertingEdward Thomson2015-09-303-23/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we do not trust the on-disk mode, we use the mode of an existing index entry. This allows us to preserve executable bits on platforms that do not honor them on the filesystem. If there is no stage 0 index entry, also look at conflicts to attempt to answer this question: prefer the data from the 'ours' side, then the 'theirs' side before falling back to the common ancestor.
| * | index: test that add_bypath preserves modeEdward Thomson2015-09-291-0/+23
| | |
View Lorry Controller Status