kmx git

Commit	Date	Message
653ec420	2013-11-01T17:25:32	Merge remote-tracking branch 'drodriguez/fix-remote-save' into development
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.
887df99f	2013-10-31T13:29:16	Test another bad URL
7be5104d	2013-10-31T13:15:49	Add tests for badly-formed URLs
ff0ef88c	2013-10-30T18:54:39	Test more kinds of bad url
5c50f22a	2013-10-28T09:25:44	Merge pull request #1891 from libgit2/cmn/fix-thin-packs Add support for thin packs
064e6e81	2013-10-28T07:05:13	Merge pull request #1912 from ethomson/push_err_messages Test for failure, but don't test the error message
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
9d41984c	2013-10-25T14:14:22	Test for failure, but don't test the error message
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
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
216f97e4	2013-09-23T09:47:47	Two-step conflict checkout (load / perform) Move conflict handling into two steps: load the conflicts and then apply the conflicts. This is more compatible with the existing checkout implementation and makes progress reporting more sane.
cfae7f85	2013-08-09T20:23:36	Honor UPDATE_ONLY bit when checking out conflicts
e47f859d	2013-08-08T16:46:49	Don't overwrite ~ files checking out conflicts If a D/F conflict or rename 2->1 conflict occurs, we write the file sides as filename~branchname. If a file with that name already exists in the working directory, write as filename~branchname_0 instead. (Incrementing 0 until a unique filename is found.)
96d799aa	2013-07-23T15:32:42	checkout rename conflicts rename conflict tests for checkout conflicts, don't suffix filenames when checking out with USE_OURS or USE_THEIRS
4f7897ab	2013-07-22T08:51:29	Prevent checkout_tree when conflicts exist, clear NAME on checkout tree Prevent checkout tree when unresolved changes exist (unless FORCE flag is specified). Clear NAME table when checking out, to avoid checkout_conflicts from attempting to manipulate it. Ensure that NAME is also cleared at reset.
3acf44d6	2013-07-17T09:43:32	tests for checkout index with 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.
2c2b0ebb	2013-10-11T09:47:05	Merge pull request #1562 from libgit2/cmn/refs-namespace-lookup Provide the user with a more useful error code when a looking up a reference which name points to a namepace
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".
7c9f5bec	2013-08-17T07:11:31	futils: return GIT_ENOTFOUND when trying to read a directory This lets the reference code return not-found when the user asks to look up a reference when in fact they pass a namespace.
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.
d5e83627	2013-10-08T14:41:32	Case sensitivity issues on Linux A couple of tests were actually dealing incorrectly with case sensitivity issues on Linux because they were relying on having core.ignorecase set to true. Now that the fixture initialization sets the case sensitivity to be accurate for the platform, it exposed bugs in these tests.
1fd21b03	2013-10-08T13:59:43	Add Assembla unit test
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.
cfd192b0	2013-10-03T12:44:34	Add test for multiple thread init/shutdown
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.
da7b78fa	2013-10-04T14:03:12	index: Make _read() cope with index file creation
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.
34b8eafc	2013-10-04T11:36:40	Tabify indentations
cf0582b4	2013-10-02T12:22:54	indexer: do multiple passes over the delta list Though unusual, a packfile may contain a delta whose base is a delta that comes later. In order index such a packfile, we must not give up on the first failure to resolve a delta, but keep it around. If there is a pass which makes no progress, this indicates that the packfile is broken, so fail accordingly.
b8f9059d	2013-10-03T15:16:06	More cleanups to remove WIN assumptions This cleans up more of the test suite to check actual filesystem behavior instead of relying on Windows vs. Mac vs. Linux to test.
840fb4fc	2013-10-03T14:42:37	Update repo init with fewer platform assumptions The repo init code was assuming Windows == no filemode, and Mac or Windows == no case sensitivity. Those assumptions are not consistently true depending on the mounted file system. This is a first step to removing those assumptions. It focuses on the repo init code and the tests of that code. There are still many other tests that are broken when those assumptions don't hold true, but this clears up one area of the code. Also, this moves the core.precomposeunicode logic to be closer to the current logic in core Git where it will be set to true on any filesystem where composed unicode is decomposed when read back.
af302aca	2013-10-02T14:13:11	Clean up annoying warnings The indexer code was generating warnings on Windows 64-bit. I looked closely at the logic and was able to simplify it a bit. Also this fixes some other Windows and Linux warnings.
618b7689	2013-10-02T12:06:26	Wrap iconv stuff and write tests This adds a simple wrapper around the iconv APIs and uses it instead of the old code that was inlining the iconv stuff. This makes it possible for me to test the iconv logic in isolation. A "no iconv" version of the API was defined with macros so that I could have fewer ifdefs in the code itself.
d0849f83	2013-10-02T11:07:18	Simplify git_path_is_empty_dir implementation This simplifies git_path_is_empty_dir on both Windows (getting rid of git_buf allocation inside the function) and other platforms (by just using git_path_direach), and adds tests for the function, and uses the function to simplify some existing tests.
219d3457	2013-10-01T16:12:15	Initial iconv hookup for precomposed unicode This hooks up git_path_direach and git_path_dirload so that they will take a flag indicating if directory entry names should be tested and converted from decomposed unicode to precomposed form. This code will only come into play on the Apple platform and even then, only when certain types of filesystems are used. This involved adding a flag to these functions which involved changing a lot of places in the code. This was an opportunity to do a bit of code cleanup here and there, for example, getting rid of the git_futils_cleanupdir_r function in favor of a simple flag to git_futils_rmdir_r to not remove the top level entry. That ended up adding depth tracking during rmdir_r which led to a safety check for infinite directory recursion. Yay. This hasn't actually been tested on the Mac filesystems where the issue occurs. I still need to get test environment for that.
6b7991e2	2013-09-30T16:13:53	Add check if we need to precompose unicode on Mac This adds initialization of core.precomposeunicode to repo init on Mac. This is necessary because when a Mac accesses a repo on a VFAT or SAMBA file system, it will return directory entries in decomposed unicode even if the filesystem entry is precomposed. This also removes caching of a number of repo properties from the repo init pipeline because these are properties of the specific filesystem on which the repo is created, not of the system as a whole.
146b4d1c	2013-10-03T08:18:41	Merge pull request #1888 from jamill/network_cancellation network cancellation improvements
7baa7631	2013-10-02T15:39:18	Style tweaks and changes for code review feedback
ab136876	2013-10-03T04:36:29	Merge pull request #1887 from libgit2/ntk/topic/git_message_raw commit: Introduce git_commit_message_raw()
598f069b	2013-10-02T12:42:41	commit: Introduce git_commit_message_raw()
41a6de28	2013-10-02T14:45:57	HTTP: handle "relative" redirects
83db7e09	2013-10-02T15:10:39	Fix broken online push tests
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.
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.
fdc7e5e3	2013-09-20T23:14:12	clone: bring back NULL as defaults This wasremoved as part of the large culling a few commits ago.
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.
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.
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.
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.
c655aa52	2013-10-01T05:54:54	Merge pull request #1882 from linquize/config-subsection-fix Config subsection name should allow to have ']' and '\\' should allow to escape any characters
8d741253	2013-10-01T09:46:56	Add negative test cases for config header with invalid characters
d52a93fa	2013-09-30T23:58:58	Add test case to test ']' and '\\' characters in config subsection
fba14763	2013-09-30T15:03:35	Merge pull request #1879 from libgit2/redir-refactor Redir refactor
a6884b6f	2013-09-30T14:58:45	Merge pull request #1412 from jamill/push_progress Initial Implementation of progress reports during push
9acde162	2013-09-30T14:57:48	Merge pull request #1881 from libgit2/ignore-submodules-in-stash Never consider submodules for stashing
ae5a9352	2013-09-30T14:47:56	Ensure submodule repos and indices are freed ...before the helper's cleanup method tries to delete their files.
dc56fea7	2013-09-30T12:18:19	Merge pull request #1878 from libgit2/ntk/fix/warnings Fix x86/x64 size_t related warnings
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).
d27a441d	2013-09-30T11:30:28	commit: Trim message leading newlines Fix libgit2/libgit2sharp#522
27c8eb2a	2013-09-30T11:18:06	Tabify indentations
526d4c94	2013-09-27T21:39:28	Test that submodules don't affect stashing
0049d4d1	2013-09-26T16:25:34	Make sure utility doesn't leak memory
ea59f659	2013-09-26T16:20:30	Deploy gitno_connection_data into transport (winhttp) ...and have that call manage replaced memory in the output structure.
8a1e925d	2013-09-26T12:00:35	Fix warnings
8988688c	2013-09-25T20:41:56	Migrate redirect URL handling to common utility
1c8de380	2013-09-20T16:58:04	Make tests pass if XDG config exists
eb0ff130	2013-09-24T14:07:08	Disconnect path string to preserve after redirect The subtransport path was relying on pointing to data owned by the remote which meant that after a redirect, the updated path was getting lost for future requests. This updates the http transport to strdup the path and maintain its own lifetime. This also pulls responsibility for parsing the URL back into the http transport and isolates the functions that parse and free that connection data so that they can be reused between the initial parsing and the redirect parsing.
d005885f	2013-09-24T10:20:16	Fix up filebuf tests a bit
634f10f6	2013-09-24T10:11:20	Fix incorrect return code in crlf filter The git_buf_text_gather_stats call returns a boolean indicating if the file looks like binary data. That shouldn't be an error; it should be used to skip CRLF processing though.
71379313	2013-09-23T13:40:23	Fix warnings on Windows 64-bit build
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.
32b247d5	2013-09-19T10:30:43	Suppress noise from running Valgrind on OSX 10.8
f60ed4e6	2013-09-16T15:08:35	Update clar and recreate cl_assert_equal_sz This updates clar to the version without cl_assert_equal_sz and then adds a new version of that macro the clar_libgit2.h. The new version works around a strange issue that seemed to be arising on release builds with VS 10 64-bit builds.
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.
37f9e409	2013-09-13T21:43:00	Some tests with ident and crlf filters Fixed the filter order to match core Git, too. This test demonstrates an interesting behavior of core Git (which is totally reasonable and which libgit2 matches, although mostly by coincidence). If you use the ident filter and commit a file with a garbage ident in it, like '$Id: this is just garbage$' and then immediately do a 'git checkout-index' with the new file, Git will not consider the file out of date and will not overwrite the file with an updated $Id$. Libgit2 has the same behavior. If you remove the file and then do a checkout-index, it will be replaced with a filtered version that has injected the OID correctly.
155fa234	2013-09-05T15:06:42	Add clar helper to create new commit from index There were a lot of places in the test code base that were creating a commit from the index on the current branch. This just adds a helper to handle that case pretty easily. There was only one test where this change ended up tweaking the test data, so pretty easy and mostly just a cleanup.
13f36ffb	2013-09-13T16:30:21	Add clar helpers for testing file equality These are a couple of new clar helpers for testing that a file has expected contents that I extracted from the checkout code. Actually wrote this as part of an abandoned earlier attempt at a new filters API, but it will be useful now for some of the tests I'm going to write.
fa9cc148	2013-09-13T13:41:33	Fix cleanup issues with new tests
8427757f	2013-09-13T12:32:45	Fixing up some win32 issues with autocrlf
ad7417d7	2013-09-13T09:44:30	Make filter tests somewhat more robust The global and system config could interfere with the filter tests by imposing CRLF filtering where it was not anticipated. This better isolates the tests from the system settings.
d5b1866c	2013-09-13T09:26:26	Rearrange clar submodule cleanup code
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.

