kmx git

Commit	Date	Message
1f501a08	2014-09-30T04:58:02	describe: rename _object() to _commit() We don't describe arbitrary object, so let's give it the name of the one object type we accept.
af6cc38f	2014-09-30T04:38:05	Merge remote-tracking branch 'upstream/master' into cmn/describe
4c534892	2014-09-29T14:57:54	Merge pull request #2581 from jacquesg/stash-ignored-directories Stash ignored directories
89602a1a	2014-09-29T10:39:40	Merge pull request #2584 from jacquesg/pool-alignment Pool/Index data is not aligned
ffe34a7c	2014-09-29T10:37:37	Merge pull request #2582 from swansontec/master Correctly handle getaddrinfo return result
ced843f4	2014-09-29T10:29:00	Merge pull request #2559 from libgit2/cmn/free-tls-error global: free the error message when exiting a thread
7b7aa75f	2014-09-24T13:24:39	Recurse ignored directories when stashing
5387cfee	2014-09-25T15:29:35	Ensure patch is initialized to zero, otherwise, the allocated flag may be set
e640a77c	2014-09-25T15:29:03	Silence uninitialized warning
ff97778a	2014-09-25T13:07:36	The raw index buffer content is not guaranteed to be aligned * Ensure alignment by copying the content into a structure on the stack
ad8c8d93	2014-09-25T12:05:48	Ensure pool data is aligned on an 8 byte boundary
3aaa5c7b	2014-09-25T12:05:26	Introduce GIT_ALIGN
d0cf1040	2014-09-24T12:01:14	Correctly handle getaddrinfo return result The getaddrinfo function indicates failure with a non-zero return code, but this code is not necessarily negative. On platforms like Android where the code is positive, a failed call causes libgit2 to segfault.
14556cbf	2014-09-17T17:13:25	Merge pull request #2567 from cirosantilli/factor-41 Factor 40 and 41 constants from source.
276d9ea3	2014-09-17T15:39:57	Merge pull request #2571 from libgit2/vmg/walk-up-path Fix `git_path_walk_up` to work with non-rooted paths
74240afb	2014-09-17T15:35:50	repository: Do not double-free config
4592b62e	2014-09-17T15:26:48	Merge pull request #2572 from cirosantilli/factor-void Replace void casts with GIT_UNUSED.
4e964117	2014-09-17T15:24:56	Style
a2b4407d	2014-09-17T15:23:17	attr: Do not walk path if we're at the root
c5cf8cad	2014-09-17T15:19:08	Replace void casts with GIT_UNUSED.
bbb988a5	2014-09-17T14:52:31	path: Fix `git_path_walk_up` to work with non-rooted paths
1312f87b	2014-09-17T14:56:39	Merge pull request #2464 from libgit2/cmn/host-cert-info Provide a callback for certificate validation
25abbc27	2014-09-17T03:19:40	Clean up some leaks in the test suite
4fe5b771	2014-09-16T13:35:36	winhttp: get rid of the cert ignore flag This brings us back in line with the other transports.
1e0aa105	2014-09-16T03:22:09	ssh: expose both hashes The user may have the data hashed as MD5 or SHA-1, so we should provide both types for consumption.
286369a8	2014-09-16T02:27:16	ssh: provide our own types for host key lengths Instead of using the libssh2 defines, provide our own, which eases usage as we do not need to check whether libgit2 was built with libssh2 or not.
0782fc43	2014-09-16T01:47:30	net: use only structs to pass information about cert Instead of spreading the data in function arguments, some of which aren't used for ssh and having a struct only for ssh, use a struct for both, using a common parent to pass to the callback.
0fef3899	2014-09-16T01:25:53	Merge remote-tracking branch 'upstream/master' into cmn/host-cert-info
41698f22	2014-09-11T10:04:05	net: remove support for outright ignoring certificates This option make it easy to ignore anything about the server we're connecting to, which is bad security practice. This was necessary as we didn't use to expose detailed information about the certificate, but now that we do, we should get rid of this. If the user wants to ignore everything, they can still provide a callback which ignores all the information passed.
7c8acc54	2014-08-30T14:26:57	winhttp: set ignore security flags on user command If the user returns 0 from the certificate check and we had certificate issues, set the options to ignore certificate errors and resend the request.
67c84e06	2014-08-30T14:04:57	winhttp: bring together request sending We need to call WinHttpSendRequest() in three different places. Unify all in a single function to have a single place for the certificate check.
5f2cf732	2014-08-30T13:12:33	winhttp: only do certificate check for SSL If we're not using SSL, don't call the user's certificate check callback.
08545d36	2014-08-30T00:40:37	winhttp: credential check on successful connect On successful connection, still ask the user whether they accept the server's certificate, indicating that WinHTTP would let it though.
23ca0ad5	2014-08-29T21:25:13	Bring certificate check back to the normal return code Returning 0 lets the certificate check succeed. An error code is bubbled up to the user.
2f5864c5	2014-08-29T21:15:36	ssh: do ssh cert info before asking for credentials We know the host's key as soon as we connect, so we should perform the check as soon as we can, before we bother with the user's credentials.
17491f6e	2014-08-29T17:18:23	transport: always call the certificate check callback We should let the user decide whether to cancel the connection or not regardless of whether our checks have decided that the certificate is fine. We provide our own assessment to the callback to let the user fall back to our checks if they so desire.
ec1ce458	2014-08-10T17:06:53	http: send the DER-encoded cert to the callback Instead of the parsed data, we can ask OpenSSL to give us the DER-encoded version of the certificate, which the user can then parse and validate.
9b940586	2014-07-04T12:45:43	Provide a callback for certificate validation If the certificate validation fails (or always in the case of ssh), let the user decide whether to allow the connection. The data structure passed to the user is the native certificate information from the underlying implementation, namely OpenSSL or WinHTTP.
903a7616	2014-09-16T13:22:40	Merge pull request #2561 from jacquesg/merge-skip No files merged may result in bogus merge conflict error
52e9120c	2014-09-16T13:20:58	attr: Cleanup the containing dir logic
3b2cb2c9	2014-09-16T11:49:25	Factor 40 and 41 constants from source.
1fbeb2f0	2014-09-15T21:59:23	Fix attribute lookup in index for bare repos When using a bare repo with an index, libgit2 attempts to read files from the index. It caches those files based on the path to the file, specifically the path to the directory that contains the file. If there is no working directory, we use `git_path_dirname_r` to get the path to the containing directory. However, for the `.gitattributes` file in the root of the repository, this ends up normalizing the containing path to `"."` instead of the empty string and the lookup the `.gitattributes` data fails. This adds a test of attribute lookups on bare repos and also fixes the problem by simply rewriting `"."` to be `""`.
a7fcac13	2014-09-15T20:26:12	Merge pull request #2554 from linquize/fetch-head-tag When auto follow tags, FETCH_HEAD should list only newly followed tags
fdea219a	2014-09-10T18:28:19	global: free the error message when exiting a thread When we free the global state at thread termination, we must also free the error message in order not to leak the string once per thread.
dc68ee8d	2014-09-12T22:37:15	Remove local unused index_repo variable
a565f364	2014-09-12T22:53:56	Only check for workdir conflicts if the index has merged files Passing 0 as the length of the paths to check to git_diff_index_to_workdir results in all files being treated as conflicting, that is, all untracked or modified files in the worktree is reported as conflicting
76e3c43f	2014-09-10T18:13:34	signature: don't allow empty emails A signature is made up of a non-empty name and a non-empty email so let's validate that. This also brings us more in line with git, which also rejects ident with an empty email.
31e752b6	2014-09-09T12:52:36	Merge pull request #2511 from libgit2/cmn/remote-default-restrict Restrict which refs can be the default branch
d908351a	2014-09-05T22:31:53	When auto follow tags, FETCH_HEAD should list only newly followed tags
1e71354e	2014-09-05T03:24:43	reflog: Error handling on empty reflog
2dc399a8	2014-09-04T16:46:14	ssh: store error message immediately after a failed agent call When the call to the agent fails, we must retrieve the error message just after the function call, as other calls may overwrite it. As the agent authentication is the only one which has a teardown and there does not seem to be a way to get the error message from a stored error number, this tries to introduce some small changes to store the error from the agent. Clearing the error at the beginning of the loop lets us know whether the agent has already set the libgit2 error message and we should skip it, or if we should set it.
89e05e2a	2014-09-03T12:50:44	Merge pull request #2543 from libgit2/cmn/known-transports Clean up transport lookup
4c958046	2014-09-03T12:19:48	Merge pull request #2530 from libgit2/jamill/relative_gitlink Teach repository to use relative paths for git symbolic links
bc737620	2014-08-20T10:24:41	Introduce option to use relative paths for repository work directory Teach git_repository_init_ext to use relative paths for the gitlink to the work directory. This is used when creating a sub repository where the sub repository resides in the parent repository's .git directory.
0ee9f31c	2014-08-20T10:23:39	Introduce git_path_make_relative
5cd81bb3	2014-09-03T01:01:25	Several CppCat warnings fixed
15c30b72	2014-09-02T13:23:54	clone: handle overly restrictive refspecs When the fetch refspec does not include the remote's default branch, it indicates an error in user expectations or programmer error. Error out in that case. This lets us get rid of the dummy refspec which can never work as its zeroed out. In the cases where we did not find a default branch, we set HEAD detached immediately, which lets us refactor the "normal" path, removing `found_branch`.
e128a1af	2014-09-02T13:10:19	clone: correct handling of an unborn HEAD If the remote does not advertise HEAD, then it is unborn and we cannot checkout that branch. Handle it the same way as an empty repo.
ba67c075	2014-08-31T17:16:40	remote: get rid of git_remote_valid_url() It does the same as git_remote_supported_url() but has a name which implies we'd check the URL for correctness while we're simply looking at the scheme and looking it up in our lists. While here, fix up the tests so we check all the combination of what's supported.
bd3854a0	2014-08-31T17:12:45	transport: return ENOTFOUND for HTTPS and SSH when they're not supported The previous commit makes it harder to figure out if the library was built with support for a particular transport. Roll back some of the changes and remove ssh:// and https:// from the list if we're being built without support for them.
dbc77850	2014-08-31T16:48:41	transport: distinguish between unknown and unsupported transports Even when built without a SSH support, we know about this transport. It is implemented, but the current code makes us return an error message saying it's not. This is a leftover from the initial implementation of the transports when there were in fact transports we knew about but were not implemented. Instead, let the SSH transport itself say it cannot run, the same as we do for HTTPS.
46a13f32	2014-08-29T18:19:56	Merge pull request #2481 from libgit2/cmn/oidarray merge: expose multiple merge bases
46254467	2014-08-29T15:10:15	clone: support remotes with references but no branches A repository can have any number of references which we're not interested in such as notes or tags. For the default branch calculation we only care about branches. Make the decision about the number of branches rather than the number of refs in general.
0cdaa376	2014-08-10T17:50:46	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.
38952604	2014-07-14T20:29:53	remote: restrict default branch to branches namespace
d99c8ca1	2014-08-28T16:33:53	Merge pull request #2539 from libgit2/cmn/ahead-behind-order Fix ahead-behind results
05f0d0c1	2014-08-28T13:36:58	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.
69db8934	2014-08-27T19:19:55	Merge pull request #2538 from libgit2/ntk/propagate_url_parsing_error winhttp: Prevent swallowing of url parsing error
893cfe06	2014-08-27T19:18:46	Merge pull request #2502 from rnowosielski/remote_set_timeout Set timeout on remote (Add timeout for WinHttpReceiveResponse #2147)
1485c683	2014-08-27T18:02:10	Merge pull request #2490 from csware/ssh-wintunnel Allow to override default ssh transport_cb - in order to allow third party ssh transports
f0c53d21	2014-08-27T10:28:46	winhttp: Prevent swallowing of url parsing error
6a0d2b43	2014-08-27T15:09:07	Merge remote-tracking branch 'upstream/master' into cmn/ssh-retry
86d0a53c	2014-08-27T01:30:47	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
6a211d7c	2014-08-26T15:12:43	Refactor git_cache to use an rwlock This significantly reduces contention when many threads are trying to read from the cache simultaneously.
00e9ae5a	2014-08-26T17:48:20	Merge pull request #2508 from libgit2/rb/fix-ignore-slash-star Fix bugs with negative ignores inside an ignored parent directory
34e510ce	2014-07-30T01:41:43	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>
b3d3459f	2014-08-26T15:09:47	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.
844d226c	2014-08-25T23:06:34	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.
017c0eac	2014-08-25T22:41:07	merge base: Correctly raise an error if a non-commit object is passed.
5af52c62	2014-08-25T21:04:09	Merge pull request #2531 from libgit2/rb/mkdir-allow-parent-failures Allow mkdir helper to skip parent errors
2c1de697	2014-08-25T18:18:06	Merge pull request #2527 from jacquesg/refspec-crash Check if the refspec matches before transforming
2db71194	2014-07-24T04:15:24	Set timeout on remote (WinHTTP) to infinite #2147
668ae2dd	2014-08-22T10:05:09	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.
8f6073f6	2014-08-21T18:53:43	Check that the refspec matches before modifying the out buffer
d28b2b7a	2014-08-18T15:18:59	Merge pull request #2528 from libgit2/vmg/tostr_s Export `git_oid_tostr_s` instead of `_allocfmt`
4ca0b566	2014-08-18T12:41:06	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.
4e53c280	2014-08-17T14:55:06	Check if the refspec matches before transforming
294c6f29	2014-08-16T22:12:13	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.
dc8adda4	2014-08-15T22:51:19	git_remote_ls() should return an error if the transport is not available
23135afa	2014-08-14T11:52:20	Introduce proper http authentication API
315cb38e	2014-07-31T18:43:20	Add GSSAPI support for SPNEGO/Kerberos auth over HTTP
e003f83a	2014-07-31T15:14:56	Introduce git_buf_decode_base64 Decode base64-encoded text into a git_buf
40867266	2014-07-31T18:39:58	Perform HTTP keep-alive
c180c065	2014-07-09T17:58:39	Custom transport: minor cleanups * Move the transport registration mechanisms into a new header under 'sys/' because this is advanced stuff. * Remove the 'priority' argument from the registration as it adds unnecessary complexity. (Since transports cannot decline to operate, only the highest priority transport is ever executed.) Users who require per-priority transports can implement that in their custom transport themselves. * Simplify registration further by taking a scheme (eg "http") instead of a prefix (eg "http://").
e62f96de	2014-08-13T14:55:24	Allow NULL error message prefix when class=GITERR_OS
9dac1f95	2014-08-09T10:56:50	config: a multiline var can start immediately In the check for multiline, we traverse the backslashes from the end backwards and int the end assert that we haven't gone past the beginning of the line. We make sure of this in the loop condition, but we also check in the return value. However, for certain configurations, a line in a multiline variable might be empty to aid formatting. In that case, 'end' == 'start', since we ended up looking at the first char which made it a multiline. There is no need for the (end > start) check in the return, since the loop guarantees we won't go further back than the first char in the line, and we do accept the first char to be the final backslash. This fixes #2483.
bb9e6028	2014-08-09T00:35:08	Merge pull request #2507 from libgit2/rb/timer-typo Typo in timer constants
a0cacc82	2014-08-08T15:18:40	For negative matches, always use leading dir match
f25bc0b2	2014-08-08T14:51:36	Fix rejection of parent dir of negated ignores While scanning through a directory hierarchy, this prevents a positive ignore match on a parent directory from blocking the scan of a directory when a negative match rule exists for files inside the directory.
f18234fa	2014-08-08T13:17:50	Don't report status on named pipes Git skips entries in directories that are not S_ISDIR, S_ISREG, or S_ISLNK, so let's make libgit2 do the same thing.

