kmx git

Commit	Date	Message
7b3959b2	2013-11-02T03:45:32	Checkout: git_checkout_head is git_checkout_tree without a treeish The last commit taught git_checkout_tree to actually do something meaningfull, when treeish was NULL. This lets us rewrite git_checkout_head to simply call git_checkout_tree without giving it a treeish.
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.
c2408a69	2013-11-01T17:03:01	preserve windows error numbers as well
948f00b4	2013-11-01T09:38:03	Merge pull request #1933 from libgit2/vmg/gcc-warnings Warnings for Windows x64 (MSVC) and GCC on Linux
0bfa7323	2013-11-01T17:07:44	iconv: Do not fake an API when iconv is not available
95352b70	2013-11-01T16:55:20	checkout: Remove unused vector
73342386	2013-11-01T16:55:01	array: Wrap `array_alloc` as a single statement
51a3dfb5	2013-11-01T16:31:02	pack: `__object_header` always returns unsigned values
3343b5ff	2013-10-31T22:59:42	Fix warning on win64
ac5e507c	2013-11-01T09:31:52	Merge pull request #1918 from libgit2/cmn/indexer-naming indexer: remove the stream infix
b22593fb	2013-11-01T17:28:59	config_file: Style fixes
653ec420	2013-11-01T17:25:32	Merge remote-tracking branch 'drodriguez/fix-remote-save' into development
376454d0	2013-10-31T23:42:04	Set new multivar values using unmatcheable regexp. Seems that regexp in Mac OS X and Linux were behaving differently: while in OS X the empty string didn't match any value, in Linux it was matching all of them, so the the second fetch refspec was overwritting the first one, instead of creating a new one. Using an unmatcheable regular expression solves the problem (and seems to be portable).
a71331eb	2013-10-31T23:41:48	Fix memory leaks.
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.
048f837b	2013-10-31T13:30:22	Prevent another segfault from bad URL
151b3218	2013-10-31T13:16:04	Prevent segfault with a badly-formed URL
29b77446	2013-10-30T15:38:52	Initialize variables
cc745341	2013-10-30T09:27:36	Merge pull request #1919 from libgit2/cmn/multi-ack-detailed protocol: basic support for multi_ack_detailed
1d37da33	2013-10-30T16:25:49	merge: any non-zero return from the user is an error This fixes #1703.
2f8c481c	2013-10-08T16:22:21	protocol: basic support for multi_ack_detailed This tells the server that we speak it, but we don't make use of its extra information to determine if there's a better place to stop negotiating. In a somewhat-related change, reorder the capabilities so we ask for them in the same order as git does. Also take this opportunity to factor out a fairly-indented portion of the negotiation logic.
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.
04e0c2b2	2013-10-30T14:00:44	pack-objects: Depth can be negative
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
157cef10	2013-10-28T12:57:15	The "common.h" should be included before "config.h". When building libgit2 for ia32 architecture on a x64 machine, including "config.h" without a "common.h" would result the following error: C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2288): error C2373: 'InterlockedIncrement' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj] C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2295): error C2373: 'InterlockedDecrement' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj] C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2303): error C2373: 'InterlockedExchange' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj] C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2314): error C2373: 'InterlockedExchangeAdd' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj]
df9fc82e	2013-10-25T13:33:42	Use two calls to set two headers
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
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).
623460ab	2013-10-21T14:16:53	Fix warnings for win64
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.
c929d6b7	2013-10-09T18:26:42	Move path prefixed help to path.h
7fa73de1	2013-09-23T17:52:40	Move functions in checkout_conflicts to checkout.c It seemed exceptionally silly to have a split there where no split needed to be.
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
6f8cc7bb	2013-08-05T20:06:09	Fix warning, fix memory leak
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.)
fc36800e	2013-08-08T13:16:13	Get rid of some quick hacks
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
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.
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.
74353137	2013-10-09T11:57:03	After iconv init reset ref normalize error The iconv init was accidentally clearing the default error state during reference normalization. This resets so that normalization errors will be detected correctly.
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.
3dc3c723	2013-10-08T15:52:37	Combine WinHTTP API calls
a58eecd4	2013-10-08T13:40:52	WinHTTP: set Accept header for POSTs
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.
7fb6eb27	2013-10-08T11:54:50	indexer: inject one base at a time There may be multiple deltas referencing the same base as well as OFS deltas which rely on a thin delta. Deal with both at the same time by injecting a single object and going back up to the main delta-resolving loop.
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.
22661448	2013-10-04T19:35:32	Don't use git_atomic as an integer
cdc95a0d	2013-10-04T18:38:37	Use InterlockedCompareExchange for the lock
e411b74e	2013-10-04T19:33:48	Posix synchronized init, prototype win32 version
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
b4342b11	2013-10-04T10:27:45	net: advertise our support for fixing thin packs
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.
51e82492	2013-10-03T16:54:25	pack: move the object header function here
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.
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.
2fe54afa	2013-09-30T16:58:33	Put hooks in place for precompose in dirload fn This doesn't actual do string precompose but it puts the hooks in place into the iterators and the git_path_dirload function so that the actual precompose work is ready to go.
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
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.
fdc7e5e3	2013-09-20T23:14:12	clone: bring back NULL as defaults This wasremoved as part of the large culling a few commits ago.
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.
e3a92f0d	2013-09-17T05:31:34	clone: implement git_clone on top of git_clone_into Unify the code bases.
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

