proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-24 21:28:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,681 Commits 2 Branches 0 Tags 22 MiB
fe03ccf28c
Commit Graph

10681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Etienne Samson
9a64e62f0f http: check certificate validity before clobbering the error variable 2017-01-06 17:09:39 +00:00
Edward Thomson
5afd0f9b7b Merge pull request #4065 from simonbyrne/sb/changelog 
Mention field addition in breaking API changes
 2017-01-06 12:33:17 +00:00
lhchavez
96df833b63 Close the file before unlinking 
I forgot that Windows chokes while trying to delete open files.
 2017-01-03 19:15:09 -08:00
lhchavez
a7ff6e5e5e Fix the memory leak 2017-01-03 18:24:51 -08:00
Simon Byrne
d8f984bc49 move git_merge_options changes to correct location 2017-01-03 10:54:34 +00:00
Simon Byrne
31c7829954 mention field addition in breaking API changes 2017-01-03 10:11:52 +00:00
Russell Sim
bee5833420 Updated version 2017-01-02 21:30:39 +11:00
Russell Sim
7d17fa9861 Imported Upstream version 0.24.5 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEqR4jDDCme6EynCdoIrEJKt3cR90FAlhqHWUACgkQIrEJKt3c
 R93h5Q/7BDw9SQ9+1AT/wGEopsPwG9V4KewvNPGqoGTZBHWpuLv4iYZtlDTxBBJC
 H7inqmo15gqLT+W4XwEzQI5UJMvqhq8D9XzMYesL7ng1KLgzsIdNsiVzdFRbjOMv
 IPIaLOrXiFlmeaEDISdk6W5g9vHBJLiCGyQd2sr3KPoGz6M3ko+o+gGclo5rW/GZ
 78ZoJsn7Z6iHZSS/c0+KKv4RhaDQ3xdhDspgJSqWlDeofJl4EPAoX/RN9hxDpbGK
 Uhc98Vo816vYABrHwtB73gHoGx2gxuSP+Ecwrn13V1Z41yKyBcrI04Mj4h1OI3Qx
 0Cr+GRYgFg+y1mgpCpuI1foG72csCLLIAQhOiAn+G7jddxIfIzDrinlo9W4QA/So
 BoWYfaTG3UeSVXl6OyKeGrbjia/GTrqIts3UGDgOrqOzei9oYPe7LwzJAshsm31g
 zTSJi0NfPvYmpbupl+Zpm8m+TKC9K2BSBGf4NhjcKhqHJg0mst+756AL3aqTdbNo
 8+zU/jXDqxd1OxMnU5vhojlc1xudUrgcW2s1ZQ/KrTJtF86L95nYXWm6tEPnCj4+
 Vw8WxgwGwxzHQlqtU7OiqsBQoxQUg0Mp8S/E67RIvPqiGa+W3u3xT/dCaq6ov8on
 x7hx22FwUOGKfkG7Sf/hjFjq+k5qEnAzw6X0n6+/Zn43pP/+BNs=
 =i0+v
 -----END PGP SIGNATURE-----

Merge tag 'upstream/0.24.5'
 2017-01-02 20:33:51 +11:00
Russell Sim
8f98253ddd Imported Upstream version 0.24.5 2017-01-02 20:25:02 +11:00
lhchavez
def644e48a Add a test 2017-01-01 17:35:29 -08:00
Edward Thomson
19ed4d0ca3 merge: set default rename threshold 
When `GIT_MERGE_FIND_RENAMES` is set, provide a default for
`rename_threshold` when it is unset.
 2017-01-01 22:34:43 +00:00
lhchavez
db535d0a7d Delete temporary packfile in indexer 
This change deletes the temporary packfile that the indexer creates to
avoid littering the pack/ directory with garbage.
 2017-01-01 12:46:37 -08:00
Edward Thomson
805b90aac4 Merge pull request #4015 from staticfloat/sf/win_http_parser 
Allow Windows with WinHTTP to use external http-parser
 2016-12-31 15:06:10 +00:00
Elliot Saba
e56e4c76b9 CMakeLists: Move http-parser block down by zlib, update error message 2016-12-30 17:59:47 -08:00
Edward Thomson
c9b9968905 Merge pull request #4052 from dglsswnsn/master 
Fix issue #4046 Seg fault in config_files()
 2016-12-30 19:14:02 +00:00
Edward Thomson
42ad85ef01 Merge pull request #4043 from fudanchii/fudanchii/openbsd 
Fix BIO_* functions method linking when compiled with libressl (OpenBSD).
 2016-12-30 16:35:24 +00:00
John Fultz
5f959dca0d 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).
 2016-12-29 20:13:03 -06:00
Chris Hescock
c7a1535f32 Extend packfile in increments of page_size. 
This improves performance by reducing the number of I/O operations.
 2016-12-29 15:48:31 -05:00
Douglas Swanson
832278bf36 Fix issue #4046 Seg fault in config_files() 2016-12-29 07:43:03 -07:00
Edward Thomson
8f0d5cdef9 tests: update error message checking 2016-12-29 12:55:49 +00:00
Edward Thomson
909d549436 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
 2016-12-29 12:26:03 +00:00
Edward Thomson
238b8ccd1a Merge pull request #4048 from jacquesg/rebase-error-check 
rebase: check the result code of rebase_init_merge
 2016-12-29 11:07:37 +00:00
