kmx git

Commit	Date	Message
c0280bdd	2015-06-25T18:55:48	Merge pull request #3255 from libgit2/cmn/rename-unspecified Rename FALLBACK to UNSPECIFIED
87987fd1	2015-06-25T15:26:43	Merge pull request #3246 from libgit2/cmn/dont-grow-borrowed Don't allow growing borrowed buffers
c2418f46	2015-06-25T12:48:44	Rename FALLBACK to UNSPECIFIED Fallback describes the mechanism, while unspecified explains what the user is thinking.
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.
bd470d00	2015-06-23T15:21:12	blob: don't recomment using git_buf_grow We currently recommend using `git_buf_grow` in order to make a buffer make an owned copy of the memory it points to. This is not behaviour we should encourage, so remove this recommendation. The function itself is not changed, as we need to remain compatible, but it will be changed not to allow usage on borrowed buffers.
daacf96d	2015-06-24T23:34:40	Merge pull request #3097 from libgit2/cmn/submodule-config-state Remove run-time configuration settings from submodules
cdee630f	2015-06-09T19:07:58	curl: extract certificate information The information is exposed by curl for some crypto libraries in the form of name:content strings. We can't do much more than return this information.
1376e784	2015-06-07T14:42:13	stream: add support for setting a proxy If the stream claims to support this feature, we can let the transport set the proxy. We also set HTTPPROXYTUNNEL option so curl can create a tunnel through the proxy which lets us create our own TLS session (if needed).
09f3364d	2015-06-23T23:40:02	Merge pull request #3131 from urkud/const-char Add `const` qualifier
783672fa	2015-05-11T12:01:08	submodule: remove the RESET enum values These are not useful anymore, as we don't affect the instance's configuration.
961861fa	2015-05-05T09:25:17	submodule: get rid of `_save()` We no longer have any setters which affect an instance, so `git_submodule_save()` is no longer relevant.
d6073b30	2015-05-05T09:22:35	submodule: make `_set_url()` affect the configuration With this one, we can get rid of the edit_and_save test.
486ba4cd	2015-05-05T09:13:52	submodule: make `_set_branch()` affect the configuration
4e636423	2015-05-05T09:01:20	submodule: make `_set_update_fetch_recurse_submodules()` affect the config Similarly to the other ones. In this test we copy over testing `RECURSE_YES` which shows an error in our handling of the `YES` variant which we may have to port to the rest.
e8a39f8e	2015-05-05T08:35:29	submodule: make `_set_update()` affect the configuration Moving on with the removal of runtime-changing variables, the update setting for a remote is whatever it was when it was looked up.
c6f489c9	2015-05-04T17:29:12	submodule: add an ignore option to status This lets us specify in the status call which ignore rules we want to use (optionally falling back to whatever the submodule has in its configuration). This removes one of the reasons for having `_set_ignore()` set the value in-memory. We re-use the `IGNORE_RESET` value for this as it is no longer relevant but has a similar purpose to `IGNORE_FALLBACK`. Similarly, we remove `IGNORE_DEFAULT` which does not have use outside of initializers and move that to fall back to the configuration as well.
64bbd47a	2015-05-04T17:09:21	submodule: don't let status change an existing instance As submodules are becomes more like values, we should not let a status check to update its properties. Instead of taking a submodule, have status take a repo and submodule name.
5a9fc6c8	2015-05-04T16:22:56	submodule: make set_ignore() affect the configuration Instead of affecting a particular instance, make it change the configuration.
a3f42fe8	2015-06-22T15:32:29	commit: allow retrieving an arbitrary header field This allows the user to look up fields which we don't parse in libgit2, and allows them to access gpgsig or mergetag fields if they wish to check the signature.
5e947c91	2015-06-19T22:05:08	index: use the checksum to check whether it's been modified We currently use a timetamp to check whether an index file has been modified since we last read it, but this is racy. If two updates happen in the same second and we read after the first one, we won't detect the second one. Instead read the SHA-1 checksum of the file, which are its last 20 bytes which gives us a sure-fire way to detect whether the file has changed since we last read it. As we're now keeping track of it, expose an accessor to this data.
8147b1af	2015-05-25T20:03:59	diff: introduce binary diff callbacks Introduce a new binary diff callback to provide the actual binary delta contents to callers. Create this data from the diff contents (instead of directly from the ODB) to support binary diffs including the workdir, not just things coming out of the ODB.
2deb3608	2015-06-11T08:54:48	Merge pull request #3155 from mgorny/userpass-const cred_helpers: Add 'const' qualifiers to git_cred_userpass_payload
2eecc288	2015-06-10T14:43:49	Introduce `git_filter_list_contains` `git_filter_list_contains` can be used to query a filter list to determine if a given filter will be run.
be5fda75	2015-05-31T19:21:42	Include git2/transaction.h This was forgotten when the feature was implemented.
ec0c4c40	2015-05-04T11:59:20	remote: apply insteadOf configuration. A remote's URLs are now modified according to the url..insteadOf and url..pushInsteadOf configurations. This allows a user to replace URL prefixes by setting the corresponding keys. E.g. "url.foo.insteadOf = bar" would replace the prefix "bar" with the new prefix "foo".
2c8550f0	2015-05-29T19:38:11	Merge pull request #3157 from mgorny/ssh_memory_auth Support getting SSH keys from memory, pt. 2
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.
ff8d635a	2015-05-28T18:45:57	Merge pull request #3139 from ethomson/diff_conflicts Include conflicts when diffing
2b922832	2015-05-28T16:09:17	Merge pull request #3127 from libgit2/cmn/remote-fixups Tackle remote API issues from bindings
10549a2d	2015-05-19T18:26:04	Introduce `GIT_DIFF_FLAG_EXISTS` Mark the `old_file` and `new_file` sides of a delta with a new bit, `GIT_DIFF_FLAG_EXISTS`, that introduces that a particular side of the delta exists in the diff. This is useful for indicating whether a working directory item exists or not, in the presence of a conflict. Diff users may have previously used DELETED to determine this information.
9f545b9d	2015-05-19T11:23:59	introduce `git_index_entry_is_conflict` It's not always obvious the mapping between stage level and conflict-ness. More importantly, this can lead otherwise sane people to write constructs like `if (!git_index_entry_stage(entry))`, which (while technically correct) is unreadable. Provide a nice method to help avoid such messy thinking.
7c948014	2015-05-14T14:00:29	diff/status: introduce conflicts When diffing against an index, return a new `GIT_DELTA_CONFLICTED` delta type for items that are conflicted. For a single file path, only one delta will be produced (despite the fact that there are multiple entries in the index). Index iterators now have the (optional) ability to return conflicts in the index. Prior to this change, they would be omitted, and callers (like diff) would omit conflicted index entries entirely.
ecd60a56	2015-05-14T11:52:48	conflicts: when adding conflicts, remove staged When adding a conflict for some path, remove the staged entry. Otherwise, an illegal index (with both stage 0 and high-stage entries) would result.
c6e942fb	2015-05-17T15:19:22	remote: validate refspecs before adding to config When we moved from acting on the instance to acting on the configuration, we dropped the validation of the passed refspec, which can lead to writing an invalid refspec to the configuration. Bring that validation back.
ae5b9362	2015-05-17T15:11:45	remote: remove fetch parameter from create_anonymous An anonymous remote is not configured and cannot therefore have configured refspecs. Remove the parameter which adds this from the constructor.
f7142b5e	2015-05-24T18:38:47	cred: Declare GIT_CREDTYPE_SSH_MEMORY unconditionally Declare GIT_CREDTYPE_SSH_MEMORY to have consistent API independently of whether libgit2 was built with or without in-memory key passing support. Or rather, to have it at all since build-time definitions are not stored in headers.
08e6b875	2015-03-19T14:57:15	Return an error when ssh memory credentials are not supported. To not modify the external api.
7a8b8503	2015-03-17T09:19:15	Add support to read ssh keys from memory.
462865d7	2015-05-24T13:18:30	cred_helpers: Add 'const' qualifiers to git_cred_userpass_payload Make both username & password in git_cred_userpass_payload 'const'. The values are not altered anywhere, and the extra qualifier allows clients to assign 'const' values there.
d30155f2	2015-05-20T14:26:05	Fix error when building as C++.
cd3f3c28	2015-05-20T21:06:01	Add a missing include for reset Our doc parser really wants the types to be declared in the header it's reading.
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.
70f7484d	2015-05-14T09:35:08	remote: get rid of the run-time refspec setters These were left over from the culling as it's not clear which use-cases might benefit from this. It is not clear that we want to support any use-case which depends on changing the remote's idea of the base refspecs rather than passing in different per-operation refspec list, so remove these functions.
c8022e6c	2015-05-13T06:21:12	Add `const` qualifier This fixes a warning in `examples/describe.c` without breaking the main build. OTOH, I'm not sure if this is an API-compatible change.
a6f2ceaf	2015-05-13T12:11:55	Merge pull request #3118 from libgit2/cmn/stream-size odb: make the writestream's size a git_off_t
d01737b4	2015-05-13T09:11:38	Merge pull request #3117 from libgit2/cmn/index-more-accurate index: make the entries have more accurate sizes
a4b6452a	2015-04-23T06:55:29	remote: remove git_remote_save() It has now become a no-op, so remove the function and all references to it.
77254990	2015-04-23T06:51:34	remote: remove live changing of refspecs The base refspecs changing can be a cause of confusion as to what is the current base refspec set and complicate saving the remote's configuration. Change `git_remote_add_{fetch,push}()` to update the configuration instead of an instance. This finally makes `git_remote_save()` a no-op, it will be removed in a later commit.
35a8a8c5	2015-04-22T17:29:20	remote: move the tagopt setting to the fetch options This is another option which we should not be keeping in the remote, but is specific to each particular operation.
3eff2a57	2015-04-22T16:11:10	remote: move the update_fetchhead setting to the options While this will rarely be different from the default, having it in the remote adds yet another setting it has to keep around and can affect its behaviour. Move it to the options.
058b753c	2015-04-22T15:45:21	remote: move the transport ctor to the callbacks Instead of having it set in a different place from every other callback, put it the main structure. This removes some state from the remote and makes it behave more like clone, where the constructors are passed via the options.
6fb373a0	2015-04-22T04:54:00	remote: add prune option to fetch Add a prune setting in the fetch options to allow to fall back to the configuration (the default) or to set it on or off.
22261344	2015-04-22T04:38:08	remote: remove url and pushurl from the save logic As a first step in removing the repository-saving logic, don't allow chaning the url or push url from a remote object, but change the configuration on the configuration immediately.
8f0104ec	2015-04-21T22:10:36	Remove the callbacks struct from the remote Having the setting be different from calling its actions was not a great idea and made for the sake of the wrong convenience. Instead of that, accept either fetch options, push options or the callbacks when dealing with the remote. The fetch options are currently only the callbacks, but more options will be moved from setters and getters on the remote to the options. This does mean passing the same struct along the different functions but the typical use-case will only call git_remote_fetch() or git_remote_push() and so won't notice much difference.
77b339f7	2015-05-12T13:06:33	odb: make the writestream's size a git_off_t Restricting files to size_t is a silly limitation. The loose backend writes to a file directly, so there is no issue in using 63 bits for the size. We still assume that the header is going to fit in 64 bytes, which does mean quite a bit smaller files due to the run-length encoding, but it's still a much larger size than you would want Git to handle.
ca294279	2015-05-12T11:43:27	index: make the entries have more accurate sizes While we are confident about the size of an int in architectures we're likely to care about, the index format is defined by the exact size of the fields. Use the definitions which show the exact width of the entry fields. As part of that, bring back 32-bit time and size fields, which currently are 64 bits wide and can bring a false sense of security in how much data they really store. Document that these fields are not to be taken as authoritative.
1f1f5c63	2015-05-11T14:10:24	checkout: better document the `baseline_index` opt
4ea3eebf	2015-05-01T18:34:38	stash_apply: provide progress callbacks
19c80a6f	2015-05-01T18:07:10	stash_apply: provide its own options structure
12149a20	2015-04-20T20:05:23	stash apply: default to at least GIT_CHECKOUT_SAFE
958950b6	2015-05-01T13:53:46	stash: document merge conflicts
f0957589	2015-03-04T23:55:42	stash: refactor to use merge_iterators
73dce1f6	2015-03-16T18:57:57	checkout: allow baseline to be specified as index Allow the baseline to be specified as an index, so that users need not write their index to a tree just to checkout with that as the baseline.
bf8dd3f5	2014-11-14T12:32:47	Added git_stash_apply() and git_stash_pop() APIs
4beab1f8	2015-03-31T16:29:35	checkout: break case-changes into delete/add When checking out with a case-insensitive working directory, we want to change the case of items in the working directory to reflect changes that occured in the checkout target. Diff now has an option to break case-changing renames into delete/add.
cbe8a61d	2015-05-01T11:28:54	Merge pull request #3059 from libgit2/cmn/negotiation-notify [WIP/RFC] push: report the update plan to the caller
bf2ba529	2015-04-30T10:57:13	Update documentation for API changes
aa9bb425	2015-04-20T17:22:39	rebase: correct documentation, CHANGELOG
94c988f6	2015-04-20T17:19:08	rebase: include checkout opts within rebase opts
f3a199dd	2015-03-17T15:53:04	rebase: init and open take a rebase_options `git_rebase_init` and `git_rebase_open` should take a `git_rebase_options` and use it for future rebase operations on that `rebase` object.
5ae38538	2015-03-17T11:47:16	rebase: take `checkout_options` where appropriate
649834fd	2015-03-17T11:46:55	reset: `git_checkout_options` is `const`
30640aa9	2015-03-17T10:04:08	rebase: identify a rebase that has not started In `git_rebase_operation_current()`, indicate when a rebase has not started (with `GIT_REBASE_NO_OPERATION`) rather than conflating that with the first operation being in-progress.
efc2fec5	2015-04-19T00:55:00	push: report the update plan to the caller It can be useful for the caller to know which update commands will be sent to the server before the packfile is pushed up. git does this via the pre-push hook. We don't have hooks, but as it adds introspection into what is happening, we can add a callback which performs the same function.
a0e652d2	2015-04-17T12:35:41	Merge pull request #2999 from pks-t/submodule-set-url Implement git_submodule_set_branch.
6f80bf4a	2015-04-16T19:12:28	Merge pull request #3037 from libgit2/cmn/hide-then-push Handle hide-then-push in the revwalk
05d92026	2015-04-13T18:03:03	revwalk: reword the push text As it seems it's not quite clear what it means to push a commit, try to be more explicit about adding a new root and that we may not see this commit if it is hidden.
129788a6	2015-03-18T11:45:18	Implement git_submodule_set_branch.
623fbd93	2015-04-10T11:38:07	Merge pull request #2974 from libgit2/cmn/clone-everything Make sure to pack referenced objects for non-branches
807566d5	2015-04-03T18:59:11	Entry argument passed to git_index_add_frombuffer() should be const
c5e07187	2015-03-24T14:03:51	Merge pull request #2990 from leoyanggit/custom_param Add a custom param to git_smart_subtransport_definition
95d1624b	2015-03-24T08:34:12	Merge pull request #2947 from libgit2/cmn/notes-buf note: use a git_buf to return the default namespace
89ba9f1a	2015-03-18T13:17:04	Merge pull request #2967 from jacquesg/merge-whitespace Allow merges of files (and trees) with whitespace problems/fixes
142e5379	2015-03-17T12:49:33	Add a custom param to git_smart_subtransport_definition The smart transport has already take the payload param. For the sub transport a payload param is useful for the implementer.
a61fa4c0	2015-03-12T01:26:09	packbuilder: introduce git_packbuilder_insert_recur() This function recursively inserts the given object and any referenced ones. It can be thought of as a more general version of the functions to insert a commit or tree.
385449b1	2015-03-04T01:23:20	note: use a git_buf to return the default namespace The caller has otherwise no way to know how long the string will be allocated or ability to free it. This fixes #2944.
9bbc8f35	2015-03-17T10:21:28	Merge pull request #2962 from libgit2/cmn/reflog-annotated Add annotated versions of ref-modying functions
7800048a	2015-03-17T10:06:50	Merge pull request #2972 from libgit2/cmn/pack-objects-walk [WIP] Smarter pack-building
62dd4d71	2015-03-07T00:06:02	annotated_commit: provide a constructor from a revspec This extra constructor will be useful for the annotated versions of ref-modifying functions, as it allows us to create a commit with the extended sha syntax which was used to retrieve it.
62d38a1d	2015-03-06T23:51:40	Add annotated commit versions of reflog-modifying functions We do not always want to put the id directly into the reflog, but we want to speicfy what a user typed. For this use-case we provide annotated version of a few functions which let the caller specify what user-friendly name was used when asking for the operation.
74c37c2a	2015-03-12T13:16:09	Added options to enable patience and minimal diff drivers
13de9363	2015-03-12T12:36:09	Collapse whitespace flags into git_merge_file_flags_t
f29dde68	2015-03-12T12:29:47	Renamed git_merge_options 'flags' to 'tree_flags'
45a86bbf	2015-03-09T17:02:52	Allow for merges with whitespace discrepancies
15f58174	2015-03-11T17:55:39	Merge commit 'refs/pull/2879/head' of ssh://github.com/libgit2/libgit2
04a36fef	2014-10-11T15:48:29	pack-objects: fill a packbuilder from a walk Most use-cases for the object packer communicate in terms of commits which each side has. We already have an object to specify this relationship between commits, namely git_revwalk. By knowing which commits we want to pack and which the other side already has, we can perform similar optimisations to git, by marking each tree as interesting or uninteresting only once, and not sending those trees which we know the other side has.
9a97f49e	2014-12-21T15:31:03	config: borrow refcounted references This changes the get_entry() method to return a refcounted version of the config entry, which you have to free when you're done. This allows us to avoid freeing the memory in which the entry is stored on a refresh, which may happen at any time for a live config. For this reason, get_string() has been forbidden on live configs and a new function get_string_buf() has been added, which stores the string in a git_buf which the user then owns. The functions which parse the string value takea advantage of the borrowing to parse safely and then release the entry.
4e498646	2015-01-15T16:50:31	repository: remove log message override for switching the active branch We want to use the "checkout: moving from ..." message in order to let git know when a change of branch has happened. Make the convenience functions for this goal write this message.
412a3808	2015-01-15T15:31:23	push: remove reflog message override We always use "update by push".
6bfb990d	2015-01-07T14:47:02	branch: don't accept a reflog message override This namespace is about behaving like git's branch command, so let's do exactly that instead of taking a reflog message. This override is still available via the reference namespace.