1f501a08

2014-09-30T04:58:02

describe: rename _object() to _commit() We don't describe arbitrary object, so let's give it the name of the one object type we accept.

af6cc38f

2014-09-30T04:38:05

Merge remote-tracking branch 'upstream/master' into cmn/describe

4c534892

2014-09-29T14:57:54

Merge pull request #2581 from jacquesg/stash-ignored-directories Stash ignored directories

89602a1a

2014-09-29T10:39:40

Merge pull request #2584 from jacquesg/pool-alignment Pool/Index data is not aligned

ffe34a7c

2014-09-29T10:37:37

Merge pull request #2582 from swansontec/master Correctly handle getaddrinfo return result

ced843f4

2014-09-29T10:29:00

Merge pull request #2559 from libgit2/cmn/free-tls-error global: free the error message when exiting a thread

7b7aa75f

2014-09-24T13:24:39

Recurse ignored directories when stashing

5387cfee

2014-09-25T15:29:35

Ensure patch is initialized to zero, otherwise, the allocated flag may be set

e640a77c

2014-09-25T15:29:03

Silence uninitialized warning

ff97778a

2014-09-25T13:07:36

The raw index buffer content is not guaranteed to be aligned * Ensure alignment by copying the content into a structure on the stack

ad8c8d93

2014-09-25T12:05:48

