proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-11-04 10:33:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,080 Commits 2 Branches 0 Tags 22 MiB
c8fe6c0975
Commit Graph

9080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vicent Marti
488e2b8505 Merge pull request #3599 from libgit2/gpgsign 
Introduce git_commit_extract_signature
 2016-02-09 16:26:58 +01:00
Carlos Martín Nieto
534cc5a3cb Merge pull request #3603 from pks-t/pks/coverity-fixes 
Coverity fixes
 2016-02-09 16:10:43 +01:00
Carlos Martín Nieto
a65afb757e Introduce git_commit_extract_signature 
This returns the GPG signature for a commit and its contents without the
signature block, allowing for the verification of the commit's
signature.
 2016-02-09 15:58:16 +01:00
Carlos Martín Nieto
ab87cb1818 Merge pull request #3602 from libgit2/cmn/header-field-2 
commit: also match the first header field when searching
 2016-02-09 14:53:10 +01:00
Patrick Steinhardt
24b8ed2b3a attr_file: fix resource leak 2016-02-09 11:11:38 +01:00
Patrick Steinhardt
e262545753 checkout: fix resource leak 2016-02-09 11:09:41 +01:00
Patrick Steinhardt
39c9dd24d3 pack-objects: fix memory leak in packbuilder_config 2016-02-09 10:53:30 +01:00
Patrick Steinhardt
0b2437bb68 pack-objects: fix memory leak in compute_write_order 2016-02-09 10:43:28 +01:00
Patrick Steinhardt
a53d2e3985 pack: do not free passed in poiter on error 
The function `git_packfile_stream_open` tries to free the passed
in stream when an error occurs. The only call site is
`git_indexer_append`, though, which passes in the address of a
stream struct which has not been allocated on the heap.

Fix the issue by simply removing the call to free. In case of an
error we did not allocate any memory yet and otherwise it should
be the caller's responsibility to manage it's object's lifetime.
 2016-02-09 09:58:56 +01:00
Carlos Martín Nieto
f55eca167c commit: also match the first header field when searching 
We were searching only past the first header field, which meant we were
unable to find e.g. `tree` which is the first field.

While here, make sure to set an error message in case we cannot find the
field.
 2016-02-09 07:17:26 +01:00
Carlos Martín Nieto
e0bbe78134 Merge pull request #3598 from pks-t/pks/coverity-fixes 
Coverity fixes
 2016-02-09 06:41:02 +01:00
Carlos Martín Nieto
463f53513f Merge pull request #3601 from ethomson/merge_doc 
Better document `git_merge_commits` redux
 2016-02-09 06:26:21 +01:00
Edward Thomson
b00c959f45 Better document git_merge_commits redux 
`git_merge_commits` and `git_merge` now *do* handle recursive base
building for criss-cross merges.  Remove the documentation that says
that they do not.

This reverts commit 5e44d9bcb6.
 2016-02-08 17:56:41 -08:00
Edward Thomson
7cdbb39e0a Merge pull request #3600 from ethomson/mailmap 
mailmap: add ethomson@github.com
 2016-02-08 17:14:43 -08:00
Edward Thomson
88a4d08448 mailmap: add ethomson@github.com 2016-02-08 17:13:52 -08:00
Edward Thomson
2ed855a9e8 filter: avoid races during filter registration 
Previously we would set the global filter registry structure before
adding filters to the structure, without a lock, which is quite racy.
Now, register default filters during global registration and use an
rwlock to read and write the filter registry (as appopriate).
 2016-02-08 16:31:42 -08:00
Edward Thomson
6e0fc1a631 mingw: use gcc-like memory barrier 
Use the gcc-like memory barrier (__sync_synchronize) on mingw.
 2016-02-08 16:30:41 -08:00
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
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
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