kmx git

Commit	Date	Message
fb6b0e01	2013-11-04T10:44:59	Merge pull request #1317 from libgit2/blame Blame Canada
44acdd1f	2013-11-04T08:09:58	Merge pull request #1937 from scunz/checkout_assert Don't assert in git_checkout_tree
35221441	2013-11-02T03:43:34	Checkout: Don't assert if treeish is NULL In git_checkout_tree, the first check tests if either repo or treeish is NULL and says that eithor of them has to have a valid value. But there is no code to handle the treeish == NULL case. So, do something meaningful in that case: use HEAD instead.
10749f6c	2013-11-02T03:20:05	Checkout: Unifiy const-ness of `opts` parameter Since all 3 checkout APIs perform the same operation with the options, all of them should use the same const-ness.
a5c16f3c	2013-11-01T10:18:03	Add git_diff_options_init helper Sometimes the static initializer for git_diff_options cannot be used and since setting them to all zeroes doesn't actually work quite right, this adds a new helper for that situation. This also adds an explicit new value to the submodule settings options to be used when those enums need static initialization.
8e5a8ef8	2013-11-01T09:51:01	Convert git_index_read to have a "force" flag This is a little more intuitive than the turned-around option that I originally wrote.
4bf630b6	2013-10-31T14:36:52	Make diff and status perform soft index reload This changes `git_index_read` to have two modes - a hard index reload that always resets the index to match the on-disk data (which was the old behavior) and a soft index reload that uses the timestamp / file size information and only replaces the index data if the file on disk has been modified. This then updates the git_status code to do a soft reload unless the new GIT_STATUS_OPT_NO_REFRESH flag is passed in. This also changes the behavior of the git_diff functions that use the index so that when an index is not explicitly passed in (i.e. when the functions call git_repository_index for you), they will also do a soft reload for you. This intentionally breaks the file signature of git_index_read because there has been some confusion about the behavior previously and it seems like all existing uses of the API should probably be examined to select the desired behavior.
ac5e507c	2013-11-01T09:31:52	Merge pull request #1918 from libgit2/cmn/indexer-naming indexer: remove the stream infix
3793fa9b	2013-10-31T01:08:50	Fix saving remotes with several fetch/push ref specs. At some moment git_config_delete_entry lost the ability to delete one entry of a multivar configuration. The moment you had more than one fetch or push ref spec for a remote you will not be able to save that remote anymore. The changes in network::remote::remotes::save show that problem. I needed to create a new git_config_delete_multivar because I was not able to remove one or several entries of a multivar config with the current API. Several tries modifying how git_config_set_multivar(..., NULL) behaved were not successful. git_config_delete_multivar is very similar to git_config_set_multivar, and delegates into config_delete_multivar of config_file. This function search for the cvar_t that will be deleted, storing them in a temporal array, and rebuilding the linked list. After calling config_write to delete the entries, the cvar_t stored in the temporal array are freed. There is a little fix in config_write, it avoids an infinite loop when using a regular expression (case for the multivars). This error was found by the test network::remote::remotes::tagopt.
97d32abb	2013-10-30T15:09:32	Remove leftover function declaration
a6154f21	2013-10-30T15:00:05	indexer: remove the stream infix It was there to keep it apart from the one which read in from a file on disk. This other indexer does not exist anymore, so there is no need for anything other than git_indexer to refer to it. While here, rename _add() function to _append() and _finalize() to _commit(). The former change is cosmetic, while the latter avoids talking about "finalizing", which OO languages use to mean something completely different.
42c8f8f8	2013-10-28T11:04:58	Merge remote-tracking branch 'libgit2/development' into blame
5c50f22a	2013-10-28T09:25:44	Merge pull request #1891 from libgit2/cmn/fix-thin-packs Add support for thin packs
5565f3cd	2013-10-28T07:04:58	Merge pull request #1904 from libgit2/cmn/ssh-naming Rename the ssh credentials
8f4a8b09	2013-10-28T06:20:28	Merge pull request #1802 from libgit2/cmn/reflog-backend Make reflog part of refdb
5cb13670	2013-10-23T15:45:29	transport: let the progress output return an error There are any number of issues that can come up in the progress callback, and we should let the user cancel at that point as well.
ab46b1d8	2013-10-23T15:08:18	indexer: include the delta stats The user is unable to derive the number of deltas in the pack, as that would require them to capture the stats exactly in the moment between download and final processing, which is abstracted away in the fetch. Capture these numbers for the user and expose them in the progress struct. The clone and fetch examples now also present this information to the user.
70a8c78f	2013-10-23T12:08:54	Rename the ssh credentials The names from libssh2 are somewhat obtuse for us. We can simplify the usual key/passphrase credential's name, as well as make clearer what the custom signature function is.
1c74686e	2013-10-22T11:55:54	Merge pull request #1897 from libgit2/split-patch-from-diff RFC: Proposed reworking of diff APIs
7ce60099	2013-10-22T11:12:44	Fix typo
98fec8a9	2013-10-22T16:05:47	Implement `git_odb_object_dup`
5de4ec81	2013-10-21T15:36:38	Implement patience and minimal diff flags It seems that to implement these options, we just have to pass the appropriate flags through to the libxdiff code taken from core git. So let's do it (and add a test).
3b5f7954	2013-10-21T13:42:42	Create git_diff_line and extend git_diff_hunk Instead of having functions with so very many parameters to pass hunk and line data, this takes the existing git_diff_hunk struct and extends it with more hunk data, plus adds a git_diff_line. Those structs are used to pass back hunk and line data instead of the old APIs that took tons of parameters. Some work that was previously only being done for git_diff_patch creation (scanning the diff content for exact line counts) is now done for all callbacks, but the performance difference should not be noticable.
2648dc1a	2013-10-21T11:03:31	Allowed credential types should be a bitfield
74a627f0	2013-10-21T09:07:19	Tweak to git_diff_delta structure for nfiles While the base git_diff_delta structure always contains two files, when we introduce conflict data, it will be helpful to have an indicator when an additional file is involved.
629b661c	2013-07-17T09:49:56	checkout (from index) can write conflicts
10672e3e	2013-10-15T15:10:07	Diff API cleanup This lays groundwork for separating formatting options from diff creation options. This groups the formatting flags separately from the diff list creation flags and reorders the options. This also tweaks some APIs to further separate code that uses patches from code that just looks at git_diffs.
3ff1d123	2013-10-11T14:51:54	Rename diff objects and split patch.h This makes no functional change to diff but renames a couple of the objects and splits the new git_patch (formerly git_diff_patch) into a new header file.
893055f2	2013-10-11T17:24:29	indexer: clearer stats for thin packs Don't increase the number of total objects, as it can produce suprising progress output. The only addition compared to pre-thin is the addition of local_objects to allow an output similar to git's "completed with %d local objects".
364d800b	2013-10-10T14:53:07	Move flag dependencies into docs and code.
c1ca2b67	2013-10-10T14:30:05	Include signatures in blame hunks
95c148b2	2013-10-08T17:03:12	Merge pull request #1886 from libgit2/precompose-utf8 Add support for core.precomposeunicode on Mac
867f7c9b	2013-10-08T16:59:59	Rename new fn to git_repository_reinit_filesystem
92dac975	2013-10-08T16:35:57	Make reference lookups apply precomposeunicode Before these changes, looking up a reference would return the same precomposed or decomposed form of the reference name that was used to look it up, so on MacOS which ignores the difference between the two, a single reference could be looked up either way and git_reference_name would return the form of the name that was used to look it up! This change makes lookup always return the precomposed name if core.precomposeunicode is set regardless of which version was used to look it up. The reference iterator was already returning the precomposed form from earlier work. This also updates the CMakeLists.txt rules for enabling iconv usage because the clar tests for this code were actually not being activated properly with the old version. Finally, this moves git_repository_reset_filesystem from include/ git2/repository.h to include/git2/sys/repository.h since it is not really a function that normal library users should have to think about very often.
14997dc5	2013-10-08T12:45:43	More filemode cleanups for FAT on MacOS This cleans up some additional issues. The main change is that on a filesystem that doesn't support mode bits, libgit2 will now create new blobs with GIT_FILEMODE_BLOB always instead of being at the mercy to the filesystem driver to report executable or not. This means that if "core.filemode" lies and claims that filemode is not supported, then we will ignore the executable bit from the filesystem. Previously we would have allowed it. This adds an option to the new git_repository_reset_filesystem to recurse through submodules if desired. There may be other types of APIs that would like a "recurse submodules" option, but this one is particularly useful. This also has a number of cleanups, etc., for related things including trying to give better error messages when problems come up from the filesystem. For example, the FAT filesystem driver on MacOS appears to return errno EINVAL if you attempt to write a filename with invalid UTF-8 in it. We try to capture that with a better error message now.
13f670a5	2013-04-15T09:07:57	tree: allow retrieval of raw attributes When a tool needs to recreate the tree object (for example an interface to another VCS), it needs to use the raw attributes, forgoing any normalization.
5173ea92	2013-10-04T16:32:16	Add git_repository_reset_filesystem and fix tests When a repository is transferred from one file system to another, many of the config settings that represent the properties of the file system may be wrong. This adds a new public API that will refresh the config settings of the repository to account for the change of file system. This doesn't do a full "reinitialize" and operates on a existing git_repository object refreshing the config when done. This commit then makes use of the new API in clar as each test repository is set up. This commit also has a number of other clar test fixes where we were making assumptions about the type of filesystem, either based on outdated config data or based on the OS instead of the FS.
0b33fca0	2013-10-02T13:39:35	indexer: fix thin packs When given an ODB from which to read objects, the indexer will attempt to inject the missing bases at the end of the pack and update the header and trailer to reflect the new contents.
6445ae99	2013-10-04T13:49:26	index: Enhance documentation
146b4d1c	2013-10-03T08:18:41	Merge pull request #1888 from jamill/network_cancellation network cancellation improvements
fc1f7d4f	2013-10-03T06:20:20	Merge branch 'development' into blame Conflicts: include/git2.h
598f069b	2013-10-02T12:42:41	commit: Introduce git_commit_message_raw()
5b188225	2013-10-02T13:45:32	Support cancellation in push operation This commit adds cancellation for the push operation. This work consists of: 1) Support cancellation during push operation - During object counting phase - During network transfer phase - Propagate GIT_EUSER error code out to caller 2) Improve cancellation support during fetch - Handle cancellation request during network transfer phase - Clear error string when cancelled during indexing 3) Fix error handling in git_smart__download_pack Cancellation during push is still only handled in the pack building and network transfer stages of push (and not during packbuilding).
0e0cf787	2013-10-02T14:04:44	clone: put the callbacks struct directly in the clone options There's no need for this to be a pointer to somewhere else.
0174794a	2013-08-21T05:12:49	reflog: bring _append and _drop back to the frontend These functions act purely on the reflog data structure.
d274deea	2013-08-20T11:12:34	reflog: add a convenience append function Provide a function that reads a reflog, performs an append and writes back to the backend in one call.
b976f3c2	2013-08-19T13:01:49	reflog: move the reflog implementation into refdb_fs References and their logs are logically coupled, let's make it so in the code by moving the fs-based reflog implementation to live next to the fs-based refs one. As part of the change, make the function take names rather than references, as only the names are relevant when looking up and handling reflogs.
ffc97d51	2013-09-20T23:23:42	remote: add some comments to the callback struct Hopefully clear up what they're for.
36a241ac	2013-09-20T23:14:52	clone: mention clone_into in the clone documentation Make the difference more explicit.
c833893c	2013-09-20T22:57:01	clone: re-allow using a custom remote name This is a small thing that by itself doesn't quite justify making the user use clone_into.
eec1c1fe	2013-09-20T22:49:20	clone: const-ify checkout options The removal of many options which lead to the direct usage of the user's checkout options means we should make sure they remain const.
b9bf5d70	2013-09-20T22:46:32	clone: re-add a way to ignore certificate errors This used to be done via transport flags, which was removed in a previous commit.
6ac15eff	2013-09-20T22:34:05	clone: remove more options from basic clone The basic clone function is there to make it easy to create a "normal" clone. Remove a bunch of options that are about changing the remote's configuration.
c8dbec48	2013-09-16T18:42:53	clone: remove the autotag option Downloading all tags is part of what makes it a clone instead of simply a fetch.
fe3a40a4	2013-09-16T16:54:37	remote: add a convenience 'fetch' function.
d19870d9	2013-09-16T05:10:55	clone: implement git_clone_into This allows you to set up the repository and remote as you which to have them before performing the clone operation.
e3c131c5	2013-09-16T05:02:25	remote: move the credentials callback to the struct Move this one as well, letting us have a single way of setting the callbacks for the remote, and removing fields from the clone options.
d31402a3	2013-09-16T04:20:05	remote: put the _download() callback with the others The text progress and update_tips callbacks are already part of the struct, which was meant to unify the callback setup, but the download one was left out.
83786956	2013-01-04T14:39:05	Add git_transport_register, git_transport_unregister
b176eded	2013-09-19T14:52:57	Initial Implementation of progress reports during push This adds the basics of progress reporting during push. While progress for all aspects of a push operation are not reported with this change, it lays the foundation to add these later. Push progress reporting can be improved in the future - and consumers of the API should just get more accurate information at that point. The main areas where this is lacking are: 1) packbuilding progress: does not report progress during deltafication, as this involves coordinating progress from multiple threads. 2) network progress: reports progress as objects and bytes are going to be written to the subtransport (instead of as client gets confirmation that they have been received by the server) and leaves out some of the bytes that are transfered as part of the push protocol. Basically, this reports the pack bytes that are written to the subtransport. It does not report the bytes sent on the wire that are received by the server. This should be a good estimate of progress (and an improvement over no progress).
7d692454	2013-09-27T16:08:24	Add refdb.h to git2.h, reorder git2.h sanely
41dd999d	2013-09-25T14:47:32	Merge branch 'development' into blame
f7db1b6f	2013-09-25T14:46:59	Trim API, document which parts aren't done
49781a03	2013-09-25T14:40:19	Blame: minor cleanup
e0b267af	2013-09-25T10:49:25	That's the refdb, it's not the odb...
4a1b4015	2013-09-24T10:32:40	Merge pull request #1865 from arrbee/various-cleanups Various warning cleanup and minor fixes
e3f3868a	2013-09-24T11:04:14	'del' instead of 'delete' for the poor C++ users
1ca3e49f	2013-09-23T13:34:01	Clean up newly introduced warnings The attempt to "clean up warnings" seems to have introduced some new warnings on compliant compilers. This fixes those in a way that I suspect will also be okay for the non-compliant compilers. Also this fixes what appears to be an extra semicolon in the repo initialization template dir handling (and as part of that fix, handles the case where an error occurs correctly).
10edb7a9	2013-09-22T13:46:39	Merge pull request #1863 from linquize/typo Fix typo in documentation
07fb67f9	2013-09-22T05:55:39	merge: reverse array and length parameter order Make it pair up with the one for commits. This fixes #1691.
1b57699a	2013-09-22T09:11:43	Fix typo in documentation
92d19d16	2013-09-21T09:34:03	Merge pull request #1840 from linquize/warning Fix warning
25c47aae	2013-09-20T14:31:51	Detect boundaries, support limiting commit range
66566516	2013-09-08T17:15:42	Fix warning
3d4f1698	2013-09-17T10:21:22	Merge pull request #1858 from linquize/win32-template-dir Configurable template dir for Win32
eefc32d5	2013-09-16T12:54:40	Bug fixes and cleanups This contains a few bug fixes and some header and API cleanups. The main API change is that filters should now use GIT_PASSTHROUGH to indicate that they wish to skip processing a file instead of GIT_ENOTFOUND. The bug fixes include a possible out-of-range buffer access in the ident filter, a filter ordering problem I introduced into the custom filter tests on Windows, and a filter buf NUL termination issue that was coming up on Linux.
eab3746b	2013-09-15T22:23:39	More filtering tests including order This adds more tests of filters, including the ident filter when mixed with custom filters. I was able to combine with the reverse filter and demonstrate that the order of filter application with the default priority constants matches the order of core Git. Also, this fixes two issues in the ident filter: preventing ident expansion on binary files and avoiding a NULL dereference when dollar sign characters are found without Id.
b47349b8	2013-09-12T14:48:24	Port tests from PR 1683 This ports over some of the tests from https://github.com/libgit2/libgit2/pull/1683 by @yorah and @ethomson
a9f51e43	2013-09-11T22:00:36	Merge git_buf and git_buffer This makes the git_buf struct that was used internally into an externally available structure and eliminates the git_buffer. As part of that, some of the special cases that arose with the externally used git_buffer were blended into the git_buf, such as being careful about git_buf objects that may have a NULL ptr and allowing for bufs with a valid ptr and size but zero asize as a way of referring to externally owned data.
4b11f25a	2013-09-11T16:38:33	Add ident filter This adds the ident filter (that knows how to replace $Id$) and tweaks the filter APIs and code so that git_filter_source objects actually have the updated OID of the object being filtered when it is a known value.
40cb40fa	2013-09-11T14:23:39	Add functions to manipulate filter lists Extend the git2/sys/filter API with functions to look up a filter and add it manually to a filter list. This requires some trickery because the regular attribute lookups and checks are bypassed when this happens, but in the right hands, it will allow a user to have granular control over applying filters.
29e92d38	2013-09-10T16:53:09	Hook up filter initialize callback I knew I forgot something
2a7d224f	2013-09-10T16:33:32	Extend public filter api with filter lists This moves the git_filter_list into the public API so that users can create, apply, and dispose of filter lists. This allows more granular application of filters to user data outside of libgit2 internals. This also converts all the internal usage of filters to the public APIs along with a few small tweaks to make it easier to use the public git_buffer stuff alongside the internal git_buf.
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.
570ba25c	2013-08-30T16:02:07	Make git_filter_source opaque
85d54812	2013-08-28T16:44:04	Create public filter object and use it This creates include/sys/filter.h with a basic definition of a git_filter and then converts the internal code to use it. There are related internal objects (git_filter_list) that we will want to publish at some point, but this is a first step.
0cf77103	2013-08-26T23:17:07	Start of filter API + git_blob_filtered_content This begins the process of exposing git_filter objects to the public API. This includes: * new public type and API for `git_buffer` through which an allocated buffer can be passed to the user * new API `git_blob_filtered_content` * make the git_filter type and GIT_FILTER_TO_... constants public
b99b10f2	2013-09-17T23:38:52	Can git_libgit2_opts() with GIT_OPT_GET_TEMPLATE_PATH and GIT_OPT_SET_TEMPLATE_PATH
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.
ceab4e26	2013-09-16T16:20:38	Port blame from git.git
54993167	2013-09-16T16:12:31	Merge branch 'development' into blame_rebased Conflicts: include/git2.h
b622aabe	2013-08-09T13:14:06	Add a wrapper to provide the libssh2 error message
f2df503b	2013-09-14T18:22:16	git_clone supports optional init_options
6c38e60a	2013-09-10T16:55:58	Merge pull request #1838 from libgit2/cmn/first-parent revwalk: allow simplifying by first-parent
15f7b9b8	2013-09-08T00:52:26	revwalk: allow simplifying by first-parent When enabled, only the first parent of each commit will be queued, enabling a simple way of using first-parent simplification.
f313843c	2013-09-09T13:53:22	fixing headers with bad values for objective-c
e0b4a8ac	2013-09-09T10:30:31	Merge pull request #1842 from uh-sem-blee/development fixes issues with objective-git
4dfe3820	2013-09-09T10:24:48	Comment updates
917e5fa9	2013-09-08T18:31:56	fixes issues with objective-git