653ec420

2013-11-01T17:25:32

Merge remote-tracking branch 'drodriguez/fix-remote-save' into development

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.

887df99f

2013-10-31T13:29:16

Test another bad URL

7be5104d

2013-10-31T13:15:49

Add tests for badly-formed URLs

ff0ef88c

2013-10-30T18:54:39

Test more kinds of bad url

5c50f22a

2013-10-28T09:25:44

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

064e6e81

2013-10-28T07:05:13

Merge pull request #1912 from ethomson/push_err_messages Test for failure, but don't test the error message

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

9d41984c

2013-10-25T14:14:22

Test for failure, but don't test the error message

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

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

216f97e4

2013-09-23T09:47:47

Two-step conflict checkout (load / perform) Move conflict handling into two steps: load the conflicts and then apply the conflicts. This is more compatible with the existing checkout implementation and makes progress reporting more sane.

cfae7f85

2013-08-09T20:23:36

Honor UPDATE_ONLY bit when checking out conflicts

e47f859d

2013-08-08T16:46:49

Don't overwrite ~ files checking out conflicts If a D/F conflict or rename 2->1 conflict occurs, we write the file sides as filename~branchname. If a file with that name already exists in the working directory, write as filename~branchname_0 instead. (Incrementing 0 until a unique filename is found.)