Ensure pool data is aligned on an 8 byte boundary

3aaa5c7b

2014-09-25T12:05:26

Introduce GIT_ALIGN

d0cf1040

2014-09-24T12:01:14

Correctly handle getaddrinfo return result The getaddrinfo function indicates failure with a non-zero return code, but this code is not necessarily negative. On platforms like Android where the code is positive, a failed call causes libgit2 to segfault.

14556cbf

2014-09-17T17:13:25

Merge pull request #2567 from cirosantilli/factor-41 Factor 40 and 41 constants from source.

276d9ea3

2014-09-17T15:39:57

Merge pull request #2571 from libgit2/vmg/walk-up-path Fix `git_path_walk_up` to work with non-rooted paths

74240afb

2014-09-17T15:35:50

repository: Do not double-free config

4592b62e

2014-09-17T15:26:48

Merge pull request #2572 from cirosantilli/factor-void Replace void casts with GIT_UNUSED.

4e964117

2014-09-17T15:24:56

Style

a2b4407d

2014-09-17T15:23:17

attr: Do not walk path if we're at the root

c5cf8cad

2014-09-17T15:19:08

Replace void casts with GIT_UNUSED.

bbb988a5

2014-09-17T14:52:31

path: Fix `git_path_walk_up` to work with non-rooted paths