fb6b0e01

2013-11-04T10:44:59

Merge pull request #1317 from libgit2/blame Blame Canada

44acdd1f

2013-11-04T08:09:58

Merge pull request #1937 from scunz/checkout_assert Don't assert in git_checkout_tree

35221441

2013-11-02T03:43:34

Checkout: Don't assert if treeish is NULL In git_checkout_tree, the first check tests if either repo or treeish is NULL and says that eithor of them has to have a valid value. But there is no code to handle the treeish == NULL case. So, do something meaningful in that case: use HEAD instead.

10749f6c

2013-11-02T03:20:05

Checkout: Unifiy const-ness of `opts` parameter Since all 3 checkout APIs perform the same operation with the options, all of them should use the same const-ness.

a5c16f3c

2013-11-01T10:18:03

Add git_diff_options_init helper Sometimes the static initializer for git_diff_options cannot be used and since setting them to all zeroes doesn't actually work quite right, this adds a new helper for that situation. This also adds an explicit new value to the submodule settings options to be used when those enums need static initialization.

8e5a8ef8

2013-11-01T09:51:01

Convert git_index_read to have a "force" flag This is a little more intuitive than the turned-around option that I originally wrote.

4bf630b6

2013-10-31T14:36:52

Make diff and status perform soft index reload This changes `git_index_read` to have two modes - a hard index reload that always resets the index to match the on-disk data (which was the old behavior) and a soft index reload that uses the timestamp / file size information and only replaces the index data if the file on disk has been modified. This then updates the git_status code to do a soft reload unless the new GIT_STATUS_OPT_NO_REFRESH flag is passed in. This also changes the behavior of the git_diff functions that use the index so that when an index is not explicitly passed in (i.e. when the functions call git_repository_index for you), they will also do a soft reload for you. This intentionally breaks the file signature of git_index_read because there has been some confusion about the behavior previously and it seems like all existing uses of the API should probably be examined to select the desired behavior.