96d799aa

2013-07-23T15:32:42

checkout rename conflicts rename conflict tests for checkout conflicts, don't suffix filenames when checking out with USE_OURS or USE_THEIRS

4f7897ab

2013-07-22T08:51:29

Prevent checkout_tree when conflicts exist, clear NAME on checkout tree Prevent checkout tree when unresolved changes exist (unless FORCE flag is specified). Clear NAME table when checking out, to avoid checkout_conflicts from attempting to manipulate it. Ensure that NAME is also cleared at reset.

3acf44d6

2013-07-17T09:43:32

tests for checkout index with 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.

2c2b0ebb

2013-10-11T09:47:05

Merge pull request #1562 from libgit2/cmn/refs-namespace-lookup Provide the user with a more useful error code when a looking up a reference which name points to a namepace

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".

7c9f5bec

2013-08-17T07:11:31

futils: return GIT_ENOTFOUND when trying to read a directory This lets the reference code return not-found when the user asks to look up a reference when in fact they pass a namespace.

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.

d5e83627

2013-10-08T14:41:32

Case sensitivity issues on Linux A couple of tests were actually dealing incorrectly with case sensitivity issues on Linux because they were relying on having core.ignorecase set to true. Now that the fixture initialization sets the case sensitivity to be accurate for the platform, it exposed bugs in these tests.