c0280bdd

2015-06-25T18:55:48

Merge pull request #3255 from libgit2/cmn/rename-unspecified Rename FALLBACK to UNSPECIFIED

87987fd1

2015-06-25T15:26:43

Merge pull request #3246 from libgit2/cmn/dont-grow-borrowed Don't allow growing borrowed buffers

c2418f46

2015-06-25T12:48:44

Rename FALLBACK to UNSPECIFIED Fallback describes the mechanism, while unspecified explains what the user is thinking.

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.

bd470d00

2015-06-23T15:21:12

blob: don't recomment using git_buf_grow We currently recommend using `git_buf_grow` in order to make a buffer make an owned copy of the memory it points to. This is not behaviour we should encourage, so remove this recommendation. The function itself is not changed, as we need to remain compatible, but it will be changed not to allow usage on borrowed buffers.

daacf96d

2015-06-24T23:34:40

Merge pull request #3097 from libgit2/cmn/submodule-config-state Remove run-time configuration settings from submodules

cdee630f

2015-06-09T19:07:58

curl: extract certificate information The information is exposed by curl for some crypto libraries in the form of name:content strings. We can't do much more than return this information.

1376e784

2015-06-07T14:42:13

stream: add support for setting a proxy If the stream claims to support this feature, we can let the transport set the proxy. We also set HTTPPROXYTUNNEL option so curl can create a tunnel through the proxy which lets us create our own TLS session (if needed).