ac5e507c

2013-11-01T09:31:52

Merge pull request #1918 from libgit2/cmn/indexer-naming indexer: remove the stream infix

3793fa9b

2013-10-31T01:08:50

Fix saving remotes with several fetch/push ref specs. At some moment git_config_delete_entry lost the ability to delete one entry of a multivar configuration. The moment you had more than one fetch or push ref spec for a remote you will not be able to save that remote anymore. The changes in network::remote::remotes::save show that problem. I needed to create a new git_config_delete_multivar because I was not able to remove one or several entries of a multivar config with the current API. Several tries modifying how git_config_set_multivar(..., NULL) behaved were not successful. git_config_delete_multivar is very similar to git_config_set_multivar, and delegates into config_delete_multivar of config_file. This function search for the cvar_t that will be deleted, storing them in a temporal array, and rebuilding the linked list. After calling config_write to delete the entries, the cvar_t stored in the temporal array are freed. There is a little fix in config_write, it avoids an infinite loop when using a regular expression (case for the multivars). This error was found by the test network::remote::remotes::tagopt.

97d32abb

2013-10-30T15:09:32

Remove leftover function declaration

a6154f21

2013-10-30T15:00:05

indexer: remove the stream infix It was there to keep it apart from the one which read in from a file on disk. This other indexer does not exist anymore, so there is no need for anything other than git_indexer to refer to it. While here, rename _add() function to _append() and _finalize() to _commit(). The former change is cosmetic, while the latter avoids talking about "finalizing", which OO languages use to mean something completely different.

