Commit Graph

8600 Commits

Author SHA1 Message Date
Russell Sim
a9c98d4807 Bump version to 0.23.0 2015-08-10 07:52:26 +10:00
Russell Sim
2f72fad2b3 Commited changes from the 0.22 series 2015-07-26 20:55:06 +10:00
Russell Sim
c7d01cbce9 Commited changes from the 0.21 series 2015-07-26 20:52:18 +10:00
Russell Sim
bc62400d7e Merge branch 'upstream'
* upstream: (1173 commits)
  Update CHANGELOG with the release number
  filter: add docs for streaming filters
  iterator_walk: cast away constness for free
  filter::stream: free the filter sanely
  submodule: correctly delimit the keys to use for lookup
  submodule: add failing test for loading the wrong submodule
  submodule: completely remove reload_all
  Fix 8.3 filename tests failure when 8.3 is disabled
  Fix #3093 - remove declaration of unused function git_fetch__download_pack
  http: fixed leak when asking for credentials again
  index tests: add eol to avoid compiler warning
  checkout test: mark unused vars
  winhttp: remove unused var
  posix compat: include sys/stat.h for mingw
  diff: use size_t format
  fix memory leak in refspec.c on errors.
  checkout test: check getcwd return value
  clar: test chdir
  filter test: pass base type
  examples: clean up some warnings
  ...