09f3364d

2015-06-23T23:40:02

Merge pull request #3131 from urkud/const-char Add `const` qualifier

783672fa

2015-05-11T12:01:08

submodule: remove the RESET enum values These are not useful anymore, as we don't affect the instance's configuration.

961861fa

2015-05-05T09:25:17

submodule: get rid of `_save()` We no longer have any setters which affect an instance, so `git_submodule_save()` is no longer relevant.

d6073b30

2015-05-05T09:22:35

submodule: make `_set_url()` affect the configuration With this one, we can get rid of the edit_and_save test.

486ba4cd

2015-05-05T09:13:52

submodule: make `_set_branch()` affect the configuration

4e636423

2015-05-05T09:01:20

submodule: make `_set_update_fetch_recurse_submodules()` affect the config Similarly to the other ones. In this test we copy over testing `RECURSE_YES` which shows an error in our handling of the `YES` variant which we may have to port to the rest.

e8a39f8e

2015-05-05T08:35:29

submodule: make `_set_update()` affect the configuration Moving on with the removal of runtime-changing variables, the update setting for a remote is whatever it was when it was looked up.

c6f489c9

2015-05-04T17:29:12

submodule: add an ignore option to status This lets us specify in the status call which ignore rules we want to use (optionally falling back to whatever the submodule has in its configuration). This removes one of the reasons for having `_set_ignore()` set the value in-memory. We re-use the `IGNORE_RESET` value for this as it is no longer relevant but has a similar purpose to `IGNORE_FALLBACK`. Similarly, we remove `IGNORE_DEFAULT` which does not have use outside of initializers and move that to fall back to the configuration as well.