42c8f8f8

2013-10-28T11:04:58

Merge remote-tracking branch 'libgit2/development' into blame

5c50f22a

2013-10-28T09:25:44

Merge pull request #1891 from libgit2/cmn/fix-thin-packs Add support for thin packs

5565f3cd

2013-10-28T07:04:58

Merge pull request #1904 from libgit2/cmn/ssh-naming Rename the ssh credentials

8f4a8b09

2013-10-28T06:20:28

Merge pull request #1802 from libgit2/cmn/reflog-backend Make reflog part of refdb

5cb13670

2013-10-23T15:45:29

transport: let the progress output return an error There are any number of issues that can come up in the progress callback, and we should let the user cancel at that point as well.

ab46b1d8

2013-10-23T15:08:18

indexer: include the delta stats The user is unable to derive the number of deltas in the pack, as that would require them to capture the stats exactly in the moment between download and final processing, which is abstracted away in the fetch. Capture these numbers for the user and expose them in the progress struct. The clone and fetch examples now also present this information to the user.

70a8c78f

2013-10-23T12:08:54

Rename the ssh credentials The names from libssh2 are somewhat obtuse for us. We can simplify the usual key/passphrase credential's name, as well as make clearer what the custom signature function is.

1c74686e

2013-10-22T11:55:54

