Commit Graph

9216 Commits

Author SHA1 Message Date
Edward Thomson
8a6d667763 global: make openssl registration like the rest 2016-02-08 16:30:39 -08:00
Edward Thomson
bad2702c43 global: refactor setup and cleanup
Move the common initialization and cleanup methods to reduce
unnecessary duplication.
2016-02-08 15:39:26 -08:00
Patrick Steinhardt
a001846b25 curl_stream: fix unused cert infos
When copying contents of the cURL certiinfo we duplicate the
data but forget to actually put it into the vector.
2016-02-08 17:05:57 +01:00
Patrick Steinhardt
fac42ff942 merge: fix memory leak 2016-02-08 16:58:08 +01:00
Carlos Martín Nieto
0f814deb36 Merge pull request #3592 from ethomson/code_of_conduct
Introduce Contributor Covenant
2016-02-06 16:41:59 -08:00
Carlos Martín Nieto
240b6fed00 Merge pull request #3578 from bubaflub/fix_small_memory_leak
Free allocated pointer to curl stream on error
2016-02-05 15:19:24 -08:00
Edward Thomson
efa8208c73 Merge pull request #3579 from ethomson/mingw_winhttp
winhttp: name mangle class / iid on mingw
2016-02-05 09:37:40 -08:00
Edward Thomson
45165b1208 Merge pull request #3584 from jbreeden/export_fn
Export git_stash_apply_init_options
2016-02-04 16:43:23 -08:00
Edward Thomson
d8f7215928 Merge pull request #3594 from Ephemera/patch-1
Fix typo
2016-02-04 15:49:00 -08:00
Ephemera
804bcd6b95 Fix typo 2016-02-05 01:59:07 +09:00
Edward Thomson
612f2a6095 Merge pull request #3593 from nvanheuverzwijn/patch-1
Fix a typo in documentation
2016-02-04 08:43:47 -08:00
Nicolas Vanheuverzwijn
1087e6be88 Fix a typo in documentation 2016-02-03 17:27:04 -05:00
Edward Thomson
846632cdfe Introduce Contributor Covenant 2016-02-02 14:58:13 -08:00
Marius Ungureanu
0c09753cf5 Fix the build when defining USE_NSEC 2016-01-25 14:06:15 +02:00
jbreeden
d02720d8a6 Export git_stash_apply_init_options 2016-01-23 17:13:25 -08:00
Edward Thomson
5c7f2f0188 winhttp: name mangle class / iid on mingw
Standard Windows type systems define CLSID_InternetSecurityManager
and IID_IInternetSecurityManager, but MinGW lacks these definitions.
As a result, we must hardcode these definitions ourselves.  However,
we should not use a public struct with those names, lest another
library do the same thing and consumers cannot link to both.
2016-01-19 11:13:23 -06:00
Bob Kuo
8bd1c19e76 Free allocated pointer to curl stream on error 2016-01-16 19:39:24 -06:00
Carlos Martín Nieto
0f9d15493d Merge pull request #3573 from pmq20/master-12jan16
Make packfile_unpack_compressed a private API
2016-01-16 02:29:17 +01:00
Carlos Martín Nieto
47cf739e97 Merge pull request #3569 from arthurschreiber/arthur/fix-windows-issues
Fix some issues with generated pkg-config file
2016-01-13 17:57:54 +01:00
P.S.V.R
b644e223aa Make packfile_unpack_compressed a private API 2016-01-13 11:02:38 +08:00
Ross Delinger
ed0571f895 Add a new build flag to disable the pool allocator and pass all git_pool_malloc calls straight to git__malloc 2016-01-12 16:08:38 -05:00
Arthur Schreiber
768e185c54 Wrap path in quotes to support paths containing whitespace. 2016-01-09 02:43:03 +01:00
Arthur Schreiber
8a0133c030 Add winhttp dependencies to pc file. 2016-01-09 02:43:03 +01:00
Sebastian Bauer
9f9df4b6e0 Copy into the correct destination. 2015-12-31 14:52:32 +01:00
Sebastian Bauer
ea5942b4cf Bail out early when no memory is available. 2015-12-31 14:52:24 +01:00
Carlos Martín Nieto
700f0aff24 Merge pull request #3562 from mgorny/ssh-read-stderr-fail
ssh_stream_read(): fix possible *bytes_read < 0 branch
2015-12-29 13:38:01 +00:00
Carlos Martín Nieto
a3776489e6 Merge pull request #3558 from libgit2/cmn/index-nolock
index: get rid of the locking
2015-12-28 15:12:37 +00:00
Carlos Martín Nieto
9d81509ab1 index: get rid of the locking
We don't support using an index object from multiple threads at the same
time, so the locking doesn't have any effect when following the
rules. If not following the rules, things are going to break down
anyway.
2015-12-28 13:55:44 +00:00
Carlos Martín Nieto
ccad5a9960 Merge pull request #3565 from ethomson/templates
Handle dotfiles as the repo template dir and inside the template dir
2015-12-28 11:22:48 +00:00
Edward Thomson
62602547db git_repository_init: include dotfiles when copying templates
Include dotfiles when copying template directory, which will handle
both a template directory itself that begins with a dotfile, and
any dotfiles inside the directory.
2015-12-26 22:41:00 -06:00
Edward Thomson
002821837f repo::init tests: test a template dir with leading dot
Ensure that we can handle template directories that begin with a
leading dot.
2015-12-26 22:32:17 -06:00
Edward Thomson
5c042c5bf5 repo::init tests: test init.templatedir setting
Ensure that `git_repository_init` honors the `init.templatedir`
configuration setting.
2015-12-26 22:06:45 -06:00
Edward Thomson
a066b4cb42 Merge pull request #3552 from ReadmeCritic/master
Update README URLs based on HTTP redirects
2015-12-26 18:31:22 -06:00
ReadmeCritic
1ce509fe9e Update libgit2-glib link 2015-12-26 15:51:32 -08:00
Edward Thomson
869320a85d Merge pull request #3546 from Cruel/master
Fix a couple function signatures
2015-12-26 16:55:29 -06:00
Michał Górny
02fdc2db22 ssh_stream_read(): fix possible *bytes_read < 0 branch
Fix the possibility of returning successfully from ssh_stream_read()
with *bytes_read < 0. This would occur if stdout channel read resulted
in 0, and stderr channel read failed afterwards.
2015-12-26 17:17:05 +01:00
Edward Thomson
3d29b12c9c Merge pull request #3560 from drusk/readme_typo
Fixed minor typo in README.md.
2015-12-23 23:38:59 -06:00
drusk
22829b7443 Fixed minor typo in README.md. 2015-12-23 21:27:40 -08:00
Carlos Martín Nieto
e9c0d7962b Merge pull request #3554 from olshevskiy87/master
typos in comments
2015-12-21 21:47:10 +00:00
Dmitriy Olshevskiy
91f0d186b4 typos in comments 2015-12-21 22:18:07 +03:00
ReadmeCritic
1181ca0c6c Update README URLs based on HTTP redirects 2015-12-17 08:36:04 -08:00
Vicent Marti
9ec6839a72 Merge pull request #3551 from libgit2/vmg/commit-leak
commit: Fix memory leak in test suite
2015-12-17 10:29:58 +01:00
Vicent Marti
5951445fb3 commit: Fix memory leak in test suite 2015-12-17 10:13:04 +01:00
Vicent Marti
1850c99ce2 Merge pull request #3550 from libgit2/vmg/index-fill-2
Index fill: Small fixups
2015-12-17 10:09:02 +01:00
Carlos Martín Nieto
4baf2d8bdf Merge pull request #3548 from tepas/patch-1
fix git_blob_create_fromchunks documentation
2015-12-16 21:58:47 +01:00
Vicent Marti
ef8b7febc5 index: Also size-hint the hash table
Note that we're not checking whether the resize succeeds; in OOM cases,
we let it run with a "small" vector and hash table and see if by chance
we can grow it dynamically as we insert the new entries. Nothing to
lose really.
2015-12-16 19:36:50 +01:00
Vicent Marti
d7d46cfbfd index: Preallocate the entries vector with size hint 2015-12-16 17:04:08 +01:00
Vicent Marti
0cc20a8c48 index: Adjust namemask & mode when filling 2015-12-16 17:04:08 +01:00
Carlos Martín Nieto
f824259e67 Merge pull request #3549 from libgit2/vmg/index-fill
merge: Use `git_index__fill` to populate the index
2015-12-16 15:18:42 +01:00
Vicent Marti
879ebab314 merge: Use git_index__fill to populate the index
Instead of calling `git_index_add` in a loop, use the new
`git_index_fill` internal API to fill the index with the initial staged
entries.

The new `fill` helper assumes that all the entries will be unique and
valid, so it can append them at the end of the entries vector and only
sort it once at the end. It performs no validation checks.

This prevents the quadratic behavior caused by having to sort the
entries list once after every insertion.
2015-12-16 12:30:52 +01:00