1312f87b

2014-09-17T14:56:39

Merge pull request #2464 from libgit2/cmn/host-cert-info Provide a callback for certificate validation

25abbc27

2014-09-17T03:19:40

Clean up some leaks in the test suite

4fe5b771

2014-09-16T13:35:36

winhttp: get rid of the cert ignore flag This brings us back in line with the other transports.

1e0aa105

2014-09-16T03:22:09

ssh: expose both hashes The user may have the data hashed as MD5 or SHA-1, so we should provide both types for consumption.

286369a8

2014-09-16T02:27:16

ssh: provide our own types for host key lengths Instead of using the libssh2 defines, provide our own, which eases usage as we do not need to check whether libgit2 was built with libssh2 or not.

0782fc43

2014-09-16T01:47:30

net: use only structs to pass information about cert Instead of spreading the data in function arguments, some of which aren't used for ssh and having a struct only for ssh, use a struct for both, using a common parent to pass to the callback.

0fef3899

2014-09-16T01:25:53

Merge remote-tracking branch 'upstream/master' into cmn/host-cert-info

41698f22

2014-09-11T10:04:05

net: remove support for outright ignoring certificates This option make it easy to ignore anything about the server we're connecting to, which is bad security practice. This was necessary as we didn't use to expose detailed information about the certificate, but now that we do, we should get rid of this. If the user wants to ignore everything, they can still provide a callback which ignores all the information passed.

