proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-11 02:10:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,103 Commits 2 Branches 0 Tags 22 MiB
0cdaa3766a
Commit Graph

7103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Martín Nieto
0cdaa3766a remote: short-circuit the default branch check if there is none 
If we do not have a HEAD ref in the heads, we already know there is no
default branch. Return immedately.
 2014-08-29 15:28:10 +02:00
Carlos Martín Nieto
94412b009e remote: assert what we want to happen when ther is no default branch 
Assert what we already do, so as to notice changes.
 2014-08-29 15:28:10 +02:00
Carlos Martín Nieto
26bf3a5346 travis: no need to clean out the test repository 
This was added to avoid the remote's default branch to be considered to
the be notes one which the first network test leaves behind.
 2014-08-29 15:28:10 +02:00
Carlos Martín Nieto
389526043a remote: restrict default branch to branches namespace 2014-08-29 15:27:36 +02:00
Vicent Marti
d99c8ca178 Merge pull request #2539 from libgit2/cmn/ahead-behind-order 
Fix ahead-behind results
 2014-08-28 16:33:53 +02:00
Carlos Martín Nieto
05f0d0c119 graph: fix ahead-behind logic 
When we see PARENT1, it means there is a local commit and thus we are
ahead. Likewise, seeing PARENT2 means that the upstream branch has a
commit and we are one more behind.

The logic is currently reversed. Correct it.

This fixes #2501.
 2014-08-28 13:36:58 +02:00
Carlos Martín Nieto
e07aebb4e2 Fix ahead-behind tests 
The logic was reversed. I have checked manually each pair with git and
adjusted the expectation to what git status prints.
 2014-08-28 13:34:42 +02:00
Vicent Marti
69db893427 Merge pull request #2538 from libgit2/ntk/propagate_url_parsing_error 
winhttp: Prevent swallowing of url parsing error
 2014-08-27 19:19:55 +02:00