2015-07-26 20:52:12 +10:00
Carlos Martín Nieto
159061a8ce Update CHANGELOG with the release number 2015-07-06 16:23:44 +02:00
Carlos Martín Nieto
4d6362b168 Merge pull request #3290 from libgit2/cmn/filter-doc
filter: add docs for streaming filters
2015-07-03 16:29:32 +02:00
Carlos Martín Nieto
a94d3e68bf 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.
2015-07-03 14:36:41 +02:00
Carlos Martín Nieto
99090a8522 Merge pull request #3289 from ethomson/warnings4
iterator_walk: cast away constness for free
2015-07-03 00:38:33 +02:00
Carlos Martín Nieto
f034c8518e Merge pull request #3287 from ethomson/filter_test_cleanup
filter::stream: free the filter sanely
2015-07-02 17:55:16 +02:00
Edward Thomson
dd6b24b19a iterator_walk: cast away constness for free 2015-07-02 10:36:15 -05:00
Edward Thomson
79306d8d59 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).
2015-07-02 10:21:48 -05:00
Carlos Martín Nieto
eb94199fe4 Merge pull request #3286 from libgit2/cmn/submodule-duplicate
Correctly delimit the keys for submodule lookup
2015-07-02 08:35:05 +02:00
Carlos Martín Nieto
e0af3cb30c 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.
2015-07-01 21:15:06 +02:00
Carlos Martín Nieto
e8e848a8da submodule: add failing test for loading the wrong submodule
When two submodules are fairly similar, we may end up loading the wrong
one.
2015-07-01 21:14:55 +02:00
Edward Thomson
bf7d2761d4 Merge pull request #3280 from linquize/8.3
Fix 8.3 filename tests failure when 8.3 is disabled
2015-07-01 12:02:27 -05:00
Carlos Martín Nieto
34065968ed 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.
2015-07-01 17:49:07 +02:00
Linquize
526f91f552 Fix 8.3 filename tests failure when 8.3 is disabled 2015-07-01 14:58:13 +08:00
Edward Thomson
aa92c318a2 Merge pull request #3278 from mplough/master
Fix #3093 - remove declaration of unused function git_fetch__download…
2015-06-30 17:38:22 -05:00
Matthew Plough
9126ccac96 Fix #3093 - remove declaration of unused function git_fetch__download_pack
Function was added in commit 2c982daa2e on October 5, 2011,
and removed in commit 41fb1ca0ec on October 29, 2012.
Given the length of time it's gone unused, it's safe to remove now.
2015-06-30 16:48:47 -04:00
Carlos Martín Nieto
2f60073dc5 Merge pull request #3273 from ethomson/warnings3
More warnings
2015-06-30 21:40:20 +02:00
Edward Thomson
cb58fb24f5 Merge pull request #3275 from git-up/http_fix
http: fixed leak when asking for credentials again
2015-06-30 13:39:07 -05:00
Pierre-Olivier Latour
1630981e6b 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.
2015-06-30 09:03:23 -07:00
Edward Thomson
eb29292aed index tests: add eol to avoid compiler warning 2015-06-30 14:31:07 +00:00
Edward Thomson
504b069701 checkout test: mark unused vars 2015-06-30 14:31:07 +00:00
Edward Thomson
0305721c10 winhttp: remove unused var 2015-06-30 14:31:07 +00:00
Edward Thomson
69c8bf7e0d posix compat: include sys/stat.h for mingw 2015-06-30 14:31:07 +00:00
Edward Thomson
49840056da diff: use size_t format 2015-06-30 14:31:07 +00:00
Edward Thomson
3451c871cb Merge pull request #3271 from jeffhostetler/more_leaks
memory leak refspec.c
2015-06-30 09:29:41 -05:00
Jeff Hostetler
64e6b5b035 fix memory leak in refspec.c on errors. 2015-06-30 09:41:17 -04:00
Carlos Martín Nieto
7bfdd1c2d2 Merge pull request #3270 from ethomson/warnings2
Remove some warnings
2015-06-30 10:21:06 +02:00
Edward Thomson
64c415c2ae checkout test: check getcwd return value 2015-06-29 22:34:00 +00:00
Edward Thomson
eadf37151b clar: test chdir 2015-06-29 22:13:40 +00:00
Edward Thomson
d88abb8949 filter test: pass base type 2015-06-29 22:13:40 +00:00
Edward Thomson
d202bb7d3b examples: clean up some warnings 2015-06-29 21:48:35 +00:00
Edward Thomson
e5f9df7b0f odb: cast to long long for printf 2015-06-29 21:45:04 +00:00
Edward Thomson
6065505667 submodule: cast enum to int for compare 2015-06-29 21:37:07 +00:00
Edward Thomson
3ca84ac0ed openssl: free hostname 2015-06-29 21:23:09 +00:00
Edward Thomson
0175971e91 stash: const up conflict params 2015-06-29 21:23:09 +00:00
Edward Thomson
2cf33fee89 index test: include repository.h for decl 2015-06-29 21:23:09 +00:00
Edward Thomson
149d5d8a50 stash: drop unused variable 2015-06-29 21:23:09 +00:00
Edward Thomson
ded4ccab01 iterator_walk: drop unused variable 2015-06-29 21:23:09 +00:00
Edward Thomson
4a0313bc4e Merge pull request #3269 from libgit2/cmn/release-fixups
Submodule and http fixes
2015-06-29 15:22:47 -05:00
Carlos Martín Nieto
8b38006018 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.
2015-06-29 21:26:40 +02:00
Carlos Martín Nieto
c28a5c972d 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.
2015-06-29 21:10:47 +02:00
Carlos Martín Nieto
cf4030b04b 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.
2015-06-29 20:54:17 +02:00
Carlos Martín Nieto
ca2466ff40 CHANGELOG: add submodule changes 2015-06-29 15:02:19 +02:00
Vicent Marti
b977d01772 Merge pull request #3268 from libgit2/vmg/pkg-config-sort
pkg-config: Sort the different sections
2015-06-29 12:27:09 +02:00
Vicent Marti
6a5fb1f4cc 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.
2015-06-29 12:20:01 +02:00
Carlos Martín Nieto
84d5a98f80 Bump version to 0.23.0 and SOVERSION to 23 2015-06-28 14:53:30 +02:00
Carlos Martín Nieto
fb84cde81e Merge pull request #3267 from libgit2/cmn/libs-list
CMake: treat the ld flags as a list
2015-06-28 14:34:30 +02:00