7c8acc54

2014-08-30T14:26:57

winhttp: set ignore security flags on user command If the user returns 0 from the certificate check and we had certificate issues, set the options to ignore certificate errors and resend the request.

67c84e06

2014-08-30T14:04:57

winhttp: bring together request sending We need to call WinHttpSendRequest() in three different places. Unify all in a single function to have a single place for the certificate check.

5f2cf732

2014-08-30T13:12:33

winhttp: only do certificate check for SSL If we're not using SSL, don't call the user's certificate check callback.

08545d36

2014-08-30T00:40:37

winhttp: credential check on successful connect On successful connection, still ask the user whether they accept the server's certificate, indicating that WinHTTP would let it though.

23ca0ad5

2014-08-29T21:25:13

Bring certificate check back to the normal return code Returning 0 lets the certificate check succeed. An error code is bubbled up to the user.

2f5864c5

2014-08-29T21:15:36

ssh: do ssh cert info before asking for credentials We know the host's key as soon as we connect, so we should perform the check as soon as we can, before we bother with the user's credentials.

17491f6e

2014-08-29T17:18:23

transport: always call the certificate check callback We should let the user decide whether to cancel the connection or not regardless of whether our checks have decided that the certificate is fine. We provide our own assessment to the callback to let the user fall back to our checks if they so desire.