Vicent Marti
893cfe0649 Merge pull request #2502 from rnowosielski/remote_set_timeout 
Set timeout on remote (Add timeout for WinHttpReceiveResponse #2147)
 2014-08-27 19:18:46 +02:00
Vicent Marti
1485c6833a Merge pull request #2490 from csware/ssh-wintunnel 
Allow to override default ssh transport_cb - in order to allow third party ssh transports
 2014-08-27 18:02:10 +02:00
nulltoken
f0c53d21a4 winhttp: Prevent swallowing of url parsing error 2014-08-27 17:37:29 +02:00
Sven Strickroth
0e5bb61992 Added some tests 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2014-08-27 17:27:07 +02:00
Carlos Martín Nieto
c13b68442f Adjust clone tests to USERNAME cred type 2014-08-27 15:25:46 +02:00
Carlos Martín Nieto
15c7da3442 Merge branch 'cmn/ssh-retry' 2014-08-27 15:10:51 +02:00
Carlos Martín Nieto
7449c82ee7 Add ssh retry changes to CHANGELOG 2014-08-27 15:10:43 +02:00
Carlos Martín Nieto
6a0d2b43ee Merge remote-tracking branch 'upstream/master' into cmn/ssh-retry 2014-08-27 15:09:07 +02:00
Rafal Nowosielski
86d0a53cd6 Set timeout on remote (WinHTTP) should return error in case of failure. Connection timeout set to 1 minute. Read/Write timeout remains set to infinite #2147 2014-08-27 15:07:04 +02:00
Vicent Marti
cb92467bc2 Merge pull request #2537 from libgit2/reduce-cache-contention 
Refactor git_cache to use an rwlock
 2014-08-27 01:16:11 +02:00
Justin Spahr-Summers
6a211d7c9a Refactor git_cache to use an rwlock 
This significantly reduces contention when many threads are trying to
read from the cache simultaneously.
 2014-08-26 15:12:43 -07:00
Vicent Marti
00e9ae5ab4 Merge pull request #2508 from libgit2/rb/fix-ignore-slash-star 
Fix bugs with negative ignores inside an ignored parent directory
 2014-08-26 17:48:20 +02:00
Vicent Marti
cd0c4fa73a Merge pull request #2533 from jakebolewski/jcb/addjulia 
add Julia to the language bindings list
 2014-08-26 17:46:52 +02:00
Vicent Marti
397bc8d897 Merge pull request #2535 from libgit2/cmn/unpack-offset 
pack: return the correct final offset
 2014-08-26 17:45:07 +02:00
Sven Strickroth
34e510cedf Allow to override default ssh transport_cb 
W/o this patch it is not possible to have a third party ssh transport_cb if GIT_SSH is disabled or a third party transport_cb which has a higher priority than the default one.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2014-08-26 17:18:52 +02:00
Carlos Martín Nieto
b3d3459f32 pack: return the correct final offset 
The callers of git_packfile_unpack() expect the obj_offset argument to
be set to the beginning of the next object. We were mistakenly returning
the the offset of the object's data, which causes the CRC function to
try to use the wrong offset.

Set obj_offset to curpos instead of elem->offset to point to the next
element and bring back expected behaviour.
 2014-08-26 15:09:47 +02:00
jake bolewski
d747ec18e9 add Julia to the language bindings list 2014-08-25 20:50:06 -04:00
Vicent Marti
844d226c9d Merge pull request #2532 from arthurschreiber/arthur/fix-merge-base-commit-check 
merge base: Correctly raise an error if a non-commit object is passed.
 2014-08-25 23:06:34 +02:00
Arthur Schreiber
017c0eac2b merge base: Correctly raise an error if a non-commit object is passed. 2014-08-25 22:41:07 +02:00
Vicent Marti
5af52c628b Merge pull request #2531 from libgit2/rb/mkdir-allow-parent-failures 
Allow mkdir helper to skip parent errors
 2014-08-25 21:04:09 +02:00
Vicent Marti
2c1de697e0 Merge pull request #2527 from jacquesg/refspec-crash 
Check if the refspec matches before transforming
 2014-08-25 18:18:06 +02:00
Rafal Nowosielski
2db71194de Set timeout on remote (WinHTTP) to infinite #2147 2014-08-23 13:24:13 +02:00
Russell Belfer
668ae2ddf8 Allow mkdir helper to skip parent errors 
Our mkdir helper was failing is a parent directory was not
accessible even if the child directory could be created.
This changes the helper to keep trying child directories
even when the parent is unwritable.
 2014-08-22 10:05:09 -07:00
Jacques Germishuys
8f6073f63e Check that the refspec matches before modifying the out buffer 2014-08-21 18:53:43 +02:00
Vicent Marti
d28b2b7a5f Merge pull request #2528 from libgit2/vmg/tostr_s 
Export `git_oid_tostr_s` instead of `_allocfmt`
 2014-08-18 15:18:59 +02:00
Vicent Marti
43ebca8d7b Revert "test: Remove symlinks from the source tree" 
This reverts commit 0dc54e1494.
 2014-08-18 15:18:47 +02:00
Vicent Marti
0dc54e1494 test: Remove symlinks from the source tree 
We don't really use this at all, and it breaks packaging in Windows.
 2014-08-18 12:47:16 +02:00
Vicent Marti
4ca0b566ca oid: Export git_oid_tostr_s instead of _allocfmt 
The old `allocfmt` is of no use to callers, as they are not able to free
the returned buffer. Export a new API that returns a static string that
doesn't need to be freed.
 2014-08-18 12:41:06 +02:00
Vicent Marti
414dbe9633 Merge pull request #2525 from libgit2/cmn/http-recv-buffer 
http: make sure we can consume the data we request
 2014-08-18 12:26:18 +02:00
Vicent Marti
1a85eca037 Merge pull request #2523 from leighlondon/remove-completed-project 
Removing a completed starter project.
 2014-08-18 12:25:50 +02:00
Jacques Germishuys
4e53c28096 Check if the refspec matches before transforming 2014-08-17 14:55:06 +02:00
Carlos Martín Nieto
294c6f2964 http: make sure we can consume the data we request 
The recv buffer (parse_buffer) and the buffer have independent sizes and
offsets. We try to fill in parse_buffer as much as possible before
passing it to the http parser. This is fine most of the time, but fails
us when the buffer is almost full.

In those situations, parse_buffer can have more data than we would be
able to put into the buffer (which may be getting full if we're towards
the end of a data sideband packet).

To work around this, we check if the space we have left on our buffer is
smaller than what could come from the network. If this happens, we make
parse_buffer think that it has as much space left as our buffer, so it
won't try to retrieve more data than we can deal with.

As the start of the data may no longer be at the start of the buffer, we
need to keep track of where it really starts (data_offset) and use that
in our calculations for the real size of the data we received from the
network.

This fixes #2518.
 2014-08-16 22:21:12 +02:00
Leigh London
1f2f611465 Removing a completed starter project. 
Removing the starter project for adding support for the symref
extension (#2006) from PROJECTS.md, as this seems to have been
completed with the merge of #2376.
 2014-08-16 19:13:21 +10:00
Vicent Marti
fa44a1699c Merge pull request #2521 from jacquesg/remote-ls-not-connected 
git_remote_ls() crashes before connect is called
 2014-08-15 23:10:45 +02:00
Jacques Germishuys
dc8adda4f1 git_remote_ls() should return an error if the transport is not available 2014-08-15 22:56:15 +02:00
Vicent Marti
e1c4429038 Merge pull request #2497 from ethomson/kerberos3 
SPNEGO authentication via GSSAPI
 2014-08-15 20:33:38 +02:00
Edward Thomson
23135afa6f Introduce proper http authentication API 2014-08-15 14:11:56 -04:00
Edward Thomson
315cb38e1e Add GSSAPI support for SPNEGO/Kerberos auth over HTTP 2014-08-15 11:12:42 -04:00
Edward Thomson
e003f83a58 Introduce git_buf_decode_base64 
Decode base64-encoded text into a git_buf
 2014-08-15 11:12:42 -04:00
Edward Thomson
40867266bf Perform HTTP keep-alive 2014-08-15 11:12:42 -04:00
Edward Thomson
adcdeb36b0 online::clone::credentials support default credentials 2014-08-15 11:12:42 -04:00
Edward Thomson
f96e7e6c94 Free references during push validation 2014-08-15 11:12:42 -04:00