Merge pull request #1897 from libgit2/split-patch-from-diff RFC: Proposed reworking of diff APIs

7ce60099

2013-10-22T11:12:44

Fix typo

98fec8a9

2013-10-22T16:05:47

Implement `git_odb_object_dup`

5de4ec81

2013-10-21T15:36:38

Implement patience and minimal diff flags It seems that to implement these options, we just have to pass the appropriate flags through to the libxdiff code taken from core git. So let's do it (and add a test).

3b5f7954

2013-10-21T13:42:42

Create git_diff_line and extend git_diff_hunk Instead of having functions with so very many parameters to pass hunk and line data, this takes the existing git_diff_hunk struct and extends it with more hunk data, plus adds a git_diff_line. Those structs are used to pass back hunk and line data instead of the old APIs that took tons of parameters. Some work that was previously only being done for git_diff_patch creation (scanning the diff content for exact line counts) is now done for all callbacks, but the performance difference should not be noticable.

2648dc1a

2013-10-21T11:03:31

Allowed credential types should be a bitfield

74a627f0

2013-10-21T09:07:19

Tweak to git_diff_delta structure for nfiles While the base git_diff_delta structure always contains two files, when we introduce conflict data, it will be helpful to have an indicator when an additional file is involved.

629b661c

2013-07-17T09:49:56