ec1ce458

2014-08-10T17:06:53

http: send the DER-encoded cert to the callback Instead of the parsed data, we can ask OpenSSL to give us the DER-encoded version of the certificate, which the user can then parse and validate.

9b940586

2014-07-04T12:45:43

Provide a callback for certificate validation If the certificate validation fails (or always in the case of ssh), let the user decide whether to allow the connection. The data structure passed to the user is the native certificate information from the underlying implementation, namely OpenSSL or WinHTTP.

903a7616

2014-09-16T13:22:40

Merge pull request #2561 from jacquesg/merge-skip No files merged may result in bogus merge conflict error

52e9120c

2014-09-16T13:20:58

attr: Cleanup the containing dir logic

3b2cb2c9

2014-09-16T11:49:25

Factor 40 and 41 constants from source.

1fbeb2f0

2014-09-15T21:59:23

Fix attribute lookup in index for bare repos When using a bare repo with an index, libgit2 attempts to read files from the index. It caches those files based on the path to the file, specifically the path to the directory that contains the file. If there is no working directory, we use `git_path_dirname_r` to get the path to the containing directory. However, for the `.gitattributes` file in the root of the repository, this ends up normalizing the containing path to `"."` instead of the empty string and the lookup the `.gitattributes` data fails. This adds a test of attribute lookups on bare repos and also fixes the problem by simply rewriting `"."` to be `""`.

a7fcac13

2014-09-15T20:26:12

Merge pull request #2554 from linquize/fetch-head-tag When auto follow tags, FETCH_HEAD should list only newly followed tags

fdea219a

2014-09-10T18:28:19

global: free the error message when exiting a thread When we free the global state at thread termination, we must also free the error message in order not to leak the string once per thread.

dc68ee8d

2014-09-12T22:37:15

Remove local unused index_repo variable

a565f364

2014-09-12T22:53:56

Only check for workdir conflicts if the index has merged files Passing 0 as the length of the paths to check to git_diff_index_to_workdir results in all files being treated as conflicting, that is, all untracked or modified files in the worktree is reported as conflicting

76e3c43f

2014-09-10T18:13:34

signature: don't allow empty emails A signature is made up of a non-empty name and a non-empty email so let's validate that. This also brings us more in line with git, which also rejects ident with an empty email.

31e752b6

2014-09-09T12:52:36

Merge pull request #2511 from libgit2/cmn/remote-default-restrict Restrict which refs can be the default branch

d908351a

2014-09-05T22:31:53

When auto follow tags, FETCH_HEAD should list only newly followed tags

1e71354e

2014-09-05T03:24:43

reflog: Error handling on empty reflog

2dc399a8

2014-09-04T16:46:14