64bbd47a

2015-05-04T17:09:21

submodule: don't let status change an existing instance As submodules are becomes more like values, we should not let a status check to update its properties. Instead of taking a submodule, have status take a repo and submodule name.

5a9fc6c8

2015-05-04T16:22:56

submodule: make set_ignore() affect the configuration Instead of affecting a particular instance, make it change the configuration.

a3f42fe8

2015-06-22T15:32:29

commit: allow retrieving an arbitrary header field This allows the user to look up fields which we don't parse in libgit2, and allows them to access gpgsig or mergetag fields if they wish to check the signature.

5e947c91

2015-06-19T22:05:08

index: use the checksum to check whether it's been modified We currently use a timetamp to check whether an index file has been modified since we last read it, but this is racy. If two updates happen in the same second and we read after the first one, we won't detect the second one. Instead read the SHA-1 checksum of the file, which are its last 20 bytes which gives us a sure-fire way to detect whether the file has changed since we last read it. As we're now keeping track of it, expose an accessor to this data.

8147b1af

2015-05-25T20:03:59

diff: introduce binary diff callbacks Introduce a new binary diff callback to provide the actual binary delta contents to callers. Create this data from the diff contents (instead of directly from the ODB) to support binary diffs including the workdir, not just things coming out of the ODB.