checkout (from index) can write conflicts

10672e3e

2013-10-15T15:10:07

Diff API cleanup This lays groundwork for separating formatting options from diff creation options. This groups the formatting flags separately from the diff list creation flags and reorders the options. This also tweaks some APIs to further separate code that uses patches from code that just looks at git_diffs.

3ff1d123

2013-10-11T14:51:54

Rename diff objects and split patch.h This makes no functional change to diff but renames a couple of the objects and splits the new git_patch (formerly git_diff_patch) into a new header file.

893055f2

2013-10-11T17:24:29

indexer: clearer stats for thin packs Don't increase the number of total objects, as it can produce suprising progress output. The only addition compared to pre-thin is the addition of local_objects to allow an output similar to git's "completed with %d local objects".

364d800b

2013-10-10T14:53:07

Move flag dependencies into docs and code.

c1ca2b67

2013-10-10T14:30:05

Include signatures in blame hunks

95c148b2

2013-10-08T17:03:12

Merge pull request #1886 from libgit2/precompose-utf8 Add support for core.precomposeunicode on Mac

867f7c9b

2013-10-08T16:59:59

Rename new fn to git_repository_reinit_filesystem

92dac975

2013-10-08T16:35:57

Make reference lookups apply precomposeunicode Before these changes, looking up a reference would return the same precomposed or decomposed form of the reference name that was used to look it up, so on MacOS which ignores the difference between the two, a single reference could be looked up either way and git_reference_name would return the form of the name that was used to look it up! This change makes lookup always return the precomposed name if core.precomposeunicode is set regardless of which version was used to look it up. The reference iterator was already returning the precomposed form from earlier work. This also updates the CMakeLists.txt rules for enabling iconv usage because the clar tests for this code were actually not being activated properly with the old version. Finally, this moves git_repository_reset_filesystem from include/ git2/repository.h to include/git2/sys/repository.h since it is not really a function that normal library users should have to think about very often.

14997dc5

2013-10-08T12:45:43

More filemode cleanups for FAT on MacOS This cleans up some additional issues. The main change is that on a filesystem that doesn't support mode bits, libgit2 will now create new blobs with GIT_FILEMODE_BLOB always instead of being at the mercy to the filesystem driver to report executable or not. This means that if "core.filemode" lies and claims that filemode is not supported, then we will ignore the executable bit from the filesystem. Previously we would have allowed it. This adds an option to the new git_repository_reset_filesystem to recurse through submodules if desired. There may be other types of APIs that would like a "recurse submodules" option, but this one is particularly useful. This also has a number of cleanups, etc., for related things including trying to give better error messages when problems come up from the filesystem. For example, the FAT filesystem driver on MacOS appears to return errno EINVAL if you attempt to write a filename with invalid UTF-8 in it. We try to capture that with a better error message now.

13f670a5

2013-04-15T09:07:57

tree: allow retrieval of raw attributes When a tool needs to recreate the tree object (for example an interface to another VCS), it needs to use the raw attributes, forgoing any normalization.

5173ea92

2013-10-04T16:32:16

Add git_repository_reset_filesystem and fix tests When a repository is transferred from one file system to another, many of the config settings that represent the properties of the file system may be wrong. This adds a new public API that will refresh the config settings of the repository to account for the change of file system. This doesn't do a full "reinitialize" and operates on a existing git_repository object refreshing the config when done. This commit then makes use of the new API in clar as each test repository is set up. This commit also has a number of other clar test fixes where we were making assumptions about the type of filesystem, either based on outdated config data or based on the OS instead of the FS.

0b33fca0

2013-10-02T13:39:35

indexer: fix thin packs When given an ODB from which to read objects, the indexer will attempt to inject the missing bases at the end of the pack and update the header and trailer to reflect the new contents.

6445ae99

2013-10-04T13:49:26

index: Enhance documentation

146b4d1c

2013-10-03T08:18:41

Merge pull request #1888 from jamill/network_cancellation network cancellation improvements

fc1f7d4f

2013-10-03T06:20:20