ssh: store error message immediately after a failed agent call When the call to the agent fails, we must retrieve the error message just after the function call, as other calls may overwrite it. As the agent authentication is the only one which has a teardown and there does not seem to be a way to get the error message from a stored error number, this tries to introduce some small changes to store the error from the agent. Clearing the error at the beginning of the loop lets us know whether the agent has already set the libgit2 error message and we should skip it, or if we should set it.

89e05e2a

2014-09-03T12:50:44

Merge pull request #2543 from libgit2/cmn/known-transports Clean up transport lookup

4c958046

2014-09-03T12:19:48

Merge pull request #2530 from libgit2/jamill/relative_gitlink Teach repository to use relative paths for git symbolic links

bc737620

2014-08-20T10:24:41

Introduce option to use relative paths for repository work directory Teach git_repository_init_ext to use relative paths for the gitlink to the work directory. This is used when creating a sub repository where the sub repository resides in the parent repository's .git directory.

0ee9f31c

2014-08-20T10:23:39

Introduce git_path_make_relative

5cd81bb3

2014-09-03T01:01:25

Several CppCat warnings fixed

15c30b72

2014-09-02T13:23:54

clone: handle overly restrictive refspecs When the fetch refspec does not include the remote's default branch, it indicates an error in user expectations or programmer error. Error out in that case. This lets us get rid of the dummy refspec which can never work as its zeroed out. In the cases where we did not find a default branch, we set HEAD detached immediately, which lets us refactor the "normal" path, removing `found_branch`.

e128a1af

2014-09-02T13:10:19

clone: correct handling of an unborn HEAD If the remote does not advertise HEAD, then it is unborn and we cannot checkout that branch. Handle it the same way as an empty repo.

ba67c075

2014-08-31T17:16:40

remote: get rid of git_remote_valid_url() It does the same as git_remote_supported_url() but has a name which implies we'd check the URL for correctness while we're simply looking at the scheme and looking it up in our lists. While here, fix up the tests so we check all the combination of what's supported.

bd3854a0

2014-08-31T17:12:45

transport: return ENOTFOUND for HTTPS and SSH when they're not supported The previous commit makes it harder to figure out if the library was built with support for a particular transport. Roll back some of the changes and remove ssh:// and https:// from the list if we're being built without support for them.

dbc77850

2014-08-31T16:48:41

transport: distinguish between unknown and unsupported transports Even when built without a SSH support, we know about this transport. It is implemented, but the current code makes us return an error message saying it's not. This is a leftover from the initial implementation of the transports when there were in fact transports we knew about but were not implemented. Instead, let the SSH transport itself say it cannot run, the same as we do for HTTPS.

46a13f32

2014-08-29T18:19:56

Merge pull request #2481 from libgit2/cmn/oidarray merge: expose multiple merge bases

46254467

2014-08-29T15:10:15

clone: support remotes with references but no branches A repository can have any number of references which we're not interested in such as notes or tags. For the default branch calculation we only care about branches. Make the decision about the number of branches rather than the number of refs in general.

0cdaa376

2014-08-10T17:50:46

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.

38952604

2014-07-14T20:29:53

remote: restrict default branch to branches namespace

d99c8ca1

2014-08-28T16:33:53

Merge pull request #2539 from libgit2/cmn/ahead-behind-order Fix ahead-behind results

05f0d0c1

2014-08-28T13:36:58

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.

69db8934

2014-08-27T19:19:55

Merge pull request #2538 from libgit2/ntk/propagate_url_parsing_error winhttp: Prevent swallowing of url parsing error

893cfe06

2014-08-27T19:18:46

Merge pull request #2502 from rnowosielski/remote_set_timeout Set timeout on remote (Add timeout for WinHttpReceiveResponse #2147)

1485c683

2014-08-27T18:02:10

Merge pull request #2490 from csware/ssh-wintunnel Allow to override default ssh transport_cb - in order to allow third party ssh transports

f0c53d21

2014-08-27T10:28:46

winhttp: Prevent swallowing of url parsing error

6a0d2b43

2014-08-27T15:09:07

