- 22 Jan, 2014 2 commits
-
-
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.
Nicolas Hake committed -
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.
Nicolas Hake committed
-
- 21 Jan, 2014 1 commit
-
-
Merge improvements
Vicent Marti committed
-
- 20 Jan, 2014 14 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
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.
Edward Thomson committed -
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
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.
Edward Thomson committed -
"Uninitialized" submodules are "unmodified"
Vicent Marti committed -
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.
Edward Thomson committed -
git_reflog_entry_message can be null
Russell Belfer committed -
Fix a couple of corner cases and an undefined behavior
Russell Belfer committed -
Patrick Reynolds committed
-
Patrick Reynolds committed
-
Linquize committed
-
- 18 Jan, 2014 2 commits
-
-
Fix segfault when calling git_config_get_* functions when a config fails to load
Edward Thomson committed -
Reinitialize the result code of get_entry() to GIT_ENOTFOUND
Linquize committed
-
- 17 Jan, 2014 2 commits
-
-
Convert gitdir paths to posix on Windows
Edward Thomson committed -
Apparently, a .git file with "gitdir: path" link on Windows is allowed to use backslashes in the path. Who knew?
Russell Belfer committed
-
- 16 Jan, 2014 4 commits
-
-
Fix some documentation issues.
Vicent Marti committed -
Arthur Schreiber committed
-
Arthur Schreiber committed
-
Run Coverity scan on Travis
Ben Straub committed
-
- 15 Jan, 2014 9 commits
-
-
Update README to include Java, PowerShell bindings
Ben Straub committed -
Edward Thomson committed
-
Ben Straub committed
-
Ben Straub committed
-
refs: remove the _with_log differentiation
Vicent Marti committed -
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.
Carlos Martín Nieto committed -
Common
Vicent Marti committed -
Edward Thomson committed
-
Edward Thomson committed
-
- 14 Jan, 2014 6 commits
-
-
Align `*_dup` functions
Vicent Marti committed -
Implement @cmn's suggestions for `git_remote_dup`.
Vicent Marti committed -
Arthur Schreiber committed
-
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.
Arthur Schreiber committed -
Arthur Schreiber committed
-
Arthur Schreiber committed
-