2deb3608

2015-06-11T08:54:48

Merge pull request #3155 from mgorny/userpass-const cred_helpers: Add 'const' qualifiers to git_cred_userpass_payload

2eecc288

2015-06-10T14:43:49

Introduce `git_filter_list_contains` `git_filter_list_contains` can be used to query a filter list to determine if a given filter will be run.

be5fda75

2015-05-31T19:21:42

Include git2/transaction.h This was forgotten when the feature was implemented.

ec0c4c40

2015-05-04T11:59:20

remote: apply insteadOf configuration. A remote's URLs are now modified according to the url.*.insteadOf and url.*.pushInsteadOf configurations. This allows a user to replace URL prefixes by setting the corresponding keys. E.g. "url.foo.insteadOf = bar" would replace the prefix "bar" with the new prefix "foo".

2c8550f0

2015-05-29T19:38:11

Merge pull request #3157 from mgorny/ssh_memory_auth Support getting SSH keys from memory, pt. 2

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.

ff8d635a

2015-05-28T18:45:57

Merge pull request #3139 from ethomson/diff_conflicts Include conflicts when diffing

2b922832

2015-05-28T16:09:17

Merge pull request #3127 from libgit2/cmn/remote-fixups Tackle remote API issues from bindings

10549a2d

2015-05-19T18:26:04