Merge remote-tracking branch 'upstream/master' into cmn/ssh-retry

86d0a53c

2014-08-27T01:30:47

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

6a211d7c

2014-08-26T15:12:43

Refactor git_cache to use an rwlock This significantly reduces contention when many threads are trying to read from the cache simultaneously.

00e9ae5a

2014-08-26T17:48:20

Merge pull request #2508 from libgit2/rb/fix-ignore-slash-star Fix bugs with negative ignores inside an ignored parent directory

34e510ce

2014-07-30T01:41:43

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>

b3d3459f

2014-08-26T15:09:47

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.

844d226c

2014-08-25T23:06:34

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.

017c0eac

2014-08-25T22:41:07

merge base: Correctly raise an error if a non-commit object is passed.

5af52c62

2014-08-25T21:04:09

Merge pull request #2531 from libgit2/rb/mkdir-allow-parent-failures Allow mkdir helper to skip parent errors

2c1de697

2014-08-25T18:18:06

Merge pull request #2527 from jacquesg/refspec-crash Check if the refspec matches before transforming

2db71194

2014-07-24T04:15:24

Set timeout on remote (WinHTTP) to infinite #2147

668ae2dd

2014-08-22T10:05:09

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.

8f6073f6

2014-08-21T18:53:43

Check that the refspec matches before modifying the out buffer

d28b2b7a

2014-08-18T15:18:59

Merge pull request #2528 from libgit2/vmg/tostr_s Export `git_oid_tostr_s` instead of `_allocfmt`

4ca0b566

2014-08-18T12:41:06

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.

4e53c280

2014-08-17T14:55:06

Check if the refspec matches before transforming

294c6f29

2014-08-16T22:12:13

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.

dc8adda4

2014-08-15T22:51:19

git_remote_ls() should return an error if the transport is not available

23135afa

2014-08-14T11:52:20

Introduce proper http authentication API

315cb38e

2014-07-31T18:43:20

Add GSSAPI support for SPNEGO/Kerberos auth over HTTP

e003f83a

2014-07-31T15:14:56

Introduce git_buf_decode_base64 Decode base64-encoded text into a git_buf

40867266

2014-07-31T18:39:58

Perform HTTP keep-alive

c180c065

2014-07-09T17:58:39

Custom transport: minor cleanups * Move the transport registration mechanisms into a new header under 'sys/' because this is advanced stuff. * Remove the 'priority' argument from the registration as it adds unnecessary complexity. (Since transports cannot decline to operate, only the highest priority transport is ever executed.) Users who require per-priority transports can implement that in their custom transport themselves. * Simplify registration further by taking a scheme (eg "http") instead of a prefix (eg "http://").

e62f96de

2014-08-13T14:55:24

Allow NULL error message prefix when class=GITERR_OS

9dac1f95

2014-08-09T10:56:50

config: a multiline var can start immediately In the check for multiline, we traverse the backslashes from the end backwards and int the end assert that we haven't gone past the beginning of the line. We make sure of this in the loop condition, but we also check in the return value. However, for certain configurations, a line in a multiline variable might be empty to aid formatting. In that case, 'end' == 'start', since we ended up looking at the first char which made it a multiline. There is no need for the (end > start) check in the return, since the loop guarantees we won't go further back than the first char in the line, and we do accept the first char to be the final backslash. This fixes #2483.

bb9e6028

2014-08-09T00:35:08

Merge pull request #2507 from libgit2/rb/timer-typo Typo in timer constants

a0cacc82

2014-08-08T15:18:40

For negative matches, always use leading dir match

f25bc0b2

2014-08-08T14:51:36

Fix rejection of parent dir of negated ignores While scanning through a directory hierarchy, this prevents a positive ignore match on a parent directory from blocking the scan of a directory when a negative match rule exists for files inside the directory.

f18234fa

2014-08-08T13:17:50

Don't report status on named pipes Git skips entries in directories that are not S_ISDIR, S_ISREG, or S_ISLNK, so let's make libgit2 do the same thing.

thodg/libgit2/src

src

Log