kmx git

Commit	Date	Message
a2e6e0ea	2018-11-06T14:15:43	transport: allow cred/cert callbacks to return GIT_PASSTHROUGH Allow credential and certificate checking callbacks to return GIT_PASSTHROUGH, indicating that they do not want to act. Introduce this to support in both the http and ssh callbacks. Additionally, enable the same mechanism for certificate validation. This is most useful to disambiguate any meaning in the publicly exposed credential and certificate functions (`git_transport_smart_credentials` and `git_transport_smart_certificate_check`) but it may be more generally useful for callers to be able to defer back to libgit2.
c3077ea0	2018-06-25T21:24:49	apply: return a specific exit code on failure Return `GIT_EAPPLYFAIL` on patch application failure so that users can determine that patch application failed due to a malformed/conflicting patch by looking at the error code.
7edc1c87	2018-08-30T12:51:05	Merge pull request #4788 from tiennou/doc-fixes Documentation fixes
7765c0a9	2018-08-29T21:56:26	doc: fix comment on GIT_EUSER
c0b2e525	2018-08-27T09:23:02	Add two words to clarify
4bd2a508	2018-08-20T13:51:28	Update giterr_last API documentation to reflect real behaviour
787768c2	2018-06-22T19:07:54	index: return a unique error code on dirty index When the index is dirty, return GIT_EINDEXDIRTY so that consumers can identify the exact problem programatically.
28a0741f	2017-04-10T09:30:08	odb: verify object hashes The upstream git.git project verifies objects when looking them up from disk. This avoids scenarios where objects have somehow become corrupt on disk, e.g. due to hardware failures or bit flips. While our mantra is usually to follow upstream behavior, we do not do so in this case, as we never check hashes of objects we have just read from disk. To fix this, we create a new error class `GIT_EMISMATCH` which denotes that we have looked up an object with a hashsum mismatch. `odb_read_1` will then, after having read the object from its backend, hash the object and compare the resulting hash to the expected hash. If hashes do not match, it will return an error. This obviously introduces another computation of checksums and could potentially impact performance. Note though that we usually perform I/O operations directly before doing this computation, and as such the actual overhead should be drowned out by I/O. Running our test suite seems to confirm this guess. On a Linux system with best-of-five timings, we had 21.592s with the check enabled and 21.590s with the ckeck disabled. Note though that our test suite mostly contains very small blobs only. It is expected that repositories with bigger blobs may notice an increased hit by this check. In addition to a new test, we also had to change the odb::backend::nonrefreshing test suite, which now triggers a hashsum mismatch when looking up the commit "deadbeef...". This is expected, as the fake backend allocated inside of the test will return an empty object for the OID "deadbeef...", which will obviously not hash back to "deadbeef..." again. We can simply adjust the hash to equal the hash of the empty object here to fix this test.
cc8d9a29	2017-04-01T10:44:17	win32: introduce `do_with_retries` macro Provide a macro that will allow us to run a function with posix-like return values multiple times in a retry loop, with an optional cleanup function called between invocations.
2dfd1294	2017-02-24T13:34:01	hash: include sha1collisiondetection Include the SHA1 collision attack detection library from https://github.com/cr-marcstevens/sha1collisiondetection
372dc9ff	2015-10-21T13:49:55	worktree: implement `git_worktree_validate` Add a new function that checks wether a given `struct git_worktree` is valid. The validation includes checking if the gitdir, parent directory and common directory are present.
7cb904ba	2014-04-01T23:58:59	Introduce git_apply_patch The beginnings of patch application from an existing (diff-created) git_patch object: applies the hunks of a git_patch to a buffer.
cd59e0c0	2016-02-23T13:05:49	giterr_set_str: remove `GITERR_OS` documentation The `giterr_set_str` does not actually honor `GITERR_OS`. Remove the documentation that claims that we do.
8683d31f	2015-10-22T14:39:20	merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT.
25dbcf34	2015-07-27T09:59:07	Make giterr_detach no longer public
8a52ed7a	2015-07-11T18:51:36	errors: add EDIRECTORY This is to be returned when the operation which the user asked for is not possible to do on a directory.
82b1c93d	2015-06-20T13:44:22	stash: don't allow apply with staged changes
189aad45	2015-06-24T19:32:07	errors: introduce EINVALID We've been using EINVALIDSPEC for a while to mean this, but that name is too specific. Introduce this to be more explicit.
885b94aa	2015-05-28T15:26:13	Rename GIT_EMERGECONFLICT to GIT_ECONFLICT We do not error on "merge conflicts"; on the contrary, merge conflicts are a normal part of merging. We only error on "checkout conflicts", where a change exists in the index or the working directory that would otherwise be overwritten by performing the checkout. This may happen during merge (after the production of the new index that we're going to checkout) but it could happen during any checkout.
1396c381	2015-05-18T16:04:55	errors: add GIT_EEOF to indicate early EOF This can be used by tools to show mesages about failing to communicate with the server. The error message in this case will often contain the server's error message, as far as it managed to send anything.
fe598f09	2015-01-13T11:18:02	mkdir: walk up tree to mkdir Walk up the tree to mkdir, which is less immediately efficient, but allows us to look at intermediate directories that may need attention.
753e17b0	2014-11-19T18:42:29	peel: reject bad queries with EINVALIDSPEC There are some combination of objects and target types which we know cannot be fulfilled. Return EINVALIDSPEC for those to signify that there is a mismatch in the user-provided data and what the object model is capable of satisfying. If we start at a tag and in the course of peeling find out that we cannot reach a particular type, we return EPEEL.
93a7004c	2014-07-18T14:50:06	git_rebase_commit: drop already-picked commits Already cherry-picked commits should not be re-included. If all changes included in a commit exist in the upstream, then we should error with GIT_EAPPLIED.
867a36f3	2014-07-14T14:35:01	Introduce git_rebase to set up a rebase session Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.
af6cc38f	2014-09-30T04:38:05	Merge remote-tracking branch 'upstream/master' into cmn/describe
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.
8873728f	2014-06-16T19:10:04	Introduce GIT_EAUTH Introduce this error code to signal an authentication failure.
31b0cb51	2014-05-22T17:16:21	Fixed miscellaneous documentation errors.
86c9d3da	2014-05-21T22:54:34	Return GIT_FILEMODE_UNREADABLE for files that fail to stat.
90553479	2014-05-20T17:40:28	Rename GIT_ENOACCESS -> GIT_EUNREADABLE
158c8ba1	2014-05-15T16:54:46	Return a specific error for EACCES.
3a728fb5	2012-11-13T16:35:24	object: introduce git_describe_object()
4d7b9939	2014-04-01T22:18:19	Added cherry-pick support
fc4728e3	2014-01-29T14:07:18	refs: return GIT_EMODIFIED if the ref target moved In case we loose the race to update the reference, return GIT_EMODIFIED to let the user distinguish it from other types of errors.
373cf6a9	2013-12-09T10:17:47	Update docs for new callback return value behavior
25e0b157	2013-12-06T15:07:57	Remove converting user error to GIT_EUSER This changes the behavior of callbacks so that the callback error code is not converted into GIT_EUSER and instead we propagate the return value through to the caller. Instead of using the giterr_capture and giterr_restore functions, we now rely on all functions to pass back the return value from a callback. To avoid having a return value with no error message, the user can call the public giterr_set_str or some such function to set an error message. There is a new helper 'giterr_set_callback' that functions can invoke after making a callback which ensures that some error message was set in case the callback did not set one. In places where the sign of the callback return value is meaningful (e.g. positive to skip, negative to abort), only the negative values are returned back to the caller, obviously, since the other values allow for continuing the loop. The hardest parts of this were in the checkout code where positive return values were overloaded as meaningful values for checkout. I fixed this by adding an output parameter to many of the internal checkout functions and removing the overload. This added some code, but it is probably a better implementation. There is some funkiness in the network code where user provided callbacks could be returning a positive or a negative value and we want to rely on that to cancel the loop. There are still a couple places where an user error might get turned into GIT_EUSER there, I think, though none exercised by the tests.
96869a4e	2013-12-03T16:45:39	Improve GIT_EUSER handling This adds giterr_user_cancel to return GIT_EUSER and clear any error message that is sitting around. As a result of using that in places, we need to be more thorough with capturing errors that happen inside a callback when used internally. To help with that, this also adds giterr_capture and giterr_restore so that when we internally use a foreach-type function that clears errors and converts them to GIT_EUSER, it is easier to restore not just the return value, but the actual error message text.
300d192f	2013-12-02T11:15:27	Introduce git_revert to revert a single commit
1eab9f0e	2013-11-05T14:56:10	error: Simplify giterr_detach
d6c60169	2013-11-04T15:45:31	Add giterr_detach API to get and clear error There are a number of cases where it is convenient to be able to fetch and "claim" the current error string, clearing the error. This is helpful when you need to call some code that may alter the error and you want to restore it later on and/or report it via some other mechanism.
974774c7	2013-09-09T16:57:34	Add attributes to filters and fix registry The filter registry as implemented was too primitive to actually work once multiple filters were coming into play. This expands the implementation of the registry to handle multiple prioritized filters correctly. Additionally, this adds an "attributes" field to a filter that makes it really really easy to implement filters that are based on one or more attribute values. The lookup and even simple value checking can all happen automatically without custom filter code. Lastly, with the registry improvements, this fills out the filter lifecycle callbacks, with initialize and shutdown callbacks that will be called before the filter is first used and after it is last invoked. This allows for system-wide initialization and cleanup by the filter.
efc9e670	2013-09-17T03:45:35	Merge pull request #1856 from libgit2/cmn/no-orphans No such thing as an orphan branch
605da51a	2013-09-17T09:50:30	No such thing as an orphan branch Unfortunately git-core uses the term "unborn branch" and "orphan branch" interchangeably. However, "orphan" is only really there for the checkout command, which has the `--orphan` option so it doesn't actually create the branch. Branches never have parents, so the distinction of a branch with no parents is odd to begin with. Crucially, the error messages deal with unborn branches, so let's use that.
b622aabe	2013-08-09T13:14:06	Add a wrapper to provide the libssh2 error message
3d276874	2013-08-19T10:30:44	index: report when it's locked Report the index being locked with its own error code in order to be able to differentiate, as a locked index is typically the result of a crashed process or concurrent access, both of which often require user intervention to fix.
e1967164	2013-06-24T15:33:41	Fixed most documentation header bugs Fixed a few header @param and @return typos with the help of -Wdocumentation in Xcode. The following warnings have not been fixed: common.h:213 - Not sure how the documentation format is for '...' notes.h:102 - Correct @param name but empty text notes.h:111 - Correct @param name but empty text pack.h:140 - @return missing text pack.h:148 - @return missing text
0f1f9833	2013-05-24T10:32:07	Add typedefs on some public enums Apparently this makes things easier to bind in some languages.
635c235c	2013-01-10T12:11:49	errors: Introduce EMERGECONFLICT error code
359fc2d2	2013-01-08T17:07:25	update copyrights
5a62d659	2013-01-03T12:44:09	MERGE_HEAD contents iterator
42e50b5e	2013-01-03T12:44:09	MERGE_HEAD contents iterator
7fcec834	2012-12-11T22:31:21	fetchhead reading/iterating
8b50935a	2012-11-12T11:29:48	errors: Introduce EINVALIDSPEC error code
613d5eb9	2012-11-28T11:42:37	Push! By schu, phkelley, and congyiwu, et al
ad9a921b	2012-11-08T17:05:07	Rework checkout with new strategy options This is a major reworking of checkout strategy options. The checkout code is now sensitive to the contents of the HEAD tree and the new options allow you to update the working tree so that it will match the index content only when it previously matched the contents of the HEAD. This allows you to, for example, to distinguish between removing files that are in the HEAD but not in the index, vs just removing all untracked files. Because of various corner cases that arise, etc., this required some additional capabilities in rmdir and other utility functions. This includes the beginnings of an implementation of code to read a partial tree into the index based on a pathspec, but that is not enabled because of the possibility of creating conflicting index entries.
eb44cfe0	2012-10-08T15:49:31	error: add GITERR_STASH error type
03bdb2ad	2012-10-23T16:32:01	GIT_EUNMERGED
c4f68b35	2012-10-19T11:04:32	errors: introduce GIT_EORPHANEDHEAD
0a32dca5	2012-08-19T22:26:32	gsoc-pack-objects WIP
1a628100	2012-09-21T15:04:39	Make giterr_set_str public There has been discussion for a while about making some set of the `giterr_set` type functions part of the public API for code that is implementing new backends to libgit2. This makes the `giterr_set_str()` and `giterr_set_oom()` functions public.
bb2d305c	2012-08-22T10:47:25	errors: introduce GIT_EBAREREPO
f335ecd6	2012-08-30T14:24:16	Diff iterators This refactors the diff output code so that an iterator object can be used to traverse and generate the diffs, instead of just the `foreach()` style with callbacks. The code has been rearranged so that the two styles can still share most functions. This also replaces `GIT_REVWALKOVER` with `GIT_ITEROVER` and uses that as a common error code for marking the end of iteration when using a iterator style of object.
aa13bf05	2012-08-02T13:00:58	Major submodule rewrite This replaces the old submodule API with a new extended API that supports most of the things that can be done with `git submodule`.
5dca2010	2012-08-03T17:08:01	Update iterators for consistency across library This updates all the `foreach()` type functions across the library that take callbacks from the user to have a consistent behavior. The rules are: * A callback terminates the loop by returning any non-zero value * Once the callback returns non-zero, it will not be called again (i.e. the loop stops all iteration regardless of state) * If the callback returns non-zero, the parent fn returns GIT_EUSER * Although the parent returns GIT_EUSER, no error will be set in the library and `giterr_last()` will return NULL if called. This commit makes those changes across the library and adds tests for most of the iteration APIs to make sure that they follow the above rules.
798e4d53	2012-06-22T21:25:17	amigaos: Cleanup
51975727	2012-06-07T23:13:39	Fix double-defines when using GIT_OLD_ERRORS
dbb36e1b	2012-05-17T17:56:49	ssl: check certificates against the system's trusted CAs
904b67e6	2012-05-18T01:48:50	errors: Rename error codes
e172cf08	2012-05-18T01:21:06	errors: Rename the generic return codes
fe3bcf7d	2012-05-11T12:20:19	errors: Remove old comments
73d87a09	2012-05-15T21:42:01	Introduce GITERR_INDEXER
3fbcac89	2012-05-02T19:56:38	Remove old and unused error codes
3aa351ea	2012-04-26T15:05:07	error handling: move the missing parts over to the new error handling
4376f7f6	2012-03-06T08:12:35	error-handling: remote, transport
73fe6a8e	2012-03-28T18:59:12	error-handling: Commit (WIP)
7c7ff7d1	2012-03-19T16:10:11	Migrate index, oid, and utils to new errors This includes a few cleanups that came up while converting these files. This commit introduces a could new git error classes, including the catchall class: GITERR_INVALID which I'm using as the class for invalid and out of range values which are detected at too low a level of library to use a higher level classification. For example, an overflow error in parsing an integer or a bad letter in parsing an OID string would generate an error in this class.
e3c47510	2012-03-13T14:23:24	Resolve comments from pull request This converts the map validation function into a macro, tweaks the GITERR_OS system error automatic appending, and adds a tentative new error access API and some quick unit tests for both the old and new error APIs.
e1de726c	2012-03-12T22:55:40	Migrate ODB files to new error handling This migrates odb.c, odb_loose.c, odb_pack.c and pack.c to the new style of error handling. Also got the unix and win32 versions of map.c. There are some minor changes to other files but no others were completely converted. This also contains an update to filebuf so that a zeroed out filebuf will not think that the fd (== 0) is actually open (and inadvertently call close() on fd 0 if cleaned up). Lastly, this was built and tested on win32 and contains a bunch of fixes for the win32 build which was pretty broken.
dda708e7	2012-03-09T19:55:50	error-handling: On-disk config file backend Includes: - Proper error reporting when encountering syntax errors in a config file (file, line number, column). - Rewritten `config_write`, now with 99% less goto-spaghetti - Error state in `git_filebuf`: filebuf write functions no longer need to be checked for error returns. If any of the writes performed on a buffer fail, the last call to `git_filebuf_commit` or `git_filebuf_hash` will fail accordingly and set the appropiate error message. Baller!
e54d8d89	2012-03-07T01:37:09	error-handling: Config
cb8a7961	2012-03-07T00:02:55	error-handling: Repository This also includes droping `git_buf_lasterror` because it makes no sense in the new system. Note that in most of the places were it has been dropped, the code needs cleanup. I.e. GIT_ENOMEM is going away, so instead it should return a generic `-1` and obviously not throw anything.
1a481123	2012-02-17T00:13:34	error-handling: References Yes, this is error handling solely for `refs.c`, but some of the abstractions leak all ofer the code base.
45d387ac	2012-02-15T16:54:17	refs: Error handling rework. WIP
60bc2d20	2012-02-14T21:23:11	error-handling: Add new routines Obviously all the old throw routines are still in place, so we can gradually port over.
5e0de328	2012-02-13T17:10:24	Update Copyright header Signed-off-by: schu <schu-github@schulog.org>
87d9869f	2011-09-19T03:34:49	Tabify everything There were quite a few places were spaces were being used instead of tabs. Try to catch them all. This should hopefully not break anything. Except for `git blame`. Oh well.
bb742ede	2011-09-19T01:54:32	Cleanup legal data 1. The license header is technically not valid if it doesn't have a copyright signature. 2. The COPYING file has been updated with the different licenses used in the project. 3. The full GPLv2 header in each file annoys me.
f12aa9dc	2011-07-05T04:31:37	Merge pull request #300 from carlosmn/gsoc2011/master A bit of networking
ab7941b5	2011-06-28T21:04:59	test: Properly show error messages
7632e249	2011-06-13T23:01:12	Correctly handle network input Add a parameter to git_pkt_parse_line to tell it how much data you have in your buffer. If the buffer is too short, it returns an error saying so. Adapt the git transport to use this and fix the offset calculation. Add the GIT_ESHORTBUFFER error code.
63f91e1c	2011-06-22T16:52:30	Add git.git's fnmatch, which is really GNU's and the git__fnmatch wrapper If the strings match, git__fnmatch returns GIT_SUCCESS and GIT_ENOMATCH on failure to match. MSVC fixes: Added a test for _MSC_VER and (in that case) defined HAVE_STRING_H to 1 so it doesn't try to include <strings.h> which doesn't exist in the MSVC world. Moved the function declarations to use the modern inline ones so MSVC doesn't have a fit. Added casts everywhere so MSVC doesn't crap its pants. Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
984ed6b6	2011-06-19T12:48:16	odb: Add GIT_EPASSTHROUGH Allows a custom user backend to passthrough one of the callbacks. Used for e.g. caching backends.
53c0bd81	2011-05-27T22:37:10	Added error for ambiguous oid prefixes. Added methods to compare the first nth hexadecimal characters (i.e. packets of 4 bits) of OIDs.
f87d9beb	2011-05-15T23:46:39	Change error codes from DEFINEs to an enum
f31bd03f	2011-05-13T04:15:46	Include "common.h" in "errors.h"
6810bf28	2011-05-11T00:40:07	Move all error-related defines to `git2/errors.h`
f4a936b5	2011-05-11T00:35:05	Bring back `git_strerror` We cannot totally deprecate this until the new error handling mechanisms are all in place.
5eb0fab8	2011-05-05T01:49:27	errors: Update external API with new `git_lasterror`
71d33382	2011-03-03T20:20:45	Move the external includes folder from `src` to `include` Signed-off-by: Vicent Marti <tanoku@gmail.com>

a2e6e0ea

2018-11-06T14:15:43

transport: allow cred/cert callbacks to return GIT_PASSTHROUGH Allow credential and certificate checking callbacks to return GIT_PASSTHROUGH, indicating that they do not want to act. Introduce this to support in both the http and ssh callbacks. Additionally, enable the same mechanism for certificate validation. This is most useful to disambiguate any meaning in the publicly exposed credential and certificate functions (`git_transport_smart_credentials` and `git_transport_smart_certificate_check`) but it may be more generally useful for callers to be able to defer back to libgit2.

c3077ea0

2018-06-25T21:24:49

apply: return a specific exit code on failure Return `GIT_EAPPLYFAIL` on patch application failure so that users can determine that patch application failed due to a malformed/conflicting patch by looking at the error code.

7edc1c87

2018-08-30T12:51:05

Merge pull request #4788 from tiennou/doc-fixes Documentation fixes

7765c0a9

2018-08-29T21:56:26

doc: fix comment on GIT_EUSER

c0b2e525

2018-08-27T09:23:02

Add two words to clarify

4bd2a508

2018-08-20T13:51:28

Update giterr_last API documentation to reflect real behaviour

787768c2

2018-06-22T19:07:54

index: return a unique error code on dirty index When the index is dirty, return GIT_EINDEXDIRTY so that consumers can identify the exact problem programatically.

28a0741f

2017-04-10T09:30:08

odb: verify object hashes The upstream git.git project verifies objects when looking them up from disk. This avoids scenarios where objects have somehow become corrupt on disk, e.g. due to hardware failures or bit flips. While our mantra is usually to follow upstream behavior, we do not do so in this case, as we never check hashes of objects we have just read from disk. To fix this, we create a new error class `GIT_EMISMATCH` which denotes that we have looked up an object with a hashsum mismatch. `odb_read_1` will then, after having read the object from its backend, hash the object and compare the resulting hash to the expected hash. If hashes do not match, it will return an error. This obviously introduces another computation of checksums and could potentially impact performance. Note though that we usually perform I/O operations directly before doing this computation, and as such the actual overhead should be drowned out by I/O. Running our test suite seems to confirm this guess. On a Linux system with best-of-five timings, we had 21.592s with the check enabled and 21.590s with the ckeck disabled. Note though that our test suite mostly contains very small blobs only. It is expected that repositories with bigger blobs may notice an increased hit by this check. In addition to a new test, we also had to change the odb::backend::nonrefreshing test suite, which now triggers a hashsum mismatch when looking up the commit "deadbeef...". This is expected, as the fake backend allocated inside of the test will return an empty object for the OID "deadbeef...", which will obviously not hash back to "deadbeef..." again. We can simply adjust the hash to equal the hash of the empty object here to fix this test.

cc8d9a29

2017-04-01T10:44:17

win32: introduce `do_with_retries` macro Provide a macro that will allow us to run a function with posix-like return values multiple times in a retry loop, with an optional cleanup function called between invocations.

2dfd1294

2017-02-24T13:34:01

hash: include sha1collisiondetection Include the SHA1 collision attack detection library from https://github.com/cr-marcstevens/sha1collisiondetection

372dc9ff

2015-10-21T13:49:55

worktree: implement `git_worktree_validate` Add a new function that checks wether a given `struct git_worktree` is valid. The validation includes checking if the gitdir, parent directory and common directory are present.

7cb904ba

2014-04-01T23:58:59

Introduce git_apply_patch The beginnings of patch application from an existing (diff-created) git_patch object: applies the hunks of a git_patch to a buffer.

cd59e0c0

2016-02-23T13:05:49

giterr_set_str: remove `GITERR_OS` documentation The `giterr_set_str` does not actually honor `GITERR_OS`. Remove the documentation that claims that we do.

8683d31f

2015-10-22T14:39:20

merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT.

25dbcf34

2015-07-27T09:59:07

Make giterr_detach no longer public

8a52ed7a

2015-07-11T18:51:36

errors: add EDIRECTORY This is to be returned when the operation which the user asked for is not possible to do on a directory.

82b1c93d

2015-06-20T13:44:22

stash: don't allow apply with staged changes

189aad45

2015-06-24T19:32:07

errors: introduce EINVALID We've been using EINVALIDSPEC for a while to mean this, but that name is too specific. Introduce this to be more explicit.

885b94aa

2015-05-28T15:26:13

Rename GIT_EMERGECONFLICT to GIT_ECONFLICT We do not error on "merge conflicts"; on the contrary, merge conflicts are a normal part of merging. We only error on "checkout conflicts", where a change exists in the index or the working directory that would otherwise be overwritten by performing the checkout. This *may* happen during merge (after the production of the new index that we're going to checkout) but it could happen during any checkout.

1396c381

2015-05-18T16:04:55

errors: add GIT_EEOF to indicate early EOF This can be used by tools to show mesages about failing to communicate with the server. The error message in this case will often contain the server's error message, as far as it managed to send anything.

fe598f09

2015-01-13T11:18:02

mkdir: walk up tree to mkdir Walk up the tree to mkdir, which is less immediately efficient, but allows us to look at intermediate directories that may need attention.

753e17b0

2014-11-19T18:42:29

peel: reject bad queries with EINVALIDSPEC There are some combination of objects and target types which we know cannot be fulfilled. Return EINVALIDSPEC for those to signify that there is a mismatch in the user-provided data and what the object model is capable of satisfying. If we start at a tag and in the course of peeling find out that we cannot reach a particular type, we return EPEEL.

93a7004c

2014-07-18T14:50:06

git_rebase_commit: drop already-picked commits Already cherry-picked commits should not be re-included. If all changes included in a commit exist in the upstream, then we should error with GIT_EAPPLIED.

867a36f3

2014-07-14T14:35:01

Introduce git_rebase to set up a rebase session Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.

af6cc38f

2014-09-30T04:38:05

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

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.

8873728f

2014-06-16T19:10:04

Introduce GIT_EAUTH Introduce this error code to signal an authentication failure.

31b0cb51

2014-05-22T17:16:21

Fixed miscellaneous documentation errors.

86c9d3da

2014-05-21T22:54:34

Return GIT_FILEMODE_UNREADABLE for files that fail to stat.

90553479

2014-05-20T17:40:28

Rename GIT_ENOACCESS -> GIT_EUNREADABLE

158c8ba1

2014-05-15T16:54:46

Return a specific error for EACCES.

3a728fb5

2012-11-13T16:35:24

object: introduce git_describe_object()

4d7b9939

2014-04-01T22:18:19

Added cherry-pick support

fc4728e3

2014-01-29T14:07:18

refs: return GIT_EMODIFIED if the ref target moved In case we loose the race to update the reference, return GIT_EMODIFIED to let the user distinguish it from other types of errors.

373cf6a9

2013-12-09T10:17:47

Update docs for new callback return value behavior

25e0b157

2013-12-06T15:07:57

Remove converting user error to GIT_EUSER This changes the behavior of callbacks so that the callback error code is not converted into GIT_EUSER and instead we propagate the return value through to the caller. Instead of using the giterr_capture and giterr_restore functions, we now rely on all functions to pass back the return value from a callback. To avoid having a return value with no error message, the user can call the public giterr_set_str or some such function to set an error message. There is a new helper 'giterr_set_callback' that functions can invoke after making a callback which ensures that some error message was set in case the callback did not set one. In places where the sign of the callback return value is meaningful (e.g. positive to skip, negative to abort), only the negative values are returned back to the caller, obviously, since the other values allow for continuing the loop. The hardest parts of this were in the checkout code where positive return values were overloaded as meaningful values for checkout. I fixed this by adding an output parameter to many of the internal checkout functions and removing the overload. This added some code, but it is probably a better implementation. There is some funkiness in the network code where user provided callbacks could be returning a positive or a negative value and we want to rely on that to cancel the loop. There are still a couple places where an user error might get turned into GIT_EUSER there, I think, though none exercised by the tests.

96869a4e

2013-12-03T16:45:39

Improve GIT_EUSER handling This adds giterr_user_cancel to return GIT_EUSER and clear any error message that is sitting around. As a result of using that in places, we need to be more thorough with capturing errors that happen inside a callback when used internally. To help with that, this also adds giterr_capture and giterr_restore so that when we internally use a foreach-type function that clears errors and converts them to GIT_EUSER, it is easier to restore not just the return value, but the actual error message text.

300d192f

2013-12-02T11:15:27

Introduce git_revert to revert a single commit

1eab9f0e

2013-11-05T14:56:10

error: Simplify giterr_detach

d6c60169

2013-11-04T15:45:31

Add giterr_detach API to get and clear error There are a number of cases where it is convenient to be able to fetch and "claim" the current error string, clearing the error. This is helpful when you need to call some code that may alter the error and you want to restore it later on and/or report it via some other mechanism.

974774c7

2013-09-09T16:57:34

Add attributes to filters and fix registry The filter registry as implemented was too primitive to actually work once multiple filters were coming into play. This expands the implementation of the registry to handle multiple prioritized filters correctly. Additionally, this adds an "attributes" field to a filter that makes it really really easy to implement filters that are based on one or more attribute values. The lookup and even simple value checking can all happen automatically without custom filter code. Lastly, with the registry improvements, this fills out the filter lifecycle callbacks, with initialize and shutdown callbacks that will be called before the filter is first used and after it is last invoked. This allows for system-wide initialization and cleanup by the filter.

efc9e670

2013-09-17T03:45:35

Merge pull request #1856 from libgit2/cmn/no-orphans No such thing as an orphan branch

605da51a

2013-09-17T09:50:30

No such thing as an orphan branch Unfortunately git-core uses the term "unborn branch" and "orphan branch" interchangeably. However, "orphan" is only really there for the checkout command, which has the `--orphan` option so it doesn't actually create the branch. Branches never have parents, so the distinction of a branch with no parents is odd to begin with. Crucially, the error messages deal with unborn branches, so let's use that.

b622aabe

2013-08-09T13:14:06

Add a wrapper to provide the libssh2 error message

3d276874

2013-08-19T10:30:44

index: report when it's locked Report the index being locked with its own error code in order to be able to differentiate, as a locked index is typically the result of a crashed process or concurrent access, both of which often require user intervention to fix.

e1967164

2013-06-24T15:33:41

Fixed most documentation header bugs Fixed a few header @param and @return typos with the help of -Wdocumentation in Xcode. The following warnings have not been fixed: common.h:213 - Not sure how the documentation format is for '...' notes.h:102 - Correct @param name but empty text notes.h:111 - Correct @param name but empty text pack.h:140 - @return missing text pack.h:148 - @return missing text

0f1f9833

2013-05-24T10:32:07

Add typedefs on some public enums Apparently this makes things easier to bind in some languages.

635c235c

2013-01-10T12:11:49

errors: Introduce EMERGECONFLICT error code

359fc2d2

2013-01-08T17:07:25

update copyrights

5a62d659

2013-01-03T12:44:09

MERGE_HEAD contents iterator

42e50b5e

2013-01-03T12:44:09

MERGE_HEAD contents iterator

7fcec834

2012-12-11T22:31:21

fetchhead reading/iterating

8b50935a

2012-11-12T11:29:48

errors: Introduce EINVALIDSPEC error code

613d5eb9

2012-11-28T11:42:37

Push! By schu, phkelley, and congyiwu, et al

ad9a921b

2012-11-08T17:05:07

Rework checkout with new strategy options This is a major reworking of checkout strategy options. The checkout code is now sensitive to the contents of the HEAD tree and the new options allow you to update the working tree so that it will match the index content only when it previously matched the contents of the HEAD. This allows you to, for example, to distinguish between removing files that are in the HEAD but not in the index, vs just removing all untracked files. Because of various corner cases that arise, etc., this required some additional capabilities in rmdir and other utility functions. This includes the beginnings of an implementation of code to read a partial tree into the index based on a pathspec, but that is not enabled because of the possibility of creating conflicting index entries.

eb44cfe0

2012-10-08T15:49:31

error: add GITERR_STASH error type

03bdb2ad

2012-10-23T16:32:01

GIT_EUNMERGED

c4f68b35

2012-10-19T11:04:32

errors: introduce GIT_EORPHANEDHEAD

0a32dca5

2012-08-19T22:26:32

gsoc-pack-objects WIP

1a628100

2012-09-21T15:04:39

Make giterr_set_str public There has been discussion for a while about making some set of the `giterr_set` type functions part of the public API for code that is implementing new backends to libgit2. This makes the `giterr_set_str()` and `giterr_set_oom()` functions public.

bb2d305c

2012-08-22T10:47:25

errors: introduce GIT_EBAREREPO

f335ecd6

2012-08-30T14:24:16

Diff iterators This refactors the diff output code so that an iterator object can be used to traverse and generate the diffs, instead of just the `foreach()` style with callbacks. The code has been rearranged so that the two styles can still share most functions. This also replaces `GIT_REVWALKOVER` with `GIT_ITEROVER` and uses that as a common error code for marking the end of iteration when using a iterator style of object.

aa13bf05

2012-08-02T13:00:58

Major submodule rewrite This replaces the old submodule API with a new extended API that supports most of the things that can be done with `git submodule`.

5dca2010

2012-08-03T17:08:01

Update iterators for consistency across library This updates all the `foreach()` type functions across the library that take callbacks from the user to have a consistent behavior. The rules are: * A callback terminates the loop by returning any non-zero value * Once the callback returns non-zero, it will not be called again (i.e. the loop stops all iteration regardless of state) * If the callback returns non-zero, the parent fn returns GIT_EUSER * Although the parent returns GIT_EUSER, no error will be set in the library and `giterr_last()` will return NULL if called. This commit makes those changes across the library and adds tests for most of the iteration APIs to make sure that they follow the above rules.

798e4d53

2012-06-22T21:25:17

amigaos: Cleanup

51975727

2012-06-07T23:13:39

Fix double-defines when using GIT_OLD_ERRORS

dbb36e1b

2012-05-17T17:56:49

ssl: check certificates against the system's trusted CAs

904b67e6

2012-05-18T01:48:50

errors: Rename error codes

e172cf08

2012-05-18T01:21:06

errors: Rename the generic return codes

fe3bcf7d

2012-05-11T12:20:19

errors: Remove old comments

73d87a09

2012-05-15T21:42:01

Introduce GITERR_INDEXER

3fbcac89

2012-05-02T19:56:38

Remove old and unused error codes

3aa351ea

2012-04-26T15:05:07

error handling: move the missing parts over to the new error handling

4376f7f6

2012-03-06T08:12:35

error-handling: remote, transport

73fe6a8e

2012-03-28T18:59:12

error-handling: Commit (WIP)

7c7ff7d1

2012-03-19T16:10:11

Migrate index, oid, and utils to new errors This includes a few cleanups that came up while converting these files. This commit introduces a could new git error classes, including the catchall class: GITERR_INVALID which I'm using as the class for invalid and out of range values which are detected at too low a level of library to use a higher level classification. For example, an overflow error in parsing an integer or a bad letter in parsing an OID string would generate an error in this class.

e3c47510

2012-03-13T14:23:24

Resolve comments from pull request This converts the map validation function into a macro, tweaks the GITERR_OS system error automatic appending, and adds a tentative new error access API and some quick unit tests for both the old and new error APIs.

e1de726c

2012-03-12T22:55:40

Migrate ODB files to new error handling This migrates odb.c, odb_loose.c, odb_pack.c and pack.c to the new style of error handling. Also got the unix and win32 versions of map.c. There are some minor changes to other files but no others were completely converted. This also contains an update to filebuf so that a zeroed out filebuf will not think that the fd (== 0) is actually open (and inadvertently call close() on fd 0 if cleaned up). Lastly, this was built and tested on win32 and contains a bunch of fixes for the win32 build which was pretty broken.

dda708e7

2012-03-09T19:55:50

error-handling: On-disk config file backend Includes: - Proper error reporting when encountering syntax errors in a config file (file, line number, column). - Rewritten `config_write`, now with 99% less goto-spaghetti - Error state in `git_filebuf`: filebuf write functions no longer need to be checked for error returns. If any of the writes performed on a buffer fail, the last call to `git_filebuf_commit` or `git_filebuf_hash` will fail accordingly and set the appropiate error message. Baller!

e54d8d89

2012-03-07T01:37:09

error-handling: Config

cb8a7961

2012-03-07T00:02:55

error-handling: Repository This also includes droping `git_buf_lasterror` because it makes no sense in the new system. Note that in most of the places were it has been dropped, the code needs cleanup. I.e. GIT_ENOMEM is going away, so instead it should return a generic `-1` and obviously not throw anything.

1a481123

2012-02-17T00:13:34

error-handling: References Yes, this is error handling solely for `refs.c`, but some of the abstractions leak all ofer the code base.

45d387ac

2012-02-15T16:54:17

refs: Error handling rework. WIP

60bc2d20

2012-02-14T21:23:11

error-handling: Add new routines Obviously all the old throw routines are still in place, so we can gradually port over.

5e0de328

2012-02-13T17:10:24

Update Copyright header Signed-off-by: schu <schu-github@schulog.org>

87d9869f

2011-09-19T03:34:49

Tabify everything There were quite a few places were spaces were being used instead of tabs. Try to catch them all. This should hopefully not break anything. Except for `git blame`. Oh well.

bb742ede

2011-09-19T01:54:32

Cleanup legal data 1. The license header is technically not valid if it doesn't have a copyright signature. 2. The COPYING file has been updated with the different licenses used in the project. 3. The full GPLv2 header in each file annoys me.

f12aa9dc

2011-07-05T04:31:37

Merge pull request #300 from carlosmn/gsoc2011/master A bit of networking

ab7941b5

2011-06-28T21:04:59

test: Properly show error messages

7632e249

2011-06-13T23:01:12

Correctly handle network input Add a parameter to git_pkt_parse_line to tell it how much data you have in your buffer. If the buffer is too short, it returns an error saying so. Adapt the git transport to use this and fix the offset calculation. Add the GIT_ESHORTBUFFER error code.

63f91e1c

2011-06-22T16:52:30

Add git.git's fnmatch, which is really GNU's and the git__fnmatch wrapper If the strings match, git__fnmatch returns GIT_SUCCESS and GIT_ENOMATCH on failure to match. MSVC fixes: Added a test for _MSC_VER and (in that case) defined HAVE_STRING_H to 1 so it doesn't try to include <strings.h> which doesn't exist in the MSVC world. Moved the function declarations to use the modern inline ones so MSVC doesn't have a fit. Added casts everywhere so MSVC doesn't crap its pants. Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>

984ed6b6

2011-06-19T12:48:16

odb: Add GIT_EPASSTHROUGH Allows a custom user backend to passthrough one of the callbacks. Used for e.g. caching backends.

53c0bd81

2011-05-27T22:37:10

Added error for ambiguous oid prefixes. Added methods to compare the first nth hexadecimal characters (i.e. packets of 4 bits) of OIDs.

f87d9beb

2011-05-15T23:46:39

Change error codes from DEFINEs to an enum

f31bd03f

2011-05-13T04:15:46

Include "common.h" in "errors.h"

6810bf28

2011-05-11T00:40:07

Move all error-related defines to `git2/errors.h`

f4a936b5

2011-05-11T00:35:05

Bring back `git_strerror` We cannot totally deprecate this until the new error handling mechanisms are all in place.

5eb0fab8

2011-05-05T01:49:27

errors: Update external API with new `git_lasterror`

71d33382

2011-03-03T20:20:45

Move the external includes folder from `src` to `include` Signed-off-by: Vicent Marti <tanoku@gmail.com>

thodg/libgit2/include/git2/errors.h

include/git2/errors.h

Log