summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* submodule: correctly delimit the keys to use for lookupcmn/submodule-duplicateCarlos Martín Nieto2015-07-011-1/+1
| | | | | | | | | | 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.
* submodule: add failing test for loading the wrong submoduleCarlos Martín Nieto2015-07-011-0/+23
| | | | | When two submodules are fairly similar, we may end up loading the wrong one.
* Merge pull request #3280 from linquize/8.3Edward Thomson2015-07-011-1/+4
|\ | | | | Fix 8.3 filename tests failure when 8.3 is disabled
| * Fix 8.3 filename tests failure when 8.3 is disabledLinquize2015-07-011-1/+4
| |
* | submodule: completely remove reload_allCarlos Martín Nieto2015-07-013-13/+3
|/ | | | | | | | 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.
* Merge pull request #3278 from mplough/masterEdward Thomson2015-06-301-7/+0
|\ | | | | Fix #3093 - remove declaration of unused function git_fetch__download…
| * Fix #3093 - remove declaration of unused function git_fetch__download_packMatthew Plough2015-06-301-7/+0
|/ | | | | | 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.
* Merge pull request #3273 from ethomson/warnings3Carlos Martín Nieto2015-06-305-4/+7
|\ | | | | More warnings
| * index tests: add eol to avoid compiler warningEdward Thomson2015-06-301-1/+1
| |
| * checkout test: mark unused varsEdward Thomson2015-06-301-1/+4
| |
| * winhttp: remove unused varEdward Thomson2015-06-301-1/+0
| |
| * posix compat: include sys/stat.h for mingwEdward Thomson2015-06-301-0/+1
| |
| * diff: use size_t formatEdward Thomson2015-06-301-1/+1
| |
* | Merge pull request #3275 from git-up/http_fixEdward Thomson2015-06-301-0/+4
|\ \ | |/ |/| http: fixed leak when asking for credentials again
| * http: fixed leak when asking for credentials againPierre-Olivier Latour2015-06-301-0/+4
|/ | | | | t->cred might have been allocated the previous time and needs to be freed before asking caller for credentials again.
* Merge pull request #3271 from jeffhostetler/more_leaksEdward Thomson2015-06-301-0/+3
|\ | | | | memory leak refspec.c
| * fix memory leak in refspec.c on errors.Jeff Hostetler2015-06-301-0/+3
| |
* | Merge pull request #3270 from ethomson/warnings2Carlos Martín Nieto2015-06-3012-16/+14
|\ \ | |/ |/| Remove some warnings
| * checkout test: check getcwd return valueEdward Thomson2015-06-291-1/+1
| |
| * clar: test chdirEdward Thomson2015-06-291-1/+1
| |
| * filter test: pass base typeEdward Thomson2015-06-291-2/+2
| |
| * examples: clean up some warningsEdward Thomson2015-06-292-2/+4
| |
| * odb: cast to long long for printfEdward Thomson2015-06-291-1/+1
| |
| * submodule: cast enum to int for compareEdward Thomson2015-06-291-1/+1
| |
| * openssl: free hostnameEdward Thomson2015-06-291-0/+1
| |
| * stash: const up conflict paramsEdward Thomson2015-06-291-1/+1
| |
| * index test: include repository.h for declEdward Thomson2015-06-291-0/+1
| |
| * stash: drop unused variableEdward Thomson2015-06-291-2/+1
| |
| * iterator_walk: drop unused variableEdward Thomson2015-06-291-5/+0
| |
* | Merge pull request #3269 from libgit2/cmn/release-fixupsEdward Thomson2015-06-293-25/+16
|\ \ | |/ |/| Submodule and http fixes
| * http: don't give up on auth on the first trycmn/release-fixupsCarlos Martín Nieto2015-06-291-2/+1
| | | | | | | | | | When the server rejects an authentication request, ask the caller for the credentials again, instead of giving up on the first try.
| * submodule: remove trailing slashes from submodule pathsCarlos Martín Nieto2015-06-292-4/+15
| | | | | | | | | | We allow looking up a submodule by path, but we lost the path normalisation during the recent changes. Bring it back.
| * submodule: remove some obsolete logicCarlos Martín Nieto2015-06-291-19/+0
|/ | | | | 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.
* CHANGELOG: add submodule changesv0.23.0-rc1Carlos Martín Nieto2015-06-291-2/+23
|
* Merge pull request #3268 from libgit2/vmg/pkg-config-sortVicent Marti2015-06-291-2/+4
|\ | | | | pkg-config: Sort the different sections
| * pkg-config: Sort the different sectionsvmg/pkg-config-sortVicent Marti2015-06-291-2/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Bump version to 0.23.0 and SOVERSION to 23Carlos Martín Nieto2015-06-281-3/+3
|
* Merge pull request #3267 from libgit2/cmn/libs-listCarlos Martín Nieto2015-06-281-10/+14
|\ | | | | CMake: treat the ld flags as a list
| * CMake: treat the ld flags as a listCarlos Martín Nieto2015-06-281-10/+14
|/ | | | | | | | | 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.
* Merge pull request #3265 from libgit2/leaksCarlos Martín Nieto2015-06-277-8/+42
|\ | | | | Plug a bunch of leaks
| * index, iterator, fetchhead: plug leaksleaksCarlos Martín Nieto2015-06-263-1/+10
| |
| * checkout: plug a few leaksCarlos Martín Nieto2015-06-261-5/+15
| |
| * diff: fix leaks in diff printingCarlos Martín Nieto2015-06-263-2/+17
| |
* | Merge pull request #3260 from ethomson/apply_with_reflog_indicesCarlos Martín Nieto2015-06-271-0/+34
|\ \ | | | | | | stash: test we apply using reflog-like indices
| * | stash: test we apply using reflog-like indicesEdward Thomson2015-06-261-0/+34
| |/
* | Merge pull request #3264 from arthurschreiber/fast-buildsCarlos Martín Nieto2015-06-273-10/+12
|\ \ | | | | | | Fast builds?
| * | Remove dependency installation file for travis builds.Arthur Schreiber2015-06-271-6/+0
| | | | | | | | | | | | We're installing dependencies via the APT addon now.
| * | Always install valgrind via the apt addon.Arthur Schreiber2015-06-271-1/+1
| | |
| * | Don't try to start ssh.Arthur Schreiber2015-06-261-2/+0
| | |
| * | Fast builds?Arthur Schreiber2015-06-261-1/+11
| |/
View Lorry Controller Status