delta/libgit2.git, branch ethomson/unc_tests github.com: libgit2/libgit2.git ctest: temporarily disable UNC path tests 2017-06-07T09:54:48+00:00 Edward Thomson ethomson@edwardthomson.com 2017-06-07T09:54:48+00:00 f218508f4a12b443e00d8d4c3b8a988033cf1872 (Temporarily) disable UNC path tests to work around AppVeyor issues. 
(Temporarily) disable UNC path tests to work around AppVeyor issues.
Merge pull request #4251 from Keruspe/master 2017-06-07T05:38:06+00:00 Patrick Steinhardt ps@pks.im 2017-06-07T05:38:06+00:00 40139fe6e62e487e6ccae26df6f9b1ddc9b30b36 Fix build with libressl 
Fix build with libressl
openssl_stream: fix building with libressl 2017-06-07T05:36:57+00:00 Marc-Antoine Perennou Marc-Antoine@Perennou.com 2017-06-05T08:11:20+00:00 f28744a5a3b11e05d64c4696ad5e9399d0b23b96 OpenSSL v1.1 has introduced a new way of initializing the library without having to call various functions of different subsystems. In libgit2, we have been adapting to that change with 88520151f (openssl_stream: use new initialization function on OpenSSL version >=1.1, 2017-04-07), where we added an #ifdef depending on the OpenSSL version. This change broke building with libressl, though, which has not changed its API in the same way. Fix the issue by expanding the #ifdef condition to use the old way of initializing with libressl. Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> 
OpenSSL v1.1 has introduced a new way of initializing the library
without having to call various functions of different subsystems. In
libgit2, we have been adapting to that change with 88520151f
(openssl_stream: use new initialization function on OpenSSL version
>=1.1, 2017-04-07), where we added an #ifdef depending on the OpenSSL
version. This change broke building with libressl, though, which has not
changed its API in the same way.

Fix the issue by expanding the #ifdef condition to use the old way of
initializing with libressl.

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Merge branch 'pr/4228' 2017-06-04T21:46:07+00:00 Edward Thomson ethomson@edwardthomson.com 2017-06-04T21:46:07+00:00 dd0aa811dd329f5040c70f7aac514b3757eb2453 






worktree: upgrade lock to an int
2017-06-04T21:44:30+00:00

Edward Thomson
ethomson@edwardthomson.com

2017-06-04T21:44:30+00:00

f0848dd7e0d137939eb969af03bd75f9bf318286












Merge pull request #4239 from roblg/toplevel-dir-ignore-fix
2017-06-04T17:35:39+00:00

Edward Thomson
ethomson@edwardthomson.com

2017-06-04T17:35:39+00:00

82e929a88bc79dc5ebd9a8484a40319ac6768c9b

Fix issue with directory glob ignore in subdirectories




Fix issue with directory glob ignore in subdirectories






Merge pull request #4243 from pks-t/pks/submodule-workdir
2017-06-04T17:03:07+00:00

Edward Thomson
ethomson@edwardthomson.com

2017-06-04T17:03:07+00:00

04de614b1f421d99240d049763546f2d06421248

Submodule working directory




Submodule working directory






Merge pull request #4179 from libgit2/ethomson/expand_tilde
2017-05-20T15:18:07+00:00

Carlos Martín Nieto
carlosmn@github.com

2017-05-20T15:18:07+00:00

a1023a43027207ac7a5df7233bddfe7347bee256

Introduce home directory expansion function for config files, attribute files




Introduce home directory expansion function for config files, attribute files






Merge pull request #4097 from implausible/fix/auto-detect-proxy-callbacks
2017-05-20T12:18:32+00:00

Carlos Martín Nieto
carlosmn@github.com

2017-05-20T12:18:32+00:00

9b1260d36cf94c24eaa318dafab18f4179bc145e

Fix proxy auto detect not utilizing callbacks




Fix proxy auto detect not utilizing callbacks






Merge pull request #4174 from libgit2/ethomson/set_head_to_tag
2017-05-20T12:17:36+00:00

Carlos Martín Nieto
carlosmn@github.com

2017-05-20T12:17:36+00:00

e694e4e9545bcbe7841cdacdbbe4a984af094f63

git_repository_set_head: use tag name in reflog




git_repository_set_head: use tag name in reflog