Jacques Germishuys
f928c69a07 rebase: check the result code of rebase_init_merge 2016-12-29 12:54:26 +02:00
Edward Thomson
7829b4118a Merge pull request #4044 from jacquesg/mempack-version 
mempack: set the odb backend version
 2016-12-27 12:26:44 +00:00
Jacques Germishuys
6a8127d71d mempack: set the odb backend version 2016-12-25 22:13:48 +02:00
Nurahmadie
567b83de54 Fix BIO_* functions method linking when compiled with libressl. 
ref:
672ac74ce7/media-video/ffmpeg/files/ffmpeg-3.2-libressl.patch
 2016-12-24 17:43:08 +07:00
Carlos Martín Nieto
75db289a04 Merge pull request #3980 from tiennou/doc-fixes 
Documentation fixes
 2016-12-20 19:14:20 +00:00
Edward Thomson
42864e5842 Merge pull request #4041 from libgit2/cmn/bump-pretend-git 
http: bump the pretend git version in the User-Agent
 2016-12-20 17:17:12 +00:00
Carlos Martín Nieto
fafafb1f37 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.
 2016-12-20 16:19:30 +00:00
Edward Thomson
8d7717c471 Merge pull request #4034 from libgit2/cmn/sysdir-no-reguess 
sysdir: don't re-guess when using variable substitution
 2016-12-20 15:32:49 +00:00
Edward Thomson
f91f170f0e Merge pull request #4032 from libgit2/cmn/https-cap-no-hardcode 
Don't hard-code HTTPS cap & clarify the meanings of the features enum
 2016-12-20 15:28:46 +00:00
Carlos Martín Nieto
329ce0439b Merge pull request #4037 from libgit2/cmn/goals 
README: be more explicit in the goals and scope
 2016-12-20 12:14:22 +00:00
Carlos Martín Nieto
b0b850bfca Merge pull request #4038 from lucasderraugh/patch-1 
Gift deprecated in favor of SwiftGit2
 2016-12-19 18:04:20 +00:00
Carlos Martín Nieto
3714c13a88 Merge pull request #4026 from libgit2/cmn/refdb-fs-errors 
refdb: bubble up recursive rm when locking a ref
 2016-12-19 17:28:41 +00:00
Carlos Martín Nieto
903955f7e5 Merge pull request #4027 from pks-t/pks/pack-deref-cache-on-error 
pack: dereference cached pack entry on error
 2016-12-19 17:26:09 +00:00
Lucas Derraugh
87faeaecda Gift deprecated in favor of SwiftGit2 2016-12-19 09:09:34 -08:00
Carlos Martín Nieto
349016790c Merge pull request #4033 from andhe/master 
Fix off-by-one problems in git_signature__parse
 2016-12-19 16:25:01 +00:00
Carlos Martín Nieto
8f064000dd 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.
 2016-12-19 13:54:55 +00:00
Carlos Martín Nieto
9f09f290bb sysdir: don't guess the paths again when $PATH is specified 
We should replace it with whatever the user set, not start again.
 2016-12-18 14:47:27 +00:00
Carlos Martín Nieto
410855fc4b sysdir: add failing test for variable substitution 
When given $PATH as part of a search path, we guess again instead of
substituting what the user already set.
 2016-12-18 14:47:27 +00:00
Andreas Henriksson
23c9ff8632 Fix off-by-one problems in git_signature__parse 
Etc/GMT-14 aka UTC+14:00 is a thing....
https://en.wikipedia.org/wiki/UTC%2B14:00

Also allow offsets on the last minute (59).

Addresses: https://bugs.debian.org/841532
Fixes: #3970
 2016-12-17 17:40:49 +01:00
Carlos Martín Nieto
77e4623257 settings: clarify what each value means 
Most importantly, clarify what it means for HTTPS and SSH to be supported.
 2016-12-17 14:31:36 +00:00
Carlos Martín Nieto
061a0ad1f9 settings: don't hard-code HTTPS capability 
This partially reverts bdec62dce1 which activates
the transport code-paths which allow you to use a custom TLS implementation
without having to have one at build-time.

However the capabilities describe how libgit2 was built, not what it could
potentially support, bring back the ifdefs so we only say we support HTTPS if
libgit2 was itself built with a TLS implementation.
 2016-12-17 14:23:35 +00:00
Carlos Martín Nieto
428e18f8d4 Bump version to 0.24.5 2016-12-17 10:47:29 +00:00
Carlos Martín Nieto
c655def117 Merge pull request #4031 from libgit2/cmn/plug-test-leak 
rebase: plug a leak in the tests
 2016-12-17 01:12:49 +00:00
Carlos Martín Nieto
f7dcd58cc7 rebase: plug a leak in the tests 2016-12-17 00:55:06 +00:00
Carlos Martín Nieto
302aff9695 Bump version to 0.24.4 2016-12-16 23:55:06 +00:00
Carlos Martín Nieto
14d11f5a07 Merge pull request #4012 from libgit2/cmn/openssl-maint 
Add support for OpenSSL 1.1.0 for BIO filter
 2016-12-16 23:52:12 +00:00
Carlos Martín Nieto
6ab65b80b4 refdb: bubble up recursive rm when locking a ref 
Failure to bubble up this error means some locking errors do not get reported as
such on Windows.
 2016-12-16 11:33:54 +00:00
Edward Thomson
c5e6ba2892 Merge pull request #4029 from libgit2/cmn/windows-no-concurrent-compress 
refdb: disable concurrent compress in the threading tests on Windows
 2016-12-15 18:19:49 -06:00