1fd21b03

2013-10-08T13:59:43

Add Assembla unit test

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.

cfd192b0

2013-10-03T12:44:34

Add test for multiple thread init/shutdown

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.

da7b78fa

2013-10-04T14:03:12

index: Make _read() cope with index file creation

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.

34b8eafc

2013-10-04T11:36:40

Tabify indentations

cf0582b4

2013-10-02T12:22:54

indexer: do multiple passes over the delta list Though unusual, a packfile may contain a delta whose base is a delta that comes later. In order index such a packfile, we must not give up on the first failure to resolve a delta, but keep it around. If there is a pass which makes no progress, this indicates that the packfile is broken, so fail accordingly.

b8f9059d

2013-10-03T15:16:06

More cleanups to remove WIN assumptions This cleans up more of the test suite to check actual filesystem behavior instead of relying on Windows vs. Mac vs. Linux to test.

840fb4fc

2013-10-03T14:42:37

Update repo init with fewer platform assumptions The repo init code was assuming Windows == no filemode, and Mac or Windows == no case sensitivity. Those assumptions are not consistently true depending on the mounted file system. This is a first step to removing those assumptions. It focuses on the repo init code and the tests of that code. There are still many other tests that are broken when those assumptions don't hold true, but this clears up one area of the code. Also, this moves the core.precomposeunicode logic to be closer to the current logic in core Git where it will be set to true on any filesystem where composed unicode is decomposed when read back.

