|
be249bca
|
2017-02-08T10:21:55
|
|
Merge pull request #4109 from rcjsuen/patch-1
Flag checkout_opts in git_reset as optional
|
|
3a133652
|
2017-02-05T07:12:32
|
|
Flag checkout_opts in git_reset as optional
The check_outs argument can be NULL and should be flagged accordingly
in the header file.
|
|
|
887c1931
|
2017-02-04T11:04:30
|
|
Merge pull request #4108 from rcjsuen/patch-1
Flag given_opts in git_revert as optional
|
|
|
21d4a378
|
2017-02-04T17:24:31
|
|
Flag given_opts in git_revert as optional
The given_opts argument can actually be NULL and thus should be
flagged accordingly in the header file.
|
|
|
104a1b0b
|
2017-02-02T17:21:23
|
|
Merge pull request #4105 from pks-t/pks/vector-reverse-overflow
Vector reverse overflow
|
|
f47db3c7
|
2017-02-02T16:02:57
|
|
vector: do not reverse a vector if it is empty
The code reversing a vector initially determines the rear-pointer by
simply subtracting 1 from the vector's length. Obviously, this fails if
the vector is empty, in which case we have an integer overflow.
Fix the issue by returning early if the vector is empty.
|
|
390431c3
|
2017-02-01T17:31:31
|
|
revwal: add failing test for walking with topo-sort
|
|
|
9ba610a1
|
2017-02-02T13:31:33
|
|
Merge pull request #4096 from mplough/master
Update docs for git_oid_fromstrn and p
|
|
921493cc
|
2017-01-27T14:37:16
|
|
Update docs for git_oid_fromstrn and p
|
|
|
dad3c319
|
2017-01-27T17:56:52
|
|
Merge pull request #4095 from mplough/master
Fix uninitialized variable warning
|
|
|
d0c418c0
|
2017-01-27T12:49:48
|
|
Fix uninitialized variable warning
Fix the following warning emitted by clang:
[ 16%] Building C object CMakeFiles/libgit2_clar.dir/src/submodule.c.o
/Users/mplough/devel/external/libgit2/src/submodule.c:408:6: warning: variable 'i' is used uninitialized whenever 'if' condition is true
[-Wsometimes-uninitialized]
if ((error = load_submodule_names(names, cfg)))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/mplough/devel/external/libgit2/src/submodule.c:448:20: note: uninitialized use occurs here
git_iterator_free(i);
^
/Users/mplough/devel/external/libgit2/src/submodule.c:408:2: note: remove the 'if' if its condition is always false
if ((error = load_submodule_names(names, cfg)))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/mplough/devel/external/libgit2/src/submodule.c:404:17: note: initialize the variable 'i' to silence this warning
git_iterator *i;
^
= NULL
1 warning generated.
|
|
8df1cfc9
|
2017-01-24T21:26:41
|
|
Merge pull request #4086 from libgit2/ethomson/fixes
WIP: some coverity & compiler warning fixes
|
|
|
9b51cc82
|
2017-01-24T21:10:46
|
|
Merge pull request #4050 from ethomson/ethomson/winhttp_errmsgs
WinHTTP: set proper error messages when SSL fails
|
|
|
1f813cf2
|
2017-01-23T17:32:13
|
|
checkout::tree test: cleanup memory leak
|
|
|
7f66a70e
|
2017-01-23T23:00:00
|
|
attr_cache_remove: don't remove given file
If `attr_cache_lookup_entry` fails to find the given file, make sure
that we do not try to free the given file.
|
|
|
a0d38479
|
2017-01-22T01:42:45
|
|
mac: on 32 bit, use `__builtin_umull_overflow`
|
|
|
60c2bf47
|
2017-01-22T00:58:41
|
|
submodule: only examine idx & head given a config
|
|
|
0fbff82b
|
2017-01-22T00:30:02
|
|
submodule: don't double free during load failure
When we fail to load submodules, don't free the list; it is later freed
unconditionally.
|
|
|
11968073
|
2017-01-23T13:29:14
|
|
Merge pull request #4087 from tiennou/warnings
Fix a few recent warnings
|
|
e2b3dc16
|
2017-01-23T13:29:47
|
|
variable 'i' is used uninitialized whenever 'if' condition is true
|
|
|
7414acf5
|
2017-01-23T12:28:02
|
|
parameter 'id' not found in the function declaration
|
|
|
185fe9c1
|
2017-01-21T23:58:41
|
|
Merge pull request #4051 from tiennou/clang-analyzer-1
Clang analyzer run
|
|
|
048c5ea7
|
2017-01-21T23:55:21
|
|
Merge pull request #4053 from chescock/extend-packfile-by-pages
Extend packfile in increments of page_size.
|
|
|
8d3b39a6
|
2017-01-21T23:50:38
|
|
Merge branch 'pr/3912'
|
|
|
28d0ba0b
|
2017-01-21T23:45:23
|
|
symbolic ref target validation: fixups
Fixups requested in #3912.
|
|
|
1910a04a
|
2016-12-30T12:42:42
|
|
winhttp: set proper cert failure error messages
Set up a WinHTTP status callback; inspect the WinHTTP status for
WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, and convert the status code
to a useful message for callers.
|
|
|
0418d3b7
|
2017-01-21T23:11:13
|
|
Merge pull request #4078 from pks-t/pks/example-cleanup
Fix general example memory leaks
|
|
|
44e8af8f
|
2017-01-21T22:51:50
|
|
Merge pull request #3892 from mitesch/shared_buffer
Use a shared buffer in calls of git_treebuilder_write to avoid heap contention
|
|
|
3b4eb107
|
2017-01-21T22:40:37
|
|
CHANGELOG: move `git_submodule_update_option` changes
The changes to `git_submodule_update_option` are now landing in v.Next.
|
|
|
9e78b727
|
2017-01-21T22:39:59
|
|
Merge branch 'master' into pr/3938
|
|
|
176f5552
|
2017-01-21T22:16:28
|
|
Merge pull request #4085 from libgit2/ethomson/packfile_close
indexer: introduce `git_packfile_close`
|
|
|
87b7a705
|
2017-01-21T15:44:57
|
|
indexer: avoid warning about `idx->pack`
It must be non-NULL to have a valid `git_indexer`.
|
|
|
bf339ab0
|
2017-01-21T14:51:31
|
|
indexer: introduce `git_packfile_close`
Encapsulation!
|
|
|
98f53872
|
2017-01-21T18:57:28
|
|
Merge pull request #4016 from novalis/submodule-optimization
Submodule optimization
|
|
|
52949c80
|
2017-01-21T18:30:12
|
|
Merge branch 'pr/4060'
|
|
|
d030bba9
|
2017-01-21T17:15:33
|
|
indexer: only delete temp file if it was unused
Only try to `unlink` our temp file when we know that we didn't copy it
into its permanent location.
|
|
673dff88
|
2016-11-23T18:32:55
|
|
Skip submodule head/index update when caching.
`git_submodule_status` is very slow, bottlenecked on
`git_repository_head_tree`, which it uses through `submodule_update_head`. If
the user has requested submodule caching, assume that they want this status
cached too and skip it.
Signed-off-by: David Turner <dturner@twosigma.com>
|
|
|
4d99c4cf
|
2016-11-23T18:32:48
|
|
Allow for caching of submodules.
Added `git_repository_submodule_cache_all` to initialze a cache of
submodules on the repository so that operations looking up N
submodules are O(N) and not O(N^2). Added a
`git_repository_submodule_cache_clear` function to remove the cache.
Also optimized the function that loads all submodules as it was itself
O(N^2) w.r.t the number of submodules, having to loop through the
`.gitmodules` file once per submodule. I changed it to process the
`.gitmodules` file once, into a map.
Signed-off-by: David Turner <dturner@twosigma.com>
|
|
ca05857e
|
2016-11-23T18:26:19
|
|
Fix formatting
Signed-off-by: David Turner <dturner@twosigma.com>
|
|
|
df4dfaad
|
2017-01-16T12:29:52
|
|
Merge pull request #4055 from ethomson/ethomson/ntlm
WinHTTP: support best auth mechanism
|
|
|
4e4a1460
|
2016-12-30T12:13:34
|
|
WinHTTP: support best auth mechanism
For username/password credentials, support NTLM or Basic (in that order
of priority). Use the WinHTTP built-in authentication support for both,
and maintain a bitfield of the supported mechanisms from the response.
|
|
|
cb76eed5
|
2017-01-14T17:41:49
|
|
Merge pull request #4054 from jfultz/jfultz/fix_GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH
Fix handling of GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH flag.
|
|
|
2854e619
|
2017-01-14T17:12:23
|
|
Merge pull request #4061 from libgit2/ethomson/merge_opts
merge: set default rename threshold
|
|
f5586f5c
|
2017-01-14T16:37:00
|
|
Addressed review feedback
|
|
|
07bb8078
|
2017-01-14T16:01:53
|
|
CHANGELOG: update `GIT_MERGE_OPTIONS_INIT` changes
|
|
|
49be45a1
|
2016-12-26T22:15:31
|
|
pack: report revwalk error
|
|
|
b0014063
|
2016-12-26T22:13:35
|
|
patch: memory leak of patch.base.diff_opts.new|old_prefix
|
|
|
8a349bf2
|
2016-12-26T14:47:55
|
|
ignore: there must be a repository
Otherwise we'll NULL-dereference in git_attr_cache__init
|
|
|
a6d833a2
|
2017-01-13T17:05:58
|
|
Merge pull request #4049 from libgit2/ethomson/error_msgs
giterr_set: consistent error messages
|
|
|
f9ea8c6a
|
2017-01-12T22:02:14
|
|
examples: general: fix memory leaks
|
|
|
ed2b1c7e
|
2017-01-12T22:01:45
|
|
examples: general: display config only if it was found
|
|
|
5aa10107
|
2017-01-12T22:01:23
|
|
examples: general: narrow down scope of loop variables
|
|
|
8572e225
|
2017-01-12T22:00:53
|
|
examples: general: clean up committer/author variables
|
|
|
ffe259d9
|
2017-01-11T11:52:06
|
|
Merge pull request #4074 from fcharlie/master
fix examples/network/clone.c: heap-buffer-overflow
|
|
ee89941f
|
2017-01-09T20:59:43
|
|
Merge remote-tracking branch 'upstream/maint/v0.25'
|
|
|
2fcb8705
|
2017-01-09T20:26:45
|
|
Merge pull request #4076 from libgit2/cmn/sec-update-25
security updates for v0.25
|
|
|
2ac57aa8
|
2017-01-09T17:53:21
|
|
https: don't test that RC4 is invalid
None of our crypto backends actually reject RC4 as a cipher so don't
test for it and instead keep it as something we'd like to do.
|
|
|
3829ba2e
|
2017-01-09T17:50:17
|
|
http: correct the expected error for RC4
We must make sure that we're getting a certificate error from the
library so we know that we're testing the right thing.
|
|
3fdba15c
|
2017-01-09T14:09:57
|
|
fix examples/network/clone.c: heap-buffer-overflow
Format of a length of string to the correct format is:%.*s
|
|
|
a5cf255b
|
2017-01-06T17:15:53
|
|
Bump version to 0.25.1
|
|
|
6850b516
|
2017-01-06T17:12:16
|
|
Merge branch '25_smartpktparse' into maint/v0.25
|
|
|
2fdef641
|
2016-11-15T11:44:51
|
|
smart_pkt: treat empty packet lines as error
The Git protocol does not specify what should happen in the case
of an empty packet line (that is a packet line "0004"). We
currently indicate success, but do not return a packet in the
case where we hit an empty line. The smart protocol was not
prepared to handle such packets in all cases, though, resulting
in a `NULL` pointer dereference.
Fix the issue by returning an error instead. As such kind of
packets is not even specified by upstream, this is the right
thing to do.
|
|
|
66e3774d
|
2016-11-15T11:36:27
|
|
smart_pkt: verify packet length exceeds PKT_LEN_SIZE
Each packet line in the Git protocol is prefixed by a four-byte
length of how much data will follow, which we parse in
`git_pkt_parse_line`. The transmitted length can either be equal
to zero in case of a flush packet or has to be at least of length
four, as it also includes the encoded length itself. Not
checking this may result in a buffer overflow as we directly pass
the length to functions which accept a `size_t` length as
parameter.
Fix the issue by verifying that non-flush packets have at least a
length of `PKT_LEN_SIZE`.
|
|
|
ab8a0fdb
|
2017-01-06T17:10:49
|
|
Merge branch '25_certcheckcb' into maint/v0.25
|
|
|
98d66240
|
2017-01-06T10:51:31
|
|
http: perform 'badssl' check also via certificate callback
Make sure that the callbacks do also get a 'valid' value of zero when
the certificate we're looking at is in valid and assert that within the
test.
|
|
|
9a64e62f
|
2016-12-21T21:24:33
|
|
http: check certificate validity before clobbering the error variable
|
|
|
5afd0f9b
|
2017-01-06T12:33:17
|
|
Merge pull request #4065 from simonbyrne/sb/changelog
Mention field addition in breaking API changes
|
|
|
96df833b
|
2017-01-03T19:15:09
|
|
Close the file before unlinking
I forgot that Windows chokes while trying to delete open files.
|
|
|
a7ff6e5e
|
2017-01-03T18:24:51
|
|
Fix the memory leak
|
|
d8f984bc
|
2017-01-03T10:54:24
|
|
move git_merge_options changes to correct location
|
|
|
31c78299
|
2017-01-03T10:11:52
|
|
mention field addition in breaking API changes
|
|
|
def644e4
|
2017-01-01T17:35:29
|
|
Add a test
|
|
|
19ed4d0c
|
2017-01-01T22:19:23
|
|
merge: set default rename threshold
When `GIT_MERGE_FIND_RENAMES` is set, provide a default for
`rename_threshold` when it is unset.
|
|
|
db535d0a
|
2017-01-01T12:45:02
|
|
Delete temporary packfile in indexer
This change deletes the temporary packfile that the indexer creates to
avoid littering the pack/ directory with garbage.
|
|
|
805b90aa
|
2016-12-31T15:06:10
|
|
Merge pull request #4015 from staticfloat/sf/win_http_parser
Allow Windows with WinHTTP to use external http-parser
|
|
e56e4c76
|
2016-12-30T17:59:47
|
|
CMakeLists: Move `http-parser` block down by `zlib`, update error message
|
|
|
c9b99689
|
2016-12-30T19:14:02
|
|
Merge pull request #4052 from dglsswnsn/master
Fix issue #4046 Seg fault in config_files()
|
|
|
42ad85ef
|
2016-12-30T16:35:24
|
|
Merge pull request #4043 from fudanchii/fudanchii/openbsd
Fix BIO_* functions method linking when compiled with libressl (OpenBSD).
|
|
5f959dca
|
2016-12-29T19:26:50
|
|
Fix handling of GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH flag.
git_checkout_tree() sets up its working directory iterator to respect the
pathlist if GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH is present, which is great.
What's not so great is that this iterator is then used side-by-side with
an iterator created by git_checkout_iterator(), which did not set up its
pathlist appropriately (although the iterator mirrors all other iterator
options).
This could cause git_checkout_tree() to delete working tree files which
were not specified in the pathlist when GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH
was used, as the unsynchronized iterators causes git_checkout_tree() to think
that files have been deleted between the two trees. Oops.
And added a test which fails without this fix (specifically, the final check
for "testrepo/README" to still be present fails).
|
|
c7a1535f
|
2016-12-29T11:47:52
|
|
Extend packfile in increments of page_size.
This improves performance by reducing the number of I/O operations.
|
|
832278bf
|
2016-12-29T07:43:03
|
|
Fix issue #4046 Seg fault in config_files()
|
|
|
8f0d5cde
|
2016-12-29T12:55:49
|
|
tests: update error message checking
|
|
|
909d5494
|
2016-12-29T12:25:15
|
|
giterr_set: consistent error messages
Error messages should be sentence fragments, and therefore:
1. Should not begin with a capital letter,
2. Should not conclude with punctuation, and
3. Should not end a sentence and begin a new one
|
|
|
238b8ccd
|
2016-12-29T11:07:37
|
|
Merge pull request #4048 from jacquesg/rebase-error-check
rebase: check the result code of rebase_init_merge
|
|
f928c69a
|
2016-12-29T12:54:26
|
|
rebase: check the result code of rebase_init_merge
|
|
|
7829b411
|
2016-12-27T12:26:44
|
|
Merge pull request #4044 from jacquesg/mempack-version
mempack: set the odb backend version
|
|
|
6a8127d7
|
2016-12-25T22:13:48
|
|
mempack: set the odb backend version
|
|
567b83de
|
2016-12-24T17:43:08
|
|
Fix BIO_* functions method linking when compiled with libressl.
ref:
https://github.com/gentoo/libressl/blob/672ac74ce7b7cb2e4799b2d66bc0b1b1efa3454e/media-video/ffmpeg/files/ffmpeg-3.2-libressl.patch
|
|
|
75db289a
|
2016-12-20T19:14:20
|
|
Merge pull request #3980 from tiennou/doc-fixes
Documentation fixes
|
|
|
42864e58
|
2016-12-20T17:17:12
|
|
Merge pull request #4041 from libgit2/cmn/bump-pretend-git
http: bump the pretend git version in the User-Agent
|
|
|
fafafb1f
|
2016-12-20T16:19:30
|
|
http: bump the pretend git version in the User-Agent
We want to keep the git UA in order for services to recognise that we're
a Git client and not a browser. But in order to stop dumb HTTP some
services have blocked UAs that claim to be pre-1.6.6 git.
Thread these needles by using the "git/2.0" prefix which is still close
enough to git's yet distinct enough that you can tell it's us.
|
|
|
8d7717c4
|
2016-12-20T15:32:49
|
|
Merge pull request #4034 from libgit2/cmn/sysdir-no-reguess
sysdir: don't re-guess when using variable substitution
|
|
|
f91f170f
|
2016-12-20T15:28:46
|
|
Merge pull request #4032 from libgit2/cmn/https-cap-no-hardcode
Don't hard-code HTTPS cap & clarify the meanings of the features enum
|
|
|
329ce043
|
2016-12-20T12:14:22
|
|
Merge pull request #4037 from libgit2/cmn/goals
README: be more explicit in the goals and scope
|
|
|
b0b850bf
|
2016-12-19T18:04:20
|
|
Merge pull request #4038 from lucasderraugh/patch-1
Gift deprecated in favor of SwiftGit2
|
|
|
3714c13a
|
2016-12-19T17:28:41
|
|
Merge pull request #4026 from libgit2/cmn/refdb-fs-errors
refdb: bubble up recursive rm when locking a ref
|
|
|
903955f7
|
2016-12-19T17:26:09
|
|
Merge pull request #4027 from pks-t/pks/pack-deref-cache-on-error
pack: dereference cached pack entry on error
|
|
87faeaec
|
2016-12-19T09:09:34
|
|
Gift deprecated in favor of SwiftGit2
|
|
|
34901679
|
2016-12-19T16:25:01
|
|
Merge pull request #4033 from andhe/master
Fix off-by-one problems in git_signature__parse
|
|
|
8f064000
|
2016-12-19T13:54:55
|
|
README: be more explicit in the goals and scope
Make it clearer from the get-go that we do not aim to implement
user-facing commands from the git tool.
|