kmx git

Commit	Date	Message
784b3abb	2013-10-30T12:34:03	rev-list.c example: use common utils, reorganize
9d83d368	2013-10-30T07:21:36	cat-file.c example: deploy helpers, reorg
dbfd2833	2013-10-30T07:21:12	add.c: proper frontmatter
7cc3c9bf	2013-10-30T06:09:08	init.c example: deploy more helpers
e568bedf	2013-10-30T06:08:54	add.c example: deploy helpers, reorg
a8422f92	2013-10-30T05:38:12	init example: deploy helpers, reorg
66902d47	2013-10-29T18:30:49	Extract common example helpers and reorg examples This reorganizes a few of the examples so that the main function comes first with the argument parsing extracted into a helper that can come at the end of the file (so the example focuses more on the use of libgit2 instead of command line support). This also creates a shared examples/common.[ch] so that useful helper funcs can be shared across examples instead of repeated.
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
a1efa596	2013-10-28T04:38:08	Merge pull request #1915 from zcbenz/common-h-before-config-h The "common.h" should be included before "config.h".
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]
d4831b71	2013-10-26T04:34:23	Merge pull request #1913 from nvloff/remove_fedora_spec remove rpm spec file and readme
dbc45b88	2013-10-26T09:13:29	remove rpm spec Fedora provides a rpm package for libgit2 - https://apps.fedoraproject.org/packages/libgit2.
9d41984c	2013-10-25T14:14:22	Test for failure, but don't test the error message
8607286b	2013-10-25T10:38:30	Merge pull request #1910 from ethomson/disable_winhttp Allow -DWINHTTP=OFF to disable WinHTTP
8f2fe55e	2013-10-25T10:37:37	Merge pull request #1911 from ethomson/http_headers Use two calls to set two headers
df9fc82e	2013-10-25T13:33:42	Use two calls to set two headers
1bfe7133	2013-10-25T13:23:46	Allow -DWINHTTP=OFF to disable WinHTTP
fd5d80d2	2013-10-24T07:45:54	Merge pull request #1907 from nikai3d/patch-1 fix typos in README.md
63d1fad4	2013-10-24T15:30:31	fix typos in README.md
474c8cf8	2013-10-23T22:49:52	Really fix the pc file It turns out that variables have function scope by default. Let's really set -liconv and add a few libraries that were forgotten in the previous commit. We also need to special-case OSX, as they ship zlib but do not provide a pkg-config file for it.
3fcb1d83	2013-10-23T08:18:56	Merge pull request #1905 from libgit2/cmn/list-deps Be explicit about dependencies
9a5f2118	2013-10-23T08:17:56	Merge pull request #1906 from libgit2/cmn/net-cb-errors transport: let the progress output return an error
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.
ebbd48f0	2013-10-23T14:22:44	examples: show used local objects in fetch Show how many local objects were used to fix the thin pack in our fetch example.
2baee9f8	2013-10-23T13:17:51	README: add a note about the optional dependencies
1ecda61e	2013-10-23T12:58:56	Set the correct dependencies in the pkg-config file When linking statically, the including project needs to know what the current library build depends on so they can link to it. Store this information in the pkg-config file. While here, remove claims that users need to link to zlib or libcrypto.
70a8c78f	2013-10-23T12:08:54	Rename the ssh credentials The names from libssh2 are somewhat obtuse for us. We can simplify the usual key/passphrase credential's name, as well as make clearer what the custom signature function is.
1c74686e	2013-10-22T11:55:54	Merge pull request #1897 from libgit2/split-patch-from-diff RFC: Proposed reworking of diff APIs
7ce60099	2013-10-22T11:12:44	Fix typo
98fec8a9	2013-10-22T16:05:47	Implement `git_odb_object_dup`
5de4ec81	2013-10-21T15:36:38	Implement patience and minimal diff flags It seems that to implement these options, we just have to pass the appropriate flags through to the libxdiff code taken from core git. So let's do it (and add a test).
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.
86774742	2013-10-21T13:06:27	Merge pull request #1903 from ethomson/ssh Allowed credential types should be a bitfield
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.
901c34f2	2013-10-18T10:00:26	Merge pull request #1900 from haneefmubarak/patch-1 license clarification + formatting all over
caf93341	2013-10-17T16:01:43	slightly clarified the "license" portion of `README.md" + formatting all over fixed typo `can can` -> `can`
e5e2710b	2013-10-17T01:52:20	slightly clarified the "license" portion of `README.md" + formatting all over added the second change suggested by @nulltoken (with two extra words :) )
20b5d300	2013-10-17T00:28:08	slightly clarified the "license" portion of `README.md" + formatting all over There are commercial open source applications, hence proprietary seems to be a better term. Also: - Trimmed header `=`'s to match text length - made libgit2 stand out everywhere - pretty printing links - irc link for those with the correct setup
b2c9e41a	2013-10-16T13:51:24	Merge pull request #1702 from ethomson/checkout_merge Checkout merge
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
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.
629b661c	2013-07-17T09:49:56	checkout (from index) can write conflicts
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.
4d43e630	2013-10-10T15:29:57	Merge pull request #1898 from arthurschreiber/patch-2 Fix a typo in the rpm build instructions.
84c46981	2013-10-11T00:06:08	Fix a typo in the rpm build instructions.
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.
062c95c2	2013-10-08T16:32:06	Merge pull request #1895 from libgit2/winhttp-accept WinHTTP: set Accept header for POSTs
3dc3c723	2013-10-08T15:52:37	Combine WinHTTP API calls
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
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.
ca27ae48	2013-10-08T04:31:26	Merge pull request #1894 from libgit2/cmn/tree-raw tree: allow retrieval of raw attributes
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.
711333ef	2013-10-05T07:56:03	Merge pull request #1890 from libgit2/multiple-init Multiple init
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
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.
ec5fe2da	2013-10-04T08:50:44	Merge pull request #1892 from libgit2/ntk/topic/index_read Make git_index_read() cope with external additions and removals of the index file
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.
6445ae99	2013-10-04T13:49:26	index: Enhance documentation
34b8eafc	2013-10-04T11:36:40	Tabify indentations
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.
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.
966bb17a	2013-10-01T16:41:07	Add to Git authors who have agreed to relicense In email, Torsten Bögershausen agreed that we could use his code from core Git in libgit2 under the modified license. Also, since his work is the basis for much of the precompose unicode support, I have added him to the AUTHORS file as well.
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

784b3abb

2013-10-30T12:34:03

rev-list.c example: use common utils, reorganize

9d83d368

2013-10-30T07:21:36

cat-file.c example: deploy helpers, reorg

dbfd2833

2013-10-30T07:21:12

add.c: proper frontmatter

7cc3c9bf

2013-10-30T06:09:08

init.c example: deploy more helpers

e568bedf

2013-10-30T06:08:54

add.c example: deploy helpers, reorg

a8422f92

2013-10-30T05:38:12

init example: deploy helpers, reorg

66902d47

2013-10-29T18:30:49

Extract common example helpers and reorg examples This reorganizes a few of the examples so that the main function comes first with the argument parsing extracted into a helper that can come at the end of the file (so the example focuses more on the use of libgit2 instead of command line support). This also creates a shared examples/common.[ch] so that useful helper funcs can be shared across examples instead of repeated.

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

a1efa596

2013-10-28T04:38:08

Merge pull request #1915 from zcbenz/common-h-before-config-h The "common.h" should be included before "config.h".

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]

d4831b71

2013-10-26T04:34:23

Merge pull request #1913 from nvloff/remove_fedora_spec remove rpm spec file and readme

dbc45b88

2013-10-26T09:13:29

remove rpm spec Fedora provides a rpm package for libgit2 - https://apps.fedoraproject.org/packages/libgit2.

9d41984c

2013-10-25T14:14:22

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

8607286b

2013-10-25T10:38:30

Merge pull request #1910 from ethomson/disable_winhttp Allow -DWINHTTP=OFF to disable WinHTTP

8f2fe55e

2013-10-25T10:37:37

Merge pull request #1911 from ethomson/http_headers Use two calls to set two headers

df9fc82e

2013-10-25T13:33:42

Use two calls to set two headers

1bfe7133

2013-10-25T13:23:46

Allow -DWINHTTP=OFF to disable WinHTTP

fd5d80d2

2013-10-24T07:45:54

Merge pull request #1907 from nikai3d/patch-1 fix typos in README.md

63d1fad4

2013-10-24T15:30:31

fix typos in README.md

474c8cf8

2013-10-23T22:49:52

Really fix the pc file It turns out that variables have function scope by default. Let's really set -liconv and add a few libraries that were forgotten in the previous commit. We also need to special-case OSX, as they ship zlib but do not provide a pkg-config file for it.

3fcb1d83

2013-10-23T08:18:56

Merge pull request #1905 from libgit2/cmn/list-deps Be explicit about dependencies

9a5f2118

2013-10-23T08:17:56

Merge pull request #1906 from libgit2/cmn/net-cb-errors transport: let the progress output return an error

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.

ebbd48f0

2013-10-23T14:22:44

examples: show used local objects in fetch Show how many local objects were used to fix the thin pack in our fetch example.

2baee9f8

2013-10-23T13:17:51

README: add a note about the optional dependencies

1ecda61e

2013-10-23T12:58:56

Set the correct dependencies in the pkg-config file When linking statically, the including project needs to know what the current library build depends on so they can link to it. Store this information in the pkg-config file. While here, remove claims that users need to link to zlib or libcrypto.

70a8c78f

2013-10-23T12:08:54

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

1c74686e

2013-10-22T11:55:54

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

7ce60099

2013-10-22T11:12:44

Fix typo

98fec8a9

2013-10-22T16:05:47

Implement `git_odb_object_dup`

5de4ec81

2013-10-21T15:36:38

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

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.

86774742

2013-10-21T13:06:27

Merge pull request #1903 from ethomson/ssh Allowed credential types should be a bitfield

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.

901c34f2

2013-10-18T10:00:26

Merge pull request #1900 from haneefmubarak/patch-1 license clarification + formatting all over

caf93341

2013-10-17T16:01:43

slightly clarified the "license" portion of `README.md" + formatting all over fixed typo `can can` -> `can`