af302aca

2013-10-02T14:13:11

Clean up annoying warnings The indexer code was generating warnings on Windows 64-bit. I looked closely at the logic and was able to simplify it a bit. Also this fixes some other Windows and Linux warnings.

618b7689

2013-10-02T12:06:26

Wrap iconv stuff and write tests This adds a simple wrapper around the iconv APIs and uses it instead of the old code that was inlining the iconv stuff. This makes it possible for me to test the iconv logic in isolation. A "no iconv" version of the API was defined with macros so that I could have fewer ifdefs in the code itself.

d0849f83

2013-10-02T11:07:18

Simplify git_path_is_empty_dir implementation This simplifies git_path_is_empty_dir on both Windows (getting rid of git_buf allocation inside the function) and other platforms (by just using git_path_direach), and adds tests for the function, and uses the function to simplify some existing tests.

219d3457

2013-10-01T16:12:15

Initial iconv hookup for precomposed unicode This hooks up git_path_direach and git_path_dirload so that they will take a flag indicating if directory entry names should be tested and converted from decomposed unicode to precomposed form. This code will only come into play on the Apple platform and even then, only when certain types of filesystems are used. This involved adding a flag to these functions which involved changing a lot of places in the code. This was an opportunity to do a bit of code cleanup here and there, for example, getting rid of the git_futils_cleanupdir_r function in favor of a simple flag to git_futils_rmdir_r to not remove the top level entry. That ended up adding depth tracking during rmdir_r which led to a safety check for infinite directory recursion. Yay. This hasn't actually been tested on the Mac filesystems where the issue occurs. I still need to get test environment for that.

6b7991e2

2013-09-30T16:13:53

Add check if we need to precompose unicode on Mac This adds initialization of core.precomposeunicode to repo init on Mac. This is necessary because when a Mac accesses a repo on a VFAT or SAMBA file system, it will return directory entries in decomposed unicode even if the filesystem entry is precomposed. This also removes caching of a number of repo properties from the repo init pipeline because these are properties of the specific filesystem on which the repo is created, not of the system as a whole.

146b4d1c

2013-10-03T08:18:41

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

7baa7631

2013-10-02T15:39:18

Style tweaks and changes for code review feedback

ab136876

2013-10-03T04:36:29

Merge pull request #1887 from libgit2/ntk/topic/git_message_raw commit: Introduce git_commit_message_raw()

598f069b

2013-10-02T12:42:41

commit: Introduce git_commit_message_raw()

41a6de28

2013-10-02T14:45:57

HTTP: handle "relative" redirects

83db7e09

2013-10-02T15:10:39

Fix broken online push tests

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.

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.

fdc7e5e3

2013-09-20T23:14:12

clone: bring back NULL as defaults This wasremoved as part of the large culling a few commits ago.

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.

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.

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.

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.

c655aa52

2013-10-01T05:54:54

Merge pull request #1882 from linquize/config-subsection-fix Config subsection name should allow to have ']' and '\\' should allow to escape any characters

8d741253

2013-10-01T09:46:56

Add negative test cases for config header with invalid characters

d52a93fa

2013-09-30T23:58:58

Add test case to test ']' and '\\' characters in config subsection

fba14763

2013-09-30T15:03:35

Merge pull request #1879 from libgit2/redir-refactor Redir refactor

a6884b6f

2013-09-30T14:58:45

Merge pull request #1412 from jamill/push_progress Initial Implementation of progress reports during push

9acde162

2013-09-30T14:57:48

Merge pull request #1881 from libgit2/ignore-submodules-in-stash Never consider submodules for stashing

ae5a9352

2013-09-30T14:47:56

Ensure submodule repos and indices are freed ...before the helper's cleanup method tries to delete their files.