Introduce `GIT_DIFF_FLAG_EXISTS` Mark the `old_file` and `new_file` sides of a delta with a new bit, `GIT_DIFF_FLAG_EXISTS`, that introduces that a particular side of the delta exists in the diff. This is useful for indicating whether a working directory item exists or not, in the presence of a conflict. Diff users may have previously used DELETED to determine this information.

9f545b9d

2015-05-19T11:23:59

introduce `git_index_entry_is_conflict` It's not always obvious the mapping between stage level and conflict-ness. More importantly, this can lead otherwise sane people to write constructs like `if (!git_index_entry_stage(entry))`, which (while technically correct) is unreadable. Provide a nice method to help avoid such messy thinking.

7c948014

2015-05-14T14:00:29

diff/status: introduce conflicts When diffing against an index, return a new `GIT_DELTA_CONFLICTED` delta type for items that are conflicted. For a single file path, only one delta will be produced (despite the fact that there are multiple entries in the index). Index iterators now have the (optional) ability to return conflicts in the index. Prior to this change, they would be omitted, and callers (like diff) would omit conflicted index entries entirely.

ecd60a56

2015-05-14T11:52:48

conflicts: when adding conflicts, remove staged When adding a conflict for some path, remove the staged entry. Otherwise, an illegal index (with both stage 0 and high-stage entries) would result.

c6e942fb

2015-05-17T15:19:22

remote: validate refspecs before adding to config When we moved from acting on the instance to acting on the configuration, we dropped the validation of the passed refspec, which can lead to writing an invalid refspec to the configuration. Bring that validation back.

ae5b9362

2015-05-17T15:11:45

remote: remove fetch parameter from create_anonymous An anonymous remote is not configured and cannot therefore have configured refspecs. Remove the parameter which adds this from the constructor.

f7142b5e

2015-05-24T18:38:47

cred: Declare GIT_CREDTYPE_SSH_MEMORY unconditionally Declare GIT_CREDTYPE_SSH_MEMORY to have consistent API independently of whether libgit2 was built with or without in-memory key passing support. Or rather, to have it at all since build-time definitions are not stored in headers.

08e6b875

2015-03-19T14:57:15

Return an error when ssh memory credentials are not supported. To not modify the external api.

7a8b8503

2015-03-17T09:19:15

Add support to read ssh keys from memory.

462865d7

2015-05-24T13:18:30

cred_helpers: Add 'const' qualifiers to git_cred_userpass_payload Make both username & password in git_cred_userpass_payload 'const'. The values are not altered anywhere, and the extra qualifier allows clients to assign 'const' values there.

d30155f2

2015-05-20T14:26:05

Fix error when building as C++.

cd3f3c28

2015-05-20T21:06:01

Add a missing include for reset Our doc parser really wants the types to be declared in the header it's reading.

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.

70f7484d

2015-05-14T09:35:08

remote: get rid of the run-time refspec setters These were left over from the culling as it's not clear which use-cases might benefit from this. It is not clear that we want to support any use-case which depends on changing the remote's idea of the base refspecs rather than passing in different per-operation refspec list, so remove these functions.

c8022e6c

2015-05-13T06:21:12

Add `const` qualifier This fixes a warning in `examples/describe.c` without breaking the main build. OTOH, I'm not sure if this is an API-compatible change.

a6f2ceaf

2015-05-13T12:11:55

Merge pull request #3118 from libgit2/cmn/stream-size odb: make the writestream's size a git_off_t

d01737b4

2015-05-13T09:11:38

Merge pull request #3117 from libgit2/cmn/index-more-accurate index: make the entries have more accurate sizes

a4b6452a

2015-04-23T06:55:29

remote: remove git_remote_save() It has now become a no-op, so remove the function and all references to it.

77254990

2015-04-23T06:51:34