Merge branch 'development' into blame Conflicts: include/git2.h

598f069b

2013-10-02T12:42:41

commit: Introduce git_commit_message_raw()

5b188225

2013-10-02T13:45:32

Support cancellation in push operation This commit adds cancellation for the push operation. This work consists of: 1) Support cancellation during push operation - During object counting phase - During network transfer phase - Propagate GIT_EUSER error code out to caller 2) Improve cancellation support during fetch - Handle cancellation request during network transfer phase - Clear error string when cancelled during indexing 3) Fix error handling in git_smart__download_pack Cancellation during push is still only handled in the pack building and network transfer stages of push (and not during packbuilding).

0e0cf787

2013-10-02T14:04:44

clone: put the callbacks struct directly in the clone options There's no need for this to be a pointer to somewhere else.

0174794a

2013-08-21T05:12:49

reflog: bring _append and _drop back to the frontend These functions act purely on the reflog data structure.

d274deea

2013-08-20T11:12:34

reflog: add a convenience append function Provide a function that reads a reflog, performs an append and writes back to the backend in one call.

b976f3c2

2013-08-19T13:01:49

reflog: move the reflog implementation into refdb_fs References and their logs are logically coupled, let's make it so in the code by moving the fs-based reflog implementation to live next to the fs-based refs one. As part of the change, make the function take names rather than references, as only the names are relevant when looking up and handling reflogs.

ffc97d51

2013-09-20T23:23:42

remote: add some comments to the callback struct Hopefully clear up what they're for.

36a241ac

2013-09-20T23:14:52

clone: mention clone_into in the clone documentation Make the difference more explicit.

c833893c

2013-09-20T22:57:01

clone: re-allow using a custom remote name This is a small thing that by itself doesn't quite justify making the user use clone_into.

eec1c1fe

2013-09-20T22:49:20

clone: const-ify checkout options The removal of many options which lead to the direct usage of the user's checkout options means we should make sure they remain const.

b9bf5d70

2013-09-20T22:46:32

clone: re-add a way to ignore certificate errors This used to be done via transport flags, which was removed in a previous commit.

6ac15eff

2013-09-20T22:34:05

clone: remove more options from basic clone The basic clone function is there to make it easy to create a "normal" clone. Remove a bunch of options that are about changing the remote's configuration.

c8dbec48

2013-09-16T18:42:53

clone: remove the autotag option Downloading all tags is part of what makes it a clone instead of simply a fetch.

fe3a40a4

2013-09-16T16:54:37

remote: add a convenience 'fetch' function.

d19870d9

2013-09-16T05:10:55

clone: implement git_clone_into This allows you to set up the repository and remote as you which to have them before performing the clone operation.

e3c131c5

2013-09-16T05:02:25

remote: move the credentials callback to the struct Move this one as well, letting us have a single way of setting the callbacks for the remote, and removing fields from the clone options.

d31402a3

2013-09-16T04:20:05

remote: put the _download() callback with the others The text progress and update_tips callbacks are already part of the struct, which was meant to unify the callback setup, but the download one was left out.

83786956

2013-01-04T14:39:05

Add git_transport_register, git_transport_unregister

b176eded

2013-09-19T14:52:57

Initial Implementation of progress reports during push This adds the basics of progress reporting during push. While progress for all aspects of a push operation are not reported with this change, it lays the foundation to add these later. Push progress reporting can be improved in the future - and consumers of the API should just get more accurate information at that point. The main areas where this is lacking are: 1) packbuilding progress: does not report progress during deltafication, as this involves coordinating progress from multiple threads. 2) network progress: reports progress as objects and bytes are going to be written to the subtransport (instead of as client gets confirmation that they have been received by the server) and leaves out some of the bytes that are transfered as part of the push protocol. Basically, this reports the pack bytes that are written to the subtransport. It does not report the bytes sent on the wire that are received by the server. This should be a good estimate of progress (and an improvement over no progress).

7d692454

2013-09-27T16:08:24

Add refdb.h to git2.h, reorder git2.h sanely

41dd999d

2013-09-25T14:47:32

Merge branch 'development' into blame

f7db1b6f

2013-09-25T14:46:59

Trim API, document which parts aren't done

49781a03

2013-09-25T14:40:19

Blame: minor cleanup

e0b267af

2013-09-25T10:49:25

That's the refdb, it's not the odb...

4a1b4015

2013-09-24T10:32:40

Merge pull request #1865 from arrbee/various-cleanups Various warning cleanup and minor fixes

e3f3868a

2013-09-24T11:04:14

'del' instead of 'delete' for the poor C++ users

1ca3e49f

2013-09-23T13:34:01

Clean up newly introduced warnings The attempt to "clean up warnings" seems to have introduced some new warnings on compliant compilers. This fixes those in a way that I suspect will also be okay for the non-compliant compilers. Also this fixes what appears to be an extra semicolon in the repo initialization template dir handling (and as part of that fix, handles the case where an error occurs correctly).

10edb7a9

2013-09-22T13:46:39