dc56fea7

2013-09-30T12:18:19

Merge pull request #1878 from libgit2/ntk/fix/warnings Fix x86/x64 size_t related warnings

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).

d27a441d

2013-09-30T11:30:28

commit: Trim message leading newlines Fix libgit2/libgit2sharp#522

27c8eb2a

2013-09-30T11:18:06

Tabify indentations

526d4c94

2013-09-27T21:39:28

Test that submodules don't affect stashing

0049d4d1

2013-09-26T16:25:34

Make sure utility doesn't leak memory

ea59f659

2013-09-26T16:20:30

Deploy gitno_connection_data into transport (winhttp) ...and have that call manage replaced memory in the output structure.

8a1e925d

2013-09-26T12:00:35

Fix warnings

8988688c

2013-09-25T20:41:56

Migrate redirect URL handling to common utility

1c8de380

2013-09-20T16:58:04

Make tests pass if XDG config exists

eb0ff130

2013-09-24T14:07:08

Disconnect path string to preserve after redirect The subtransport path was relying on pointing to data owned by the remote which meant that after a redirect, the updated path was getting lost for future requests. This updates the http transport to strdup the path and maintain its own lifetime. This also pulls responsibility for parsing the URL back into the http transport and isolates the functions that parse and free that connection data so that they can be reused between the initial parsing and the redirect parsing.

d005885f

2013-09-24T10:20:16

Fix up filebuf tests a bit

634f10f6

2013-09-24T10:11:20

Fix incorrect return code in crlf filter The git_buf_text_gather_stats call returns a boolean indicating if the file looks like binary data. That shouldn't be an error; it should be used to skip CRLF processing though.

71379313

2013-09-23T13:40:23

Fix warnings on Windows 64-bit build

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.

32b247d5

2013-09-19T10:30:43

Suppress noise from running Valgrind on OSX 10.8

f60ed4e6

2013-09-16T15:08:35

Update clar and recreate cl_assert_equal_sz This updates clar to the version without cl_assert_equal_sz and then adds a new version of that macro the clar_libgit2.h. The new version works around a strange issue that seemed to be arising on release builds with VS 10 64-bit builds.

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.

37f9e409

2013-09-13T21:43:00

Some tests with ident and crlf filters Fixed the filter order to match core Git, too. This test demonstrates an interesting behavior of core Git (which is totally reasonable and which libgit2 matches, although mostly by coincidence). If you use the ident filter and commit a file with a garbage ident in it, like '$Id: this is just garbage$' and then immediately do a 'git checkout-index' with the new file, Git will not consider the file out of date and will not overwrite the file with an updated $Id$. Libgit2 has the same behavior. If you remove the file and then do a checkout-index, it will be replaced with a filtered version that has injected the OID correctly.

155fa234

2013-09-05T15:06:42

Add clar helper to create new commit from index There were a lot of places in the test code base that were creating a commit from the index on the current branch. This just adds a helper to handle that case pretty easily. There was only one test where this change ended up tweaking the test data, so pretty easy and mostly just a cleanup.

13f36ffb

2013-09-13T16:30:21

Add clar helpers for testing file equality These are a couple of new clar helpers for testing that a file has expected contents that I extracted from the checkout code. Actually wrote this as part of an abandoned earlier attempt at a new filters API, but it will be useful now for some of the tests I'm going to write.

fa9cc148

2013-09-13T13:41:33

Fix cleanup issues with new tests

8427757f

2013-09-13T12:32:45

Fixing up some win32 issues with autocrlf

ad7417d7

2013-09-13T09:44:30

Make filter tests somewhat more robust The global and system config could interfere with the filter tests by imposing CRLF filtering where it was not anticipated. This better isolates the tests from the system settings.

d5b1866c

2013-09-13T09:26:26

Rearrange clar submodule cleanup code

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.

thodg/libgit2/tests-clar

tests-clar

Log