Log

Author Commit Date CI Message
Edward Thomson ae8f7260 2015-07-07T16:59:14 merge_files: don't add trailing newlines When invoked with three files that each lack a trailing newline, the merge result should also lack a trailing newline.
Edward Thomson 286befeb 2015-07-07T16:55:32 Merge pull request #3298 from ethomson/gitauthors meta: Add Antoine Pelisse to hall-of-fame list
Edward Thomson 01e031d9 2015-07-07T12:40:15 meta: Add Antoine Pelisse to hall-of-fame list Antoine Pelisse <apelisse@gmail.com> has kindly allowed his contributions to core git to be used under the libgit2 license.
Carlos Martín Nieto 3704ac35 2015-07-07T12:38:47 Merge pull request #3277 from git-up/git_diff_index_to_index Added git_diff_index_to_index()
Carlos Martín Nieto ea445e06 2015-07-07T00:48:17 Merge pull request #3288 from ethomson/getenv git__getenv: utf-8 aware env reader
Carlos Martín Nieto 3c831113 2015-07-06T19:04:48 Merge pull request #3202 from jeffhostetler/windows_stack_trace Stacktraces with CRTDBG memory leaks on Windows
Carlos Martín Nieto a0bdfe32 2015-07-06T18:42:39 travis: don't install CMake on OS X Homebrew will error out because it's already installed.
Carlos Martín Nieto d41b8ed0 2015-07-06T18:32:31 travis: update the homebrew db We need to make sure we are asking for the current version of packages, or we might get 404s from the download service.
Carlos Martín Nieto 159061a8 2015-07-06T16:23:44 Update CHANGELOG with the release number
Carlos Martín Nieto 4d6362b1 2015-07-03T16:29:32 Merge pull request #3290 from libgit2/cmn/filter-doc filter: add docs for streaming filters
Carlos Martín Nieto a94d3e68 2015-07-03T14:34:30 filter: add docs for streaming filters These functions are available on the public API but don't have any documentation, so they don't appear on the API reference. Fix that.
Carlos Martín Nieto 99090a85 2015-07-03T00:38:33 Merge pull request #3289 from ethomson/warnings4 iterator_walk: cast away constness for free
Edward Thomson e069c621 2015-07-02T09:25:48 git__getenv: utf-8 aware env reader Introduce `git__getenv` which is a UTF-8 aware `getenv` everywhere. Make `cl_getenv` use this to keep consistent memory handling around return values (free everywhere, as opposed to only some platforms).
Carlos Martín Nieto f034c851 2015-07-02T17:55:16 Merge pull request #3287 from ethomson/filter_test_cleanup filter::stream: free the filter sanely
Edward Thomson dd6b24b1 2015-07-02T10:36:15 iterator_walk: cast away constness for free
Edward Thomson 79306d8d 2015-07-02T10:18:40 filter::stream: free the filter sanely Don't use the filter's free callback to free the actual data structure holding the filter, as we may not always actually initialize it (the test may be skipped).
Carlos Martín Nieto eb94199f 2015-07-02T08:35:05 Merge pull request #3286 from libgit2/cmn/submodule-duplicate Correctly delimit the keys for submodule lookup
Carlos Martín Nieto e0af3cb3 2015-07-01T21:15:06 submodule: correctly delimit the keys to use for lookup The regex we use to look at the gitmodules file does not correctly delimit the name of submodule which we want to look up and puts '.*' straight after the name, maching on any submodule which has the seeked submodule as a prefix of its name. Add the missing '\.' in the regex so we want a full stop to exist both before and after the submodule name.
Carlos Martín Nieto e8e848a8 2015-07-01T21:10:40 submodule: add failing test for loading the wrong submodule When two submodules are fairly similar, we may end up loading the wrong one.
Edward Thomson bf7d2761 2015-07-01T12:02:27 Merge pull request #3280 from linquize/8.3 Fix 8.3 filename tests failure when 8.3 is disabled
Carlos Martín Nieto 34065968 2015-07-01T17:49:07 submodule: completely remove reload_all The function was removed, but its declaration and changelog entry about its removal were forgotten. The comment in the test doesn't make any sense as the function doesn't exist anymore, so get rid of it as well.
Linquize 526f91f5 2015-07-01T14:58:13 Fix 8.3 filename tests failure when 8.3 is disabled
Edward Thomson aa92c318 2015-06-30T17:38:22 Merge pull request #3278 from mplough/master Fix #3093 - remove declaration of unused function git_fetch__download…
Matthew Plough 9126ccac 2015-06-30T16:48:47 Fix #3093 - remove declaration of unused function git_fetch__download_pack Function was added in commit 2c982daa2eec64b80c7940bfe1142295bd72edd8 on October 5, 2011, and removed in commit 41fb1ca0ec51ad1d2a14b911aab3215e42965d1b on October 29, 2012. Given the length of time it's gone unused, it's safe to remove now.
Carlos Martín Nieto 2f60073d 2015-06-30T21:40:20 Merge pull request #3273 from ethomson/warnings3 More warnings
Edward Thomson cb58fb24 2015-06-30T13:39:07 Merge pull request #3275 from git-up/http_fix http: fixed leak when asking for credentials again
Pierre-Olivier Latour ccef5adb 2015-06-30T09:30:20 Added git_diff_index_to_index()
Pierre-Olivier Latour 1630981e 2015-06-30T09:03:23 http: fixed leak when asking for credentials again t->cred might have been allocated the previous time and needs to be freed before asking caller for credentials again.
Edward Thomson 69c8bf7e 2015-06-30T14:21:29 posix compat: include sys/stat.h for mingw
Edward Thomson 49840056 2015-06-30T14:20:31 diff: use size_t format
Edward Thomson eb29292a 2015-06-30T14:25:51 index tests: add eol to avoid compiler warning
Edward Thomson 504b0697 2015-06-30T14:25:00 checkout test: mark unused vars
Edward Thomson 0305721c 2015-06-30T14:23:41 winhttp: remove unused var
Edward Thomson 3451c871 2015-06-30T09:29:41 Merge pull request #3271 from jeffhostetler/more_leaks memory leak refspec.c
Jeff Hostetler 64e6b5b0 2015-06-29T17:32:22 fix memory leak in refspec.c on errors.
Carlos Martín Nieto 7bfdd1c2 2015-06-30T10:21:06 Merge pull request #3270 from ethomson/warnings2 Remove some warnings
Edward Thomson 64c415c2 2015-06-29T22:12:20 checkout test: check getcwd return value
Edward Thomson eadf3715 2015-06-29T22:10:45 clar: test chdir
Edward Thomson d88abb89 2015-06-29T21:54:06 filter test: pass base type
Edward Thomson d202bb7d 2015-06-29T21:48:35 examples: clean up some warnings
Edward Thomson e5f9df7b 2015-06-29T21:45:04 odb: cast to long long for printf
Edward Thomson 60655056 2015-06-29T21:37:07 submodule: cast enum to int for compare
Edward Thomson 3ca84ac0 2015-06-29T20:29:29 openssl: free hostname
Edward Thomson 0175971e 2015-06-29T15:21:22 stash: const up conflict params
Edward Thomson 2cf33fee 2015-06-29T15:20:34 index test: include repository.h for decl
Edward Thomson 149d5d8a 2015-06-29T15:17:58 stash: drop unused variable
Edward Thomson ded4ccab 2015-06-29T15:16:22 iterator_walk: drop unused variable
Jeff Hostetler 827b954e 2015-06-28T06:56:02 Reserve aux_id 0; sort leaks by aux_id. Fix cmp.
Jeff Hostetler 93b42728 2015-06-09T14:38:30 Include stacktrace summary in memory leak output.
Edward Thomson 4a0313bc 2015-06-29T15:22:47 Merge pull request #3269 from libgit2/cmn/release-fixups Submodule and http fixes
Carlos Martín Nieto 8b380060 2015-06-29T21:12:44 http: don't give up on auth on the first try When the server rejects an authentication request, ask the caller for the credentials again, instead of giving up on the first try.
Carlos Martín Nieto c28a5c97 2015-06-29T21:10:47 submodule: remove trailing slashes from submodule paths We allow looking up a submodule by path, but we lost the path normalisation during the recent changes. Bring it back.
Carlos Martín Nieto cf4030b0 2015-06-29T20:54:17 submodule: remove some obsolete logic Remove some of the logic that was left-over from the time we had a cache of submodules, plugging a leak of the submodule object in certain cases.
Carlos Martín Nieto ca2466ff 2015-06-29T15:02:19 CHANGELOG: add submodule changes
Vicent Marti b977d017 2015-06-29T12:27:09 Merge pull request #3268 from libgit2/vmg/pkg-config-sort pkg-config: Sort the different sections
Vicent Marti 6a5fb1f4 2015-06-29T12:20:01 pkg-config: Sort the different sections Because of the fact that pkg-config is pants-on-head retarded and that the Linux linker *requires* a static library to come before all its dynamic dependencies in the link path, calling `pkg-config --libs --static` was generating the wrong flags for linking. Before this patch: -Wl,-Bsymbolic-functions -Wl,-z,relro -L/usr/local/lib -lcurl -lssh2 -lrt -lgit2 -lssl -lcrypto -ldl -lz After this patch: -Wl,-Bsymbolic-functions -Wl,-z,relro -L/usr/local/lib -lgit2 -lcurl -lssh2 -lrt -lssl -lcrypto -ldl -lz By setting the "Libs" line before all other rules, we make sure that `-lgit2` is the first library in the link path and that it gets its symbols resolved with the libraries coming after it. This fix (ab)uses an implementation detail in `pkg-config` (namely, that flags are output as they are found on the file), but this detail seems to be stable between releases and always gives a stable output.
Carlos Martín Nieto 84d5a98f 2015-06-28T14:53:30 Bump version to 0.23.0 and SOVERSION to 23
Carlos Martín Nieto fb84cde8 2015-06-28T14:34:30 Merge pull request #3267 from libgit2/cmn/libs-list CMake: treat the ld flags as a list
Carlos Martín Nieto fd2d11a1 2015-06-28T13:57:06 CMake: treat the ld flags as a list These are treated as a list by CMake itself, which means that treating them as a simple string can put semicolons in our ld command-line if we have libraries which are not installed on the standard locations. Treat the variable as a CMake list and replace it with the space-delimited list just before writing it out to our pc file.
Carlos Martín Nieto fa399750 2015-06-27T21:26:27 Merge pull request #3265 from libgit2/leaks Plug a bunch of leaks
Carlos Martín Nieto 92ec9ed3 2015-06-27T21:15:00 Merge pull request #3260 from ethomson/apply_with_reflog_indices stash: test we apply using reflog-like indices
Carlos Martín Nieto b4d2c7cb 2015-06-27T20:34:04 Merge pull request #3264 from arthurschreiber/fast-builds Fast builds?
Arthur Schreiber 32f538ae 2015-06-27T15:02:53 Remove dependency installation file for travis builds. We're installing dependencies via the APT addon now.
Arthur Schreiber b48dfe0b 2015-06-27T14:54:19 Always install valgrind via the apt addon.
Carlos Martín Nieto 24fa21f3 2015-06-26T18:59:53 index, iterator, fetchhead: plug leaks
Carlos Martín Nieto afd8a94e 2015-06-26T18:49:39 checkout: plug a few leaks
Carlos Martín Nieto 9568660f 2015-06-26T18:31:39 diff: fix leaks in diff printing
Carlos Martín Nieto cfafeb84 2015-06-26T18:11:05 Merge pull request #3263 from git-up/fixes Fixes
Arthur Schreiber 51f87999 2015-06-26T18:05:17 Don't try to start ssh.
Arthur Schreiber 76d7c359 2015-06-26T17:58:45 Fast builds?
Edward Thomson ee6eed51 2015-06-25T19:04:04 stash: test we apply using reflog-like indices
Carlos Martín Nieto 354268ca 2015-06-26T17:46:35 Merge pull request #3259 from ethomson/stash_apply_argh Stash apply: stage new files even when not updating the index
Carlos Martín Nieto 3c7a4697 2015-06-26T17:45:33 Merge pull request #3262 from libgit2/vmg/prefix-len Desenfuckenate prefix lookups
Pierre-Olivier Latour 492851c9 2015-06-26T08:18:06 Removed unused variables
Pierre-Olivier Latour cae2a555 2015-06-26T08:17:56 Fixed build failure if GIT_CURL is not defined
Vicent Marti 13e5e344 2015-06-26T16:52:26 test-diff-blob: Pass proper nibble sizes
Vicent Marti a2f8d1ae 2015-06-26T16:48:58 revparse: Add test to make sure this doesn't regress
Vicent Marti 3d9ef2dc 2015-06-26T16:45:42 Revert "object: correct the expected ID size in prefix lookup" This reverts commit 969d4b703c910a8fd045baafbcd243b4c9825316. This was a fluke from Coverity. The length to all the APIs in the library is supposed to be passed in as nibbles, not bytes. Passing it as bytes would prevent us from parsing uneven-sized SHA1 strings. Also, the rest of the library was still using nibbles (including revparse and the odb_prefix APIs), so this change was seriously breaking things in unexpected ways. ^^
Carlos Martín Nieto 14888070 2015-06-26T16:05:05 Merge pull request #3261 from libgit2/cmn/link-one-level pc: Put libcurl and libssh2 in Libs.private
Carlos Martín Nieto 790cabf0 2015-06-26T13:51:41 pc: Put libcurl and libssh2 in Libs.private Pass on to whoever wants to link to libgit2 statically the flags that we would have used for these libraries. Putting them in Requires.private as we do now makes pkg-config put their dependencies in the linker arguments as well, which is not what we want.
Carlos Martín Nieto 34181825 2015-06-26T11:41:14 Merge pull request #3234 from ethomson/dont_update_index_unnecessarily Dont update index unnecessarily
Pierre-Olivier Latour c2e1b058 2015-06-05T18:26:49 Only write index if updated when passing GIT_DIFF_UPDATE_INDEX When diffing the index with the workdir and GIT_DIFF_UPDATE_INDEX has been passed, the previous implementation was always writing the index to disk even if it wasn't modified.
Edward Thomson 619423f2 2015-06-19T11:11:12 diff: test we don't update index unnecessarily Test that workdir diffs, when presented with UPDATE_INDEX, only write the index when they actually make a change.
Edward Thomson c0280bdd 2015-06-25T18:55:48 Merge pull request #3255 from libgit2/cmn/rename-unspecified Rename FALLBACK to UNSPECIFIED
Carlos Martín Nieto 552249f9 2015-06-26T00:49:28 Merge pull request #3258 from arthurschreiber/patch-6 List `libcurl` in the generated `libgit2.pc`
Edward Thomson b7f5cb8d 2015-06-20T19:33:15 stash: stage new files when unstashing them Files that were new (staged additions) in the stash tree should be staged when unstashing, even when not applying the index.
Edward Thomson 8960dc1e 2015-06-24T18:10:30 iterator: provide git_iterator_walk Provide `git_iterator_walk` to walk each iterator in lockstep, returning each iterator's idea of the contents of the next path.
Edward Thomson 82b1c93d 2015-06-20T13:44:22 stash: don't allow apply with staged changes
Edward Thomson 1db6a0ab 2015-06-19T17:29:59 stash apply: add a newly staged file to tests
Arthur Schreiber 65f2d155 2015-06-25T21:49:48 List `libcurl` in the generated `libgit2.pc`
Edward Thomson 3b66c6a3 2015-06-25T15:36:53 Merge pull request #3256 from libgit2/cmn/fetch-spec-fetchhead remote: insert refspecs with no rhs in FETCH_HEAD
Edward Thomson 87987fd1 2015-06-25T15:26:43 Merge pull request #3246 from libgit2/cmn/dont-grow-borrowed Don't allow growing borrowed buffers
Carlos Martín Nieto 23aa7c90 2015-06-25T13:40:38 remote: insert refspecs with no rhs in FETCH_HEAD When a refspec contains no rhs and thus won't cause an explicit update, we skip all the logic, but that means that we don't update FETCH_HEAD with it, which is what the implicit rhs is. Add another bit of logic which puts those remote heads in the list of updates so we put them into FETCH_HEAD.
Carlos Martín Nieto c2418f46 2015-06-25T12:48:44 Rename FALLBACK to UNSPECIFIED Fallback describes the mechanism, while unspecified explains what the user is thinking.
Carlos Martín Nieto 3cf91d98 2015-06-24T20:21:54 Add CHANGELOG entries
Carlos Martín Nieto a6599235 2015-06-24T19:32:56 buffer: make use of EINVALID for growing a borrowed buffer This explains more closely what happens. While here, set an error message.
Carlos Martín Nieto 189aad45 2015-06-24T19:32:07 errors: introduce EINVALID We've been using EINVALIDSPEC for a while to mean this, but that name is too specific. Introduce this to be more explicit.
Carlos Martín Nieto bd470d00 2015-06-23T15:21:12 blob: don't recomment using git_buf_grow We currently recommend using `git_buf_grow` in order to make a buffer make an owned copy of the memory it points to. This is not behaviour we should encourage, so remove this recommendation. The function itself is not changed, as we need to remain compatible, but it will be changed not to allow usage on borrowed buffers.
Carlos Martín Nieto caab22c0 2015-06-23T15:41:58 buffer: don't allow growing borrowed buffers When we don't own a buffer (asize=0) we currently allow the usage of grow to copy the memory into a buffer we do own. This muddles the meaning of grow, and lets us be a bit cavalier with ownership semantics. Don't allow this any more. Usage of grow should be restricted to buffers which we know own their own memory. If unsure, we must not attempt to modify it.
Carlos Martín Nieto daacf96d 2015-06-24T23:34:40 Merge pull request #3097 from libgit2/cmn/submodule-config-state Remove run-time configuration settings from submodules