e5e2710b

2013-10-17T01:52:20

slightly clarified the "license" portion of `README.md" + formatting all over added the second change suggested by @nulltoken (with two extra words :) )

20b5d300

2013-10-17T00:28:08

slightly clarified the "license" portion of `README.md" + formatting all over There are commercial open source applications, hence proprietary seems to be a better term. Also: - Trimmed header `=`'s to match text length - made libgit2 stand out everywhere - pretty printing links - irc link for those with the correct setup

b2c9e41a

2013-10-16T13:51:24

Merge pull request #1702 from ethomson/checkout_merge Checkout merge

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

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.

629b661c

2013-07-17T09:49:56

checkout (from index) can write conflicts

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.

4d43e630

2013-10-10T15:29:57

Merge pull request #1898 from arthurschreiber/patch-2 Fix a typo in the rpm build instructions.

84c46981

2013-10-11T00:06:08

Fix a typo in the rpm build instructions.

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.

062c95c2

2013-10-08T16:32:06

Merge pull request #1895 from libgit2/winhttp-accept WinHTTP: set Accept header for POSTs

3dc3c723

2013-10-08T15:52:37

Combine WinHTTP API calls

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

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.

ca27ae48

2013-10-08T04:31:26

Merge pull request #1894 from libgit2/cmn/tree-raw tree: allow retrieval of raw attributes

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.

711333ef

2013-10-05T07:56:03

Merge pull request #1890 from libgit2/multiple-init Multiple init

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

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.

ec5fe2da

2013-10-04T08:50:44

Merge pull request #1892 from libgit2/ntk/topic/index_read Make git_index_read() cope with external additions and removals of the index file

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.

6445ae99

2013-10-04T13:49:26

index: Enhance documentation

34b8eafc

2013-10-04T11:36:40

Tabify indentations

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.

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.

966bb17a

2013-10-01T16:41:07

Add to Git authors who have agreed to relicense In email, Torsten Bögershausen agreed that we could use his code from core Git in libgit2 under the modified license. Also, since his work is the basis for much of the precompose unicode support, I have added him to the AUTHORS file as well.

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

thodg/libgit2

Log