summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | Drop git_patch_to_strNicolas Hake2014-01-229-118/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's hard or even impossible to correctly free the string buffer allocated by git_patch_to_str in some circumstances. Drop the function so people have to use git_patch_to_buf instead - git_buf has a dedicated destructor.
| | * | | | | | | Expose patch serialization to git_bufNicolas Hake2014-01-222-2/+20
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returning library-allocated strings from libgit2 works fine on Linux, but may cause problems on Windows because there is no one C Runtime that everything links against. With libgit2 not exposing its own allocator, freeing the string is a gamble. git_patch_to_str already serializes to a buffer, then returns the underlying memory. Expose the functionality directly, so callers can use the git_buf_free function to free the memory later.
| * | | | | | | Merge pull request #2061 from ethomson/merge_improvementsVicent Marti2014-01-2090-247/+836
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge improvements
| | * | | | | | | Merge submodulesEdward Thomson2014-01-2048-6/+174
| | | | | | | | |
| | * | | | | | | Support union mergesEdward Thomson2014-01-203-0/+48
| | | | | | | | |
| | * | | | | | | Remove the "merge none" flagEdward Thomson2014-01-205-217/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.
| | * | | | | | | Load merge.conflictstyle setting from configEdward Thomson2014-01-202-0/+109
| | | | | | | | |
| | * | | | | | | Introduce diff3 mode for checking out conflictsEdward Thomson2014-01-206-7/+90
| | | | | | | | |
| | * | | | | | | Don't try to merge binary filesEdward Thomson2014-01-2013-2/+130
| | | | | | | | |
| | * | | | | | | merge_file should use more aggressive levelsEdward Thomson2014-01-2033-33/+264
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem.
| * | | | | | | Merge pull request #2065 from ethomson/submodule_unmodifiedVicent Marti2014-01-202-1/+19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | "Uninitialized" submodules are "unmodified"
| | * | | | | | | "Uninitialized" submodules are "unmodified"Edward Thomson2014-01-202-1/+19
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the "unmodified" submodule workdir test to include uninitialized submodules, to prevent reporting submodules as modified when they're not in the workdir at all.
| * | | | | | | Merge pull request #2063 from linquize/reflog-msg-nullRussell Belfer2014-01-201-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | git_reflog_entry_message can be null
| | * | | | | | | git_reflog_entry_message can be nullLinquize2014-01-201-0/+2
| | |/ / / / / /
| * | | | | | | Merge pull request #2064 from piki/piki/buffer-corner-casesRussell Belfer2014-01-202-3/+37
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Fix a couple of corner cases and an undefined behavior
| | * | | | | | add unit tests for git_buf_join corner casesPatrick Reynolds2014-01-201-0/+31
| | | | | | | |
| | * | | | | | fix corner cases and an undefined behaviorPatrick Reynolds2014-01-201-3/+6
| |/ / / / / /
| * | | | | | Merge pull request #2059 from linquize/git_config_get_crashEdward Thomson2014-01-181-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix segfault when calling git_config_get_* functions when a config fails to load
| | * | | | | | Fix segfault when calling git_config_get_* functions when a config fails to loadLinquize2014-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reinitialize the result code of get_entry() to GIT_ENOTFOUND
| * | | | | | | Merge pull request #2058 from libgit2/rb/gitdir-windows-pathsEdward Thomson2014-01-171-1/+5
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Convert gitdir paths to posix on Windows
| | * | | | | | Convert gitdir paths to posix on WindowsRussell Belfer2014-01-171-1/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently, a .git file with "gitdir: path" link on Windows is allowed to use backslashes in the path. Who knew?
| * | | | | | Merge pull request #2055 from arthurschreiber/patch-3Vicent Marti2014-01-161-6/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix some documentation issues.
| | * | | | | | Revert a wrong doc change.Arthur Schreiber2014-01-161-1/+1
| | | | | | | |
| | * | | | | | Fix some documentation issues.Arthur Schreiber2014-01-161-6/+6
| |/ / / / / /
| * | | | | | Merge pull request #2044 from libgit2/coverityBen Straub2014-01-164-0/+72
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Run Coverity scan on Travis
| | * | | | | | Refine build limitationBen Straub2014-01-151-2/+7
| | | | | | | |
| | * | | | | | Only run coverity on developmentBen Straub2014-01-151-0/+3
| | | | | | | |
| | * | | | | | Add coverity scan badge to readmeBen Straub2014-01-131-0/+1
| | | | | | | |
| | * | | | | | Tweak travis secure configBen Straub2014-01-131-1/+3
| | | | | | | |
| | * | | | | | Add coverity-scan scriptBen Straub2014-01-133-0/+61
| | | | | | | |
| * | | | | | | Merge pull request #2053 from ethomson/bindingsBen Straub2014-01-151-0/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update README to include Java, PowerShell bindings
| | * | | | | | | Update README to include Java, PowerShell bindingsEdward Thomson2014-01-151-0/+4
| |/ / / / / / /
| * | | | | | | Merge pull request #2050 from libgit2/cmn/always-reflog-messageVicent Marti2014-01-1540-271/+162
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | refs: remove the _with_log differentiation
| | * | | | | | | refs: remove the _with_log differentiationCarlos Martín Nieto2014-01-1540-271/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any well-behaved program should write a descriptive message to the reflog whenever it updates a reference. Let's make this more prominent by removing the version without the reflog parameters.
| * | | | | | | | Merge pull request #2049 from ethomson/commonVicent Marti2014-01-153-124/+134
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Common
| | * | | | | | | Move libgit2 settings out of utilEdward Thomson2014-01-142-123/+134
| | | | | | | | |
| | * | | | | | | unnecessary includeEdward Thomson2014-01-141-1/+0
| |/ / / / / / /
| * | | | | | | Merge pull request #2047 from arthurschreiber/arthur/fix-dup-functionsVicent Marti2014-01-146-32/+38
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Align `*_dup` functions
| | * | | | | | | Align git_tree_entry_dup.Arthur Schreiber2014-01-142-12/+12
| | | | | | | | |
| | * | | | | | | Align git_signature_dup.Arthur Schreiber2014-01-144-20/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes git_signature_dup to actually honor oom conditions raised by the call to git__strdup. It also aligns it with the error code return pattern used everywhere else.
| * | | | | | | | Merge pull request #2048 from arthurschreiber/arthur/add-git_remote_dupVicent Marti2014-01-141-3/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Implement @cmn's suggestions for `git_remote_dup`.
| | * | | | | | | We don't need memset here.Arthur Schreiber2014-01-141-2/+0
| | | | | | | | |
| | * | | | | | | Don't duplicate state that's only used when fetching.Arthur Schreiber2014-01-141-1/+0
| | | | | | | | |
| * | | | | | | | Merge pull request #2045 from arthurschreiber/arthur/add-git_remote_dupVicent Marti2014-01-143-0/+74
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | Add `git_remote_dup`.
| | * | | | | | | Add `git_remote_dup`.Arthur Schreiber2014-01-143-0/+74
| |/ / / / / / /
| * | | | | | | Merge pull request #2043 from arthurschreiber/arthur/fix-memory-leaksVicent Marti2014-01-145-10/+19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix a bunch of memory leaks.
| | * | | | | | | Incorporate @arrbee's suggestions.Arthur Schreiber2014-01-141-14/+12
| | | | | | | | |
| | * | | | | | | Incorporate @ethomson's suggestions.Arthur Schreiber2014-01-131-16/+15
| | | | | | | | |
| | * | | | | | | Fix a double free issue in `git_blame__alloc`.Arthur Schreiber2014-01-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `git_blame_free` already calls `git__free` on `gbr`.
| | * | | | | | | Fix a memory leak in `hash_and_save` and `inject_object`.Arthur Schreiber2014-01-131-4/+12
| | | | | | | | |
View Lorry Controller Status