remote: remove live changing of refspecs The base refspecs changing can be a cause of confusion as to what is the current base refspec set and complicate saving the remote's configuration. Change `git_remote_add_{fetch,push}()` to update the configuration instead of an instance. This finally makes `git_remote_save()` a no-op, it will be removed in a later commit.

35a8a8c5

2015-04-22T17:29:20

remote: move the tagopt setting to the fetch options This is another option which we should not be keeping in the remote, but is specific to each particular operation.

3eff2a57

2015-04-22T16:11:10

remote: move the update_fetchhead setting to the options While this will rarely be different from the default, having it in the remote adds yet another setting it has to keep around and can affect its behaviour. Move it to the options.

058b753c

2015-04-22T15:45:21

remote: move the transport ctor to the callbacks Instead of having it set in a different place from every other callback, put it the main structure. This removes some state from the remote and makes it behave more like clone, where the constructors are passed via the options.

6fb373a0

2015-04-22T04:54:00

remote: add prune option to fetch Add a prune setting in the fetch options to allow to fall back to the configuration (the default) or to set it on or off.

22261344

2015-04-22T04:38:08

remote: remove url and pushurl from the save logic As a first step in removing the repository-saving logic, don't allow chaning the url or push url from a remote object, but change the configuration on the configuration immediately.

8f0104ec

2015-04-21T22:10:36

Remove the callbacks struct from the remote Having the setting be different from calling its actions was not a great idea and made for the sake of the wrong convenience. Instead of that, accept either fetch options, push options or the callbacks when dealing with the remote. The fetch options are currently only the callbacks, but more options will be moved from setters and getters on the remote to the options. This does mean passing the same struct along the different functions but the typical use-case will only call git_remote_fetch() or git_remote_push() and so won't notice much difference.

77b339f7

2015-05-12T13:06:33

odb: make the writestream's size a git_off_t Restricting files to size_t is a silly limitation. The loose backend writes to a file directly, so there is no issue in using 63 bits for the size. We still assume that the header is going to fit in 64 bytes, which does mean quite a bit smaller files due to the run-length encoding, but it's still a much larger size than you would want Git to handle.

ca294279

2015-05-12T11:43:27

index: make the entries have more accurate sizes While we are confident about the size of an int in architectures we're likely to care about, the index format is defined by the exact size of the fields. Use the definitions which show the exact width of the entry fields. As part of that, bring back 32-bit time and size fields, which currently are 64 bits wide and can bring a false sense of security in how much data they really store. Document that these fields are not to be taken as authoritative.

1f1f5c63

2015-05-11T14:10:24

checkout: better document the `baseline_index` opt

4ea3eebf

2015-05-01T18:34:38

stash_apply: provide progress callbacks

19c80a6f

2015-05-01T18:07:10

stash_apply: provide its own options structure

12149a20

2015-04-20T20:05:23

stash apply: default to at least GIT_CHECKOUT_SAFE

958950b6

2015-05-01T13:53:46

stash: document merge conflicts

f0957589

2015-03-04T23:55:42

stash: refactor to use merge_iterators

73dce1f6

2015-03-16T18:57:57

checkout: allow baseline to be specified as index Allow the baseline to be specified as an index, so that users need not write their index to a tree just to checkout with that as the baseline.

bf8dd3f5

2014-11-14T12:32:47

Added git_stash_apply() and git_stash_pop() APIs

4beab1f8

2015-03-31T16:29:35

checkout: break case-changes into delete/add When checking out with a case-insensitive working directory, we want to change the case of items in the working directory to reflect changes that occured in the checkout target. Diff now has an option to break case-changing renames into delete/add.

cbe8a61d

2015-05-01T11:28:54

Merge pull request #3059 from libgit2/cmn/negotiation-notify [WIP/RFC] push: report the update plan to the caller

bf2ba529

2015-04-30T10:57:13

Update documentation for API changes

aa9bb425

2015-04-20T17:22:39

rebase: correct documentation, CHANGELOG

94c988f6

2015-04-20T17:19:08

rebase: include checkout opts within rebase opts

f3a199dd

2015-03-17T15:53:04

rebase: init and open take a rebase_options `git_rebase_init` and `git_rebase_open` should take a `git_rebase_options` and use it for future rebase operations on that `rebase` object.

5ae38538

2015-03-17T11:47:16

rebase: take `checkout_options` where appropriate

649834fd

2015-03-17T11:46:55

reset: `git_checkout_options` is `const`

30640aa9

2015-03-17T10:04:08

rebase: identify a rebase that has not started In `git_rebase_operation_current()`, indicate when a rebase has not started (with `GIT_REBASE_NO_OPERATION`) rather than conflating that with the first operation being in-progress.

efc2fec5

2015-04-19T00:55:00

push: report the update plan to the caller It can be useful for the caller to know which update commands will be sent to the server before the packfile is pushed up. git does this via the pre-push hook. We don't have hooks, but as it adds introspection into what is happening, we can add a callback which performs the same function.