Merge pull request #1863 from linquize/typo Fix typo in documentation

07fb67f9

2013-09-22T05:55:39

merge: reverse array and length parameter order Make it pair up with the one for commits. This fixes #1691.

1b57699a

2013-09-22T09:11:43

Fix typo in documentation

92d19d16

2013-09-21T09:34:03

Merge pull request #1840 from linquize/warning Fix warning

25c47aae

2013-09-20T14:31:51

Detect boundaries, support limiting commit range

66566516

2013-09-08T17:15:42

Fix warning

3d4f1698

2013-09-17T10:21:22

Merge pull request #1858 from linquize/win32-template-dir Configurable template dir for Win32

eefc32d5

2013-09-16T12:54:40

Bug fixes and cleanups This contains a few bug fixes and some header and API cleanups. The main API change is that filters should now use GIT_PASSTHROUGH to indicate that they wish to skip processing a file instead of GIT_ENOTFOUND. The bug fixes include a possible out-of-range buffer access in the ident filter, a filter ordering problem I introduced into the custom filter tests on Windows, and a filter buf NUL termination issue that was coming up on Linux.

eab3746b

2013-09-15T22:23:39

More filtering tests including order This adds more tests of filters, including the ident filter when mixed with custom filters. I was able to combine with the reverse filter and demonstrate that the order of filter application with the default priority constants matches the order of core Git. Also, this fixes two issues in the ident filter: preventing ident expansion on binary files and avoiding a NULL dereference when dollar sign characters are found without Id.

b47349b8

2013-09-12T14:48:24

Port tests from PR 1683 This ports over some of the tests from https://github.com/libgit2/libgit2/pull/1683 by @yorah and @ethomson

a9f51e43

2013-09-11T22:00:36

Merge git_buf and git_buffer This makes the git_buf struct that was used internally into an externally available structure and eliminates the git_buffer. As part of that, some of the special cases that arose with the externally used git_buffer were blended into the git_buf, such as being careful about git_buf objects that may have a NULL ptr and allowing for bufs with a valid ptr and size but zero asize as a way of referring to externally owned data.

4b11f25a

2013-09-11T16:38:33

Add ident filter This adds the ident filter (that knows how to replace $Id$) and tweaks the filter APIs and code so that git_filter_source objects actually have the updated OID of the object being filtered when it is a known value.

40cb40fa

2013-09-11T14:23:39

Add functions to manipulate filter lists Extend the git2/sys/filter API with functions to look up a filter and add it manually to a filter list. This requires some trickery because the regular attribute lookups and checks are bypassed when this happens, but in the right hands, it will allow a user to have granular control over applying filters.

29e92d38

2013-09-10T16:53:09

Hook up filter initialize callback I knew I forgot something

2a7d224f

2013-09-10T16:33:32

Extend public filter api with filter lists This moves the git_filter_list into the public API so that users can create, apply, and dispose of filter lists. This allows more granular application of filters to user data outside of libgit2 internals. This also converts all the internal usage of filters to the public APIs along with a few small tweaks to make it easier to use the public git_buffer stuff alongside the internal git_buf.

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.

570ba25c

2013-08-30T16:02:07

Make git_filter_source opaque

85d54812

2013-08-28T16:44:04

Create public filter object and use it This creates include/sys/filter.h with a basic definition of a git_filter and then converts the internal code to use it. There are related internal objects (git_filter_list) that we will want to publish at some point, but this is a first step.

0cf77103

2013-08-26T23:17:07

Start of filter API + git_blob_filtered_content This begins the process of exposing git_filter objects to the public API. This includes: * new public type and API for `git_buffer` through which an allocated buffer can be passed to the user * new API `git_blob_filtered_content` * make the git_filter type and GIT_FILTER_TO_... constants public

b99b10f2

2013-09-17T23:38:52

Can git_libgit2_opts() with GIT_OPT_GET_TEMPLATE_PATH and GIT_OPT_SET_TEMPLATE_PATH

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.

ceab4e26

2013-09-16T16:20:38

Port blame from git.git

54993167

2013-09-16T16:12:31

Merge branch 'development' into blame_rebased Conflicts: include/git2.h

b622aabe

2013-08-09T13:14:06

Add a wrapper to provide the libssh2 error message

f2df503b

2013-09-14T18:22:16

git_clone supports optional init_options

6c38e60a

2013-09-10T16:55:58

Merge pull request #1838 from libgit2/cmn/first-parent revwalk: allow simplifying by first-parent

15f7b9b8

2013-09-08T00:52:26

revwalk: allow simplifying by first-parent When enabled, only the first parent of each commit will be queued, enabling a simple way of using first-parent simplification.

f313843c

2013-09-09T13:53:22

fixing headers with bad values for objective-c

e0b4a8ac

2013-09-09T10:30:31

Merge pull request #1842 from uh-sem-blee/development fixes issues with objective-git

4dfe3820

2013-09-09T10:24:48

Comment updates

917e5fa9

2013-09-08T18:31:56

fixes issues with objective-git

thodg/libgit2/include

include

Log