7b3959b2

2013-11-02T03:45:32

Checkout: git_checkout_head is git_checkout_tree without a treeish The last commit taught git_checkout_tree to actually do something meaningfull, when treeish was NULL. This lets us rewrite git_checkout_head to simply call git_checkout_tree without giving it a treeish.

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.

c2408a69

2013-11-01T17:03:01

preserve windows error numbers as well

948f00b4

2013-11-01T09:38:03

Merge pull request #1933 from libgit2/vmg/gcc-warnings Warnings for Windows x64 (MSVC) and GCC on Linux

0bfa7323

2013-11-01T17:07:44

iconv: Do not fake an API when iconv is not available

95352b70

2013-11-01T16:55:20

checkout: Remove unused vector

73342386

2013-11-01T16:55:01

array: Wrap `array_alloc` as a single statement

51a3dfb5

2013-11-01T16:31:02

pack: `__object_header` always returns unsigned values

3343b5ff

2013-10-31T22:59:42

Fix warning on win64

ac5e507c

2013-11-01T09:31:52

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

b22593fb

2013-11-01T17:28:59

config_file: Style fixes

653ec420

2013-11-01T17:25:32

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

376454d0

2013-10-31T23:42:04

Set new multivar values using unmatcheable regexp. Seems that regexp in Mac OS X and Linux were behaving differently: while in OS X the empty string didn't match any value, in Linux it was matching all of them, so the the second fetch refspec was overwritting the first one, instead of creating a new one. Using an unmatcheable regular expression solves the problem (and seems to be portable).

a71331eb

2013-10-31T23:41:48

Fix memory leaks.

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.

048f837b

2013-10-31T13:30:22

Prevent another segfault from bad URL

151b3218

2013-10-31T13:16:04

Prevent segfault with a badly-formed URL

29b77446

2013-10-30T15:38:52

Initialize variables

cc745341

2013-10-30T09:27:36

Merge pull request #1919 from libgit2/cmn/multi-ack-detailed protocol: basic support for multi_ack_detailed

1d37da33

2013-10-30T16:25:49

merge: any non-zero return from the user is an error This fixes #1703.

2f8c481c

2013-10-08T16:22:21

protocol: basic support for multi_ack_detailed This tells the server that we speak it, but we don't make use of its extra information to determine if there's a better place to stop negotiating. In a somewhat-related change, reorder the capabilities so we ask for them in the same order as git does. Also take this opportunity to factor out a fairly-indented portion of the negotiation logic.

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.

04e0c2b2

2013-10-30T14:00:44

pack-objects: Depth can be negative

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

157cef10

2013-10-28T12:57:15

The "common.h" should be included before "config.h". When building libgit2 for ia32 architecture on a x64 machine, including "config.h" without a "common.h" would result the following error: C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2288): error C2373: 'InterlockedIncrement' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj] C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2295): error C2373: 'InterlockedDecrement' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj] C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2303): error C2373: 'InterlockedExchange' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj] C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2314): error C2373: 'InterlockedExchangeAdd' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj]

df9fc82e

2013-10-25T13:33:42

Use two calls to set two headers

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

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

623460ab

2013-10-21T14:16:53

Fix warnings for win64

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.

c929d6b7

2013-10-09T18:26:42

Move path prefixed help to path.h

7fa73de1

2013-09-23T17:52:40

Move functions in checkout_conflicts to checkout.c It seemed exceptionally silly to have a split there where no split needed to be.

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

6f8cc7bb

2013-08-05T20:06:09

Fix warning, fix memory leak

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

fc36800e

2013-08-08T13:16:13

Get rid of some quick hacks

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

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.

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.

74353137

2013-10-09T11:57:03

After iconv init reset ref normalize error The iconv init was accidentally clearing the default error state during reference normalization. This resets so that normalization errors will be detected correctly.

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.

3dc3c723

2013-10-08T15:52:37

Combine WinHTTP API calls

a58eecd4

2013-10-08T13:40:52

WinHTTP: set Accept header for POSTs

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.

7fb6eb27

2013-10-08T11:54:50

indexer: inject one base at a time There may be multiple deltas referencing the same base as well as OFS deltas which rely on a thin delta. Deal with both at the same time by injecting a single object and going back up to the main delta-resolving loop.

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.

22661448

2013-10-04T19:35:32

Don't use git_atomic as an integer

cdc95a0d

2013-10-04T18:38:37

Use InterlockedCompareExchange for the lock

e411b74e

2013-10-04T19:33:48

Posix synchronized init, prototype win32 version

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

b4342b11

2013-10-04T10:27:45

net: advertise our support for fixing thin packs

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.

51e82492

2013-10-03T16:54:25

pack: move the object header function here

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.

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.

2fe54afa

2013-09-30T16:58:33

Put hooks in place for precompose in dirload fn This doesn't actual do string precompose but it puts the hooks in place into the iterators and the git_path_dirload function so that the actual precompose work is ready to go.

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

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.

fdc7e5e3

2013-09-20T23:14:12

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

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.

e3a92f0d

2013-09-17T05:31:34

clone: implement git_clone on top of git_clone_into Unify the code bases.

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

thodg/libgit2/src

src

Log