a0e652d2

2015-04-17T12:35:41

Merge pull request #2999 from pks-t/submodule-set-url Implement git_submodule_set_branch.

6f80bf4a

2015-04-16T19:12:28

Merge pull request #3037 from libgit2/cmn/hide-then-push Handle hide-then-push in the revwalk

05d92026

2015-04-13T18:03:03

revwalk: reword the push text As it seems it's not quite clear what it means to push a commit, try to be more explicit about adding a new root and that we may not see this commit if it is hidden.

129788a6

2015-03-18T11:45:18

Implement git_submodule_set_branch.

623fbd93

2015-04-10T11:38:07

Merge pull request #2974 from libgit2/cmn/clone-everything Make sure to pack referenced objects for non-branches

807566d5

2015-04-03T18:59:11

Entry argument passed to git_index_add_frombuffer() should be const

c5e07187

2015-03-24T14:03:51

Merge pull request #2990 from leoyanggit/custom_param Add a custom param to git_smart_subtransport_definition

95d1624b

2015-03-24T08:34:12

Merge pull request #2947 from libgit2/cmn/notes-buf note: use a git_buf to return the default namespace

89ba9f1a

2015-03-18T13:17:04

Merge pull request #2967 from jacquesg/merge-whitespace Allow merges of files (and trees) with whitespace problems/fixes

142e5379

2015-03-17T12:49:33

Add a custom param to git_smart_subtransport_definition The smart transport has already take the payload param. For the sub transport a payload param is useful for the implementer.

a61fa4c0

2015-03-12T01:26:09

packbuilder: introduce git_packbuilder_insert_recur() This function recursively inserts the given object and any referenced ones. It can be thought of as a more general version of the functions to insert a commit or tree.

385449b1

2015-03-04T01:23:20

note: use a git_buf to return the default namespace The caller has otherwise no way to know how long the string will be allocated or ability to free it. This fixes #2944.

9bbc8f35

2015-03-17T10:21:28

Merge pull request #2962 from libgit2/cmn/reflog-annotated Add annotated versions of ref-modying functions

7800048a

2015-03-17T10:06:50

Merge pull request #2972 from libgit2/cmn/pack-objects-walk [WIP] Smarter pack-building

62dd4d71

2015-03-07T00:06:02

annotated_commit: provide a constructor from a revspec This extra constructor will be useful for the annotated versions of ref-modifying functions, as it allows us to create a commit with the extended sha syntax which was used to retrieve it.

62d38a1d

2015-03-06T23:51:40

Add annotated commit versions of reflog-modifying functions We do not always want to put the id directly into the reflog, but we want to speicfy what a user typed. For this use-case we provide annotated version of a few functions which let the caller specify what user-friendly name was used when asking for the operation.

74c37c2a

2015-03-12T13:16:09

Added options to enable patience and minimal diff drivers

13de9363

2015-03-12T12:36:09

Collapse whitespace flags into git_merge_file_flags_t

f29dde68

2015-03-12T12:29:47

Renamed git_merge_options 'flags' to 'tree_flags'

45a86bbf

2015-03-09T17:02:52

Allow for merges with whitespace discrepancies

15f58174

2015-03-11T17:55:39

Merge commit 'refs/pull/2879/head' of ssh://github.com/libgit2/libgit2

04a36fef

2014-10-11T15:48:29

pack-objects: fill a packbuilder from a walk Most use-cases for the object packer communicate in terms of commits which each side has. We already have an object to specify this relationship between commits, namely git_revwalk. By knowing which commits we want to pack and which the other side already has, we can perform similar optimisations to git, by marking each tree as interesting or uninteresting only once, and not sending those trees which we know the other side has.

9a97f49e

2014-12-21T15:31:03

config: borrow refcounted references This changes the get_entry() method to return a refcounted version of the config entry, which you have to free when you're done. This allows us to avoid freeing the memory in which the entry is stored on a refresh, which may happen at any time for a live config. For this reason, get_string() has been forbidden on live configs and a new function get_string_buf() has been added, which stores the string in a git_buf which the user then owns. The functions which parse the string value takea advantage of the borrowing to parse safely and then release the entry.

4e498646

2015-01-15T16:50:31

repository: remove log message override for switching the active branch We want to use the "checkout: moving from ..." message in order to let git know when a change of branch has happened. Make the convenience functions for this goal write this message.

412a3808

2015-01-15T15:31:23

push: remove reflog message override We always use "update by push".

6bfb990d

2015-01-07T14:47:02

branch: don't accept a reflog message override This namespace is about behaving like git's branch command, so let's do exactly that instead of taking a reflog message. This override is still available via the reference namespace.

thodg/libgit2/include

include

Log