kmx git

Commit	Date	Message
4ebe320a	2015-06-09T10:37:14	crlf tests: windows known-good data A corpus of files checked out with Git for Windows (2.4.1.windows.1) to ensure that we produce identical data when checking out using a CRLF filter.
3d92b9ab	2015-06-08T09:08:01	crlf tests: use known-good data produced by git Given a variety of combinations of core.autocrlf settings and attributes settings, test that we check out data into the working directory the same as a known-good test resource created by git.git.
bf8c0a9b	2015-06-08T09:06:53	crlf: script to generate expected crlf data Include a shell script that will generate the expected CRLF data, calling git.git to capture its output as a test resource for the current platform.
bd5e59ee	2015-06-08T09:04:39	crlf: include utf8 resources in master branch Include the UTF8 and UTF8 BOM tests in the master crlf test branch for completeness.
84f8f500	2015-06-05T10:11:50	crlf: include additional test resources Include additional test data for CRLF tests: files with mixed line endings and binary files.
0b6ed4f9	2015-06-22T11:24:20	Merge pull request #3240 from libgit2/cmn/commit-header-field commit: allow retrieving an arbitrary header field
0c94deb9	2015-06-22T16:58:14	Merge pull request #3239 from git-up/stash_index Write modified index in git_stash_apply()
a3f42fe8	2015-06-22T15:32:29	commit: allow retrieving an arbitrary header field This allows the user to look up fields which we don't parse in libgit2, and allows them to access gpgsig or mergetag fields if they wish to check the signature.
e35b947b	2015-06-21T01:06:20	Write modified index in git_stash_apply() Same as with git_stash_save(), there's no reason not to write the index to disk since it has been modified.
e96a97f1	2015-06-20T23:17:42	Merge pull request #3233 from ethomson/status_typechange Don't propagate workdir's mode to the index during diff's update index
96dd171e	2015-06-19T08:32:26	diff: preserve original mode in the index When updating the index during a diff, preserve the original mode, which prevents us from dropping the mode to what we have interpreted as on our system (eg, what the working directory claims it to be, which may be a lie on some systems.)
fc656802	2015-06-19T08:31:07	status: test that symlinks don't lose their mode Test to ensure that when status updates an index, it does not alter the original mode for file types that are not supported (eg, symlinks on Windows).
9018529b	2015-06-20T14:34:34	Merge pull request #3238 from git-up/double_free Fixed index being double-freed in stash tests
883cb642	2015-06-20T14:05:02	Merge pull request #3236 from libgit2/cmn/index-checksum Use the checksum to check whether an index has been modified
07ea3a7f	2015-06-20T10:57:03	Fixed index being double-freed in stash tests
624c949f	2015-06-20T16:17:28	index: make relative comparison use the checksum as well This is used by the submodule in order to figure out if the index has changed since it last read it. Using a timestamp is racy, so let's make it use the checksum, just like we now do for reloading the index itself.
3e5b553a	2015-06-20T12:14:49	Merge pull request #3232 from Therzok/patch-2 Quote LIBSSH2_LIBRARIES call
863dd89a	2015-06-18T12:45:40	tests: tick over five seconds instead of one When ticking over one second, it can happen that the actual time ticks over the same second between the time that we undermine our own race protections and the time in which we perform the index update. Such timing would make the time in the entries match the index' timestamp and we have not gained anything. Ticking over five seconds makes it so that if real-time rolls over that second, our index is still ahead. This is still suboptimal as we're dealing with timing, but five seconds should be long enough for any reasonable test runner to finish the tests.
5e947c91	2015-06-19T22:05:08	index: use the checksum to check whether it's been modified We currently use a timetamp to check whether an index file has been modified since we last read it, but this is racy. If two updates happen in the same second and we read after the first one, we won't detect the second one. Instead read the SHA-1 checksum of the file, which are its last 20 bytes which gives us a sure-fire way to detect whether the file has changed since we last read it. As we're now keeping track of it, expose an accessor to this data.
46c84c72	2015-06-19T21:56:42	index: user a better assertion when comparing sizes This will tell us which numbers we were trying to compare, rather than just telling us that they're different.
e488bef4	2015-06-19T12:53:37	Quote LIBSSH2_LIBRARIES call Credits to @directhex It is possible for PKG_CHECK_MODULES(LIBSSH2 libssh2) to LIBSSH2_LIBRARIES to a string with more than one library in it - e.g. if your libssh2 was built against libgcrypt, it will be "ssh2;gcrypt" Quoting the string is needed, or CHECK_LIBRARY_EXISTS will fail.
6e0470e0	2015-06-17T21:36:27	Merge pull request #3229 from git-up/build_warnings Fixed Xcode 6.1 build warnings
85a5e8eb	2015-06-17T09:00:23	Fixed Xcode 6.1 build warnings
83a04a69	2015-06-17T16:08:20	Merge pull request #3227 from jeffhostetler/memory_leak__tests_network_refspecs Fix memory leak in tests/network/refspecs.c
534d136d	2015-06-17T08:52:28	Fix memory leak in tests/network/refspecs.c
a56db992	2015-06-17T08:15:49	Merge pull request #3219 from libgit2/cmn/racy-diff Zero out racily-clean entries' file_size
892abf93	2015-06-16T17:23:12	checkout: allow workdir to contain checkout target When checking out some file 'foo' that has been modified in the working directory, allow the checkout to proceed (do not conflict) if 'foo' is identical to the target of the checkout.
fef5344c	2015-06-16T16:34:25	merge::workdir::dirty: tick idx to defeat racy-git
121c3171	2015-06-16T15:18:04	Introduce p_utimes and p_futimes Provide functionality to set the time on a filesystem entry, using utimes or futimes on POSIX type systems or SetFileTime on Win32.
5f83758f	2015-06-16T10:40:46	Merge pull request #3209 from libgit2/cmn/double-author commit: ignore multiple author fields
86faea5f	2015-06-16T08:45:55	Merge pull request #3225 from libgit2/cmn/url-empty remote: return EINVALIDSPEC when given an empty URL
47a40d1d	2015-06-16T12:39:11	remote: return EINVALIDSPEC when given an empty URL This is what we used to return in the settter and there's tests in bindings which ask for this. There's no particular reason to stop doing so.
aeb2b991	2015-06-16T09:20:36	Merge pull request #3221 from git-up/build_warnings Fixed Xcode 6.1 build warnings
e44abe16	2015-06-16T08:51:45	tests: tick the index when we count OID calculations These tests want to test that we don't recalculate entries which match the index already. This is however something we force when truncating racily-clean entries. Tick the index forward as we know that we don't perform the modifications which the racily-clean code is trying to avoid.
c4e6ab5f	2015-06-15T14:32:08	crlf: tick the index forward to work around racy-git behaviour In order to avoid racy-git, we zero out the file size for entries with the same timestamp as the index (or during the initial checkout). This is the case in a couple of crlf tests, as the code is fast enough to do everything in the same second. As we know that we do not perform the modification just after writing out the index, which is what this is designed to work around, tick the mtime of the index file such that it doesn't agree with the files anymore, and we do not zero out these entries.
316b820b	2015-06-15T09:55:40	index: zero the size of racily-clean entries If a file entry has the same timestamp as the index itself, it is considered racily-clean, as it may have been modified after the index was written, but during the same second. We take extra steps to check the contents, but this is just one part of avoiding races. For files which do have changes but have not been updated in the index, updating the on-disk index means updating its timestamp, which means we would no longer recognise these entries as racy and we would trust the timestamp to tell us whether they have changed. In order to work around this, git zeroes out the file-size field in entries with the same timestamp as the index in order to force the next diff to check the contents. Do so in libgit2 as well.
77596fcf	2015-06-15T09:51:34	diff: add failing test for racy-git in the index We update the index and then immediately change the contents of the file. This makes the diff think there are no changes, as the timestamp of the file agrees with the cached data. This is however a bug, as the file has obviously changed contents. The test is a bit fragile, as it assumes that the index writing and the following modification of the file happen in the same second, but it's enough to show the issue.
b93dcd4c	2015-06-15T17:10:35	Merge pull request #3216 from dprofeta/fixTransactionVisibility Fix visibility of transaction symbol
0f4d9c03	2015-06-15T09:52:40	Fixed Xcode 6.1 build warnings
f621f087	2015-06-15T09:11:32	Merge pull request #3220 from libgit2/cmn/readdir path: remove unnecessary readdir_r usage
25bd0aaf	2015-06-15T13:28:08	path: remove unnecessary readdir_r usage Arguably all uses of readdir_r are unnecessary, but in this case especially so, as the directory handle only exists within this function, so we don't race with anybody.
2665fefa	2015-06-15T10:20:58	Merge pull request #3171 from libgit2/cmn/link-fallback clone: fall back to copying when linking does not work
b224c388	2015-05-07T14:21:25	Fix in stransport_stream.c for usage of SecCopyErrorMessageString(), which is unavailable to iOS targets.
d4723c89	2015-06-15T08:17:45	Merge pull request #3177 from ethomson/binary_diff Binary diffs: store deltas in the diff structure, include binary data in diff callbacks
ae22ef0e	2015-06-15T08:09:21	Merge pull request #3217 from jeffhostetler/leak_checkout_icase Fix leaks in tests/checkout/icase
f2dec481	2015-06-12T18:35:18	Merge pull request #3215 from jeffhostetler/windows_leak_diriter Fix memory leak on windows in diriter.
26d5c0b8	2015-06-12T09:28:47	Fix leaks in tests/checkout/icase
5c757327	2015-06-12T18:14:32	Fix visibility of transaction symbol Transaction.c did not include the visibility definition of its symbol (that are in git2/transaction.h) and so was by default hidden.
95639dbb	2015-06-12T08:50:48	Fix memory leak on windows in diriter.
0e522f6e	2015-06-12T09:28:19	binary diff: document changes in CHANGELOG
3208df37	2015-06-02T18:28:06	patch: include diff options on blob->blob diffs
391281ae	2015-06-02T18:26:22	binary diff: test binary blob to blob tests
8147b1af	2015-05-25T20:03:59	diff: introduce binary diff callbacks Introduce a new binary diff callback to provide the actual binary delta contents to callers. Create this data from the diff contents (instead of directly from the ODB) to support binary diffs including the workdir, not just things coming out of the ODB.
ac7012a8	2015-05-25T20:36:29	binary diff: test index->workdir binary diffs
6995b18a	2015-06-12T14:52:48	Merge pull request #3208 from git-up/secure_transport Fixed some Secure Transport issues on OS X
4ce58244	2015-06-12T14:51:59	Merge pull request #3214 from libgit2/cmn/push-tests travis: fail if we fail the push tests
352ee171	2015-06-12T12:45:49	clone: set the credentials callback during testing
0f69b41d	2015-06-12T12:25:25	push: pass the callbacks during setup as well We need to pass these options in order to have the credentials callback set.
6042a050	2015-06-12T12:17:03	travis: fail if we fail the push tests These tests were not being taken into consideration for the failure of the test. They've been failing for a while now, but we hadn't noticed as Travis was reporting the builds successful.
6d0a0aca	2015-06-11T23:20:28	Fixed some Secure Transport issues on OS X The read and write callbacks passed to SSLSetIOFuncs() have been rewritten to match the implementation used on opensource.apple.com and other open source projects like VLC. This change also fixes a bug where the read callback could get into an infinite loop when 0 bytes were read.
2deb3608	2015-06-11T08:54:48	Merge pull request #3155 from mgorny/userpass-const cred_helpers: Add 'const' qualifiers to git_cred_userpass_payload
65d69fe8	2015-06-11T08:24:58	commit: ignore multiple author fields Some tools create multiple author fields. git is rather lax when parsing them, although fsck does complain about them. This means that they exist in the wild. As it's not too taxing to check for them, and there shouldn't be a noticeable slowdown when dealing with correct commits, add logic to skip over these extra fields when parsing the commit.
fa934fab	2015-06-11T07:17:34	Merge pull request #3205 from ethomson/crlf_query Introduce `git_filter_list_contains`
3fcfede1	2015-06-11T07:13:07	Merge pull request #3207 from ethomson/winhttp_eol Correct line endings on winhttp.def
3e8c5e45	2015-06-10T16:43:48	Merge pull request #3174 from libgit2/cmn/idx-fill-hole indexer: use lseek to extend the packfile
7f8cd672	2015-06-10T16:42:07	Merge pull request #3204 from git-up/git_diff_find_similar Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()
4f0f2b84	2015-06-10T16:36:38	Correct line endings on winhttp.def
2eecc288	2015-06-10T14:43:49	Introduce `git_filter_list_contains` `git_filter_list_contains` can be used to query a filter list to determine if a given filter will be run.
4e883b5e	2015-06-10T19:55:18	Merge pull request #3203 from ethomson/gitattributes gitattributes: let clients use native line endings
50456801	2015-06-10T10:09:10	Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar() git_diff_find_similar() now ignores git_diff_delta records with a status of GIT_DELTA_CONFLICTED, which fixes a crash due to assert() being hit.
f284e729	2015-06-10T12:24:06	gitattributes: let clients use native line endings Use "text=auto" to ensure that we get LFs in the repository, but let clients have their native line endings in their worktree.
da6720fc	2015-06-10T09:02:54	Merge pull request #3201 from libgit2/cmn/coverity A few more fixes from coverity
0137aba5	2015-06-10T11:08:05	filter: close the descriptor in case of error When we hit an error writing to the next stream from a file, we jump to 'done' which currently skips over closing the file descriptor. Make sure to close the descriptor if it has been set to a valid value.
969d4b70	2015-06-10T10:59:56	object: correct the expected ID size in prefix lookup We take in a possibly partial ID by taking a length and working off of that to figure out whether to just look up the object or ask the backends for a prefix lookup. Unfortunately we've been checking the size against `GIT_OID_HEXSZ` which is the size of a string containing a full ID, whereas we need to check against the size we can have when it's a 20-byte array. Change the checks and comment to use `GIT_OID_RAWSZ` which is the correct size of a git_oid to have when full.
878293f7	2015-06-10T10:44:14	pack: use git_buf when building the index name The way we currently do it depends on the subtlety of strlen vs sizeof and the fact that .pack is one longer than .idx. Let's use a git_buf so we can express the manipulation we want much more clearly.
ca2857d8	2015-06-10T10:30:08	merge: actually increment the counts, not the pointers `merge_diff_list_count_candidates()` takes pointers to the source and target counts, but when it comes time to increase them, we're increasing the pointer, rather than the value it's pointing to. Dereference the value to increase.
2d73075a	2015-06-10T10:23:08	cache: add a check for a failed allocation Rather minimal change, but it's the kind of thing we should do.
a166466c	2015-06-09T17:06:28	Merge pull request #3198 from libgit2/cmn/coverity A few fixes from Coverity
02980bdc	2015-06-09T16:53:07	Initialize a few variables Coverity complains about the git_rawobj ones because we use a loop in which we keep remembering the old version, and we end up copying our object as the base, so we want to have the data pointer be NULL.
81be2f46	2015-06-09T16:01:29	ssh: move NULL check to the free function Let `ssh_stream_free()` take a NULL stream, as free functions should, and remove the check from the connection setup. The connection setup would not need the check anyhow, as we always have a stream by the time we reach this code.
82a7a24c	2015-06-08T15:22:01	Merge pull request #3165 from ethomson/downcase Downcase
c0d79992	2015-06-08T12:21:36	Merge pull request #3188 from thentenaar/clean-up-after-openssl global: Ensure we free our SSL context.
20f8edb7	2015-06-04T02:22:10	global: Ensure we free our SSL context.
b6011e29	2015-06-07T15:10:28	Merge pull request #3185 from libgit2/cmn/foreach-cancel-loose path: error out if the callback returns an error
fdb82dcd	2015-06-07T15:10:13	Merge pull request #3175 from git-up/build_warnings Fixed build warnings on Xcode 6.1
2785544f	2015-06-07T10:45:39	remote: some error-handling issues from Coverity
3c4442a2	2015-06-07T10:03:31	Merge pull request #3179 from arielb2/master print_usage functions is defined but not used
8da44047	2015-06-06T03:55:28	path: error out if the callback returns an error When the callback returns an error, we should stop immediately. This broke when trying to make sure we pass specific errors up the chain. This broke cancelling out of the loose backend's foreach.
babdc376	2015-06-04T13:02:59	Merge pull request #3172 from Therzok/patch-2 Change error when running out of ssh agent keys
9334c86f	2015-06-03T14:54:26	print_usage functions is defined but not used Use the previously created function to display a message when the arguments are not valid. ticket 3095
9f3c18e2	2015-06-02T08:36:15	Fixed build warnings on Xcode 6.1
d71e3b25	2015-06-02T10:23:54	Change error when running out of ssh agent keys
aa57231f	2015-06-02T10:25:22	indexer: use lseek to extend the packfile We've been using `p_ftruncate()` to extend the packfile in order to mmap it and write the new data into it. This works well in the general case, but as truncation does not allocate space in the filesystem, it must do so when we write data to it. The only way the OS has to indicate a failure to allocate space is via SIGBUS which means we tried to write outside the file. This will cause everyone to crash as they don't expect to handle this signal. Switch to using `p_lseek()` and `p_write()` to extend the file in a way which tells the filesystem to allocate the space for the missing data. We can then be sure that we have space to write into.
10940736	2015-06-01T22:15:11	clone: fall back to copying when linking does not work We use heuristics to make a decent guess at when we can save time and space by linking object files during a clone. Unfortunately checking the device id isn't enough, as those would be the same during e.g. a bind-mount, but the OS still does not allow us to link between mounts of the same filesystem. If we fail to perform the links, fall back to copying the contents into a new file as a last attempt.
be5fda75	2015-05-31T19:21:42	Include git2/transaction.h This was forgotten when the feature was implemented.
449f9ec9	2015-05-31T18:53:42	Merge pull request #3152 from tkelman/patch-1 build maint branches on appveyor
ac587e75	2015-05-31T15:45:56	Merge pull request #3048 from pks-t/insteadof Implementation of url.*.insteadOf
9e88a823	2015-05-21T13:02:22	remote: test insteadOf for anonymous remotes
771069e1	2015-05-21T12:46:04	Add CHANGELOG entry for url.*.insteadOf feature.
ec0c4c40	2015-05-04T11:59:20	remote: apply insteadOf configuration. A remote's URLs are now modified according to the url..insteadOf and url..pushInsteadOf configurations. This allows a user to replace URL prefixes by setting the corresponding keys. E.g. "url.foo.insteadOf = bar" would replace the prefix "bar" with the new prefix "foo".

4ebe320a

2015-06-09T10:37:14

crlf tests: windows known-good data A corpus of files checked out with Git for Windows (2.4.1.windows.1) to ensure that we produce identical data when checking out using a CRLF filter.

3d92b9ab

2015-06-08T09:08:01

crlf tests: use known-good data produced by git Given a variety of combinations of core.autocrlf settings and attributes settings, test that we check out data into the working directory the same as a known-good test resource created by git.git.

bf8c0a9b

2015-06-08T09:06:53

crlf: script to generate expected crlf data Include a shell script that will generate the expected CRLF data, calling git.git to capture its output as a test resource for the current platform.

bd5e59ee

2015-06-08T09:04:39

crlf: include utf8 resources in master branch Include the UTF8 and UTF8 BOM tests in the master crlf test branch for completeness.

84f8f500

2015-06-05T10:11:50

crlf: include additional test resources Include additional test data for CRLF tests: files with mixed line endings and binary files.

0b6ed4f9

2015-06-22T11:24:20

Merge pull request #3240 from libgit2/cmn/commit-header-field commit: allow retrieving an arbitrary header field

0c94deb9

2015-06-22T16:58:14

Merge pull request #3239 from git-up/stash_index Write modified index in git_stash_apply()

a3f42fe8

2015-06-22T15:32:29

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

e35b947b

2015-06-21T01:06:20

Write modified index in git_stash_apply() Same as with git_stash_save(), there's no reason not to write the index to disk since it has been modified.

e96a97f1

2015-06-20T23:17:42

Merge pull request #3233 from ethomson/status_typechange Don't propagate workdir's mode to the index during diff's update index

96dd171e

2015-06-19T08:32:26

diff: preserve original mode in the index When updating the index during a diff, preserve the original mode, which prevents us from dropping the mode to what we have interpreted as on our system (eg, what the working directory claims it to be, which may be a lie on some systems.)

fc656802

2015-06-19T08:31:07

status: test that symlinks don't lose their mode Test to ensure that when status updates an index, it does not alter the original mode for file types that are not supported (eg, symlinks on Windows).

9018529b

2015-06-20T14:34:34

Merge pull request #3238 from git-up/double_free Fixed index being double-freed in stash tests

883cb642

2015-06-20T14:05:02

Merge pull request #3236 from libgit2/cmn/index-checksum Use the checksum to check whether an index has been modified

07ea3a7f

2015-06-20T10:57:03

Fixed index being double-freed in stash tests

624c949f

2015-06-20T16:17:28

index: make relative comparison use the checksum as well This is used by the submodule in order to figure out if the index has changed since it last read it. Using a timestamp is racy, so let's make it use the checksum, just like we now do for reloading the index itself.

3e5b553a

2015-06-20T12:14:49

Merge pull request #3232 from Therzok/patch-2 Quote LIBSSH2_LIBRARIES call

863dd89a

2015-06-18T12:45:40

tests: tick over five seconds instead of one When ticking over one second, it can happen that the actual time ticks over the same second between the time that we undermine our own race protections and the time in which we perform the index update. Such timing would make the time in the entries match the index' timestamp and we have not gained anything. Ticking over five seconds makes it so that if real-time rolls over that second, our index is still ahead. This is still suboptimal as we're dealing with timing, but five seconds should be long enough for any reasonable test runner to finish the tests.

5e947c91

2015-06-19T22:05:08

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

46c84c72

2015-06-19T21:56:42

index: user a better assertion when comparing sizes This will tell us which numbers we were trying to compare, rather than just telling us that they're different.

e488bef4

2015-06-19T12:53:37

Quote LIBSSH2_LIBRARIES call Credits to @directhex It is possible for PKG_CHECK_MODULES(LIBSSH2 libssh2) to LIBSSH2_LIBRARIES to a string with more than one library in it - e.g. if your libssh2 was built against libgcrypt, it will be "ssh2;gcrypt" Quoting the string is needed, or CHECK_LIBRARY_EXISTS will fail.

6e0470e0

2015-06-17T21:36:27

Merge pull request #3229 from git-up/build_warnings Fixed Xcode 6.1 build warnings

85a5e8eb

2015-06-17T09:00:23

Fixed Xcode 6.1 build warnings

83a04a69

2015-06-17T16:08:20

Merge pull request #3227 from jeffhostetler/memory_leak__tests_network_refspecs Fix memory leak in tests/network/refspecs.c

534d136d

2015-06-17T08:52:28

Fix memory leak in tests/network/refspecs.c

a56db992

2015-06-17T08:15:49

Merge pull request #3219 from libgit2/cmn/racy-diff Zero out racily-clean entries' file_size

892abf93

2015-06-16T17:23:12

checkout: allow workdir to contain checkout target When checking out some file 'foo' that has been modified in the working directory, allow the checkout to proceed (do not conflict) if 'foo' is identical to the target of the checkout.

fef5344c

2015-06-16T16:34:25

merge::workdir::dirty: tick idx to defeat racy-git

121c3171

2015-06-16T15:18:04

Introduce p_utimes and p_futimes Provide functionality to set the time on a filesystem entry, using utimes or futimes on POSIX type systems or SetFileTime on Win32.

5f83758f

2015-06-16T10:40:46

Merge pull request #3209 from libgit2/cmn/double-author commit: ignore multiple author fields

86faea5f

2015-06-16T08:45:55

Merge pull request #3225 from libgit2/cmn/url-empty remote: return EINVALIDSPEC when given an empty URL

47a40d1d

2015-06-16T12:39:11

remote: return EINVALIDSPEC when given an empty URL This is what we used to return in the settter and there's tests in bindings which ask for this. There's no particular reason to stop doing so.

aeb2b991

2015-06-16T09:20:36

Merge pull request #3221 from git-up/build_warnings Fixed Xcode 6.1 build warnings

e44abe16

2015-06-16T08:51:45

tests: tick the index when we count OID calculations These tests want to test that we don't recalculate entries which match the index already. This is however something we force when truncating racily-clean entries. Tick the index forward as we know that we don't perform the modifications which the racily-clean code is trying to avoid.

c4e6ab5f

2015-06-15T14:32:08

crlf: tick the index forward to work around racy-git behaviour In order to avoid racy-git, we zero out the file size for entries with the same timestamp as the index (or during the initial checkout). This is the case in a couple of crlf tests, as the code is fast enough to do everything in the same second. As we know that we do not perform the modification just after writing out the index, which is what this is designed to work around, tick the mtime of the index file such that it doesn't agree with the files anymore, and we do not zero out these entries.

316b820b

2015-06-15T09:55:40

index: zero the size of racily-clean entries If a file entry has the same timestamp as the index itself, it is considered racily-clean, as it may have been modified after the index was written, but during the same second. We take extra steps to check the contents, but this is just one part of avoiding races. For files which do have changes but have not been updated in the index, updating the on-disk index means updating its timestamp, which means we would no longer recognise these entries as racy and we would trust the timestamp to tell us whether they have changed. In order to work around this, git zeroes out the file-size field in entries with the same timestamp as the index in order to force the next diff to check the contents. Do so in libgit2 as well.

77596fcf

2015-06-15T09:51:34

diff: add failing test for racy-git in the index We update the index and then immediately change the contents of the file. This makes the diff think there are no changes, as the timestamp of the file agrees with the cached data. This is however a bug, as the file has obviously changed contents. The test is a bit fragile, as it assumes that the index writing and the following modification of the file happen in the same second, but it's enough to show the issue.

b93dcd4c

2015-06-15T17:10:35

Merge pull request #3216 from dprofeta/fixTransactionVisibility Fix visibility of transaction symbol

0f4d9c03

2015-06-15T09:52:40

Fixed Xcode 6.1 build warnings

f621f087

2015-06-15T09:11:32

Merge pull request #3220 from libgit2/cmn/readdir path: remove unnecessary readdir_r usage

25bd0aaf

2015-06-15T13:28:08

path: remove unnecessary readdir_r usage Arguably all uses of readdir_r are unnecessary, but in this case especially so, as the directory handle only exists within this function, so we don't race with anybody.

2665fefa

2015-06-15T10:20:58

Merge pull request #3171 from libgit2/cmn/link-fallback clone: fall back to copying when linking does not work

b224c388

2015-05-07T14:21:25

Fix in stransport_stream.c for usage of SecCopyErrorMessageString(), which is unavailable to iOS targets.

d4723c89

2015-06-15T08:17:45

Merge pull request #3177 from ethomson/binary_diff Binary diffs: store deltas in the diff structure, include binary data in diff callbacks

ae22ef0e

2015-06-15T08:09:21

Merge pull request #3217 from jeffhostetler/leak_checkout_icase Fix leaks in tests/checkout/icase

f2dec481

2015-06-12T18:35:18

Merge pull request #3215 from jeffhostetler/windows_leak_diriter Fix memory leak on windows in diriter.

26d5c0b8

2015-06-12T09:28:47

Fix leaks in tests/checkout/icase

5c757327

2015-06-12T18:14:32

Fix visibility of transaction symbol Transaction.c did not include the visibility definition of its symbol (that are in git2/transaction.h) and so was by default hidden.

95639dbb

2015-06-12T08:50:48

Fix memory leak on windows in diriter.

0e522f6e

2015-06-12T09:28:19

binary diff: document changes in CHANGELOG

3208df37

2015-06-02T18:28:06

patch: include diff options on blob->blob diffs

391281ae

2015-06-02T18:26:22

binary diff: test binary blob to blob tests

8147b1af

2015-05-25T20:03:59

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

ac7012a8

2015-05-25T20:36:29

binary diff: test index->workdir binary diffs

6995b18a

2015-06-12T14:52:48

Merge pull request #3208 from git-up/secure_transport Fixed some Secure Transport issues on OS X

4ce58244

2015-06-12T14:51:59

Merge pull request #3214 from libgit2/cmn/push-tests travis: fail if we fail the push tests

352ee171

2015-06-12T12:45:49

clone: set the credentials callback during testing

0f69b41d

2015-06-12T12:25:25

push: pass the callbacks during setup as well We need to pass these options in order to have the credentials callback set.

6042a050

2015-06-12T12:17:03

travis: fail if we fail the push tests These tests were not being taken into consideration for the failure of the test. They've been failing for a while now, but we hadn't noticed as Travis was reporting the builds successful.

6d0a0aca

2015-06-11T23:20:28

Fixed some Secure Transport issues on OS X The read and write callbacks passed to SSLSetIOFuncs() have been rewritten to match the implementation used on opensource.apple.com and other open source projects like VLC. This change also fixes a bug where the read callback could get into an infinite loop when 0 bytes were read.

2deb3608

2015-06-11T08:54:48

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

65d69fe8

2015-06-11T08:24:58

commit: ignore multiple author fields Some tools create multiple author fields. git is rather lax when parsing them, although fsck does complain about them. This means that they exist in the wild. As it's not too taxing to check for them, and there shouldn't be a noticeable slowdown when dealing with correct commits, add logic to skip over these extra fields when parsing the commit.

fa934fab

2015-06-11T07:17:34

Merge pull request #3205 from ethomson/crlf_query Introduce `git_filter_list_contains`

3fcfede1

2015-06-11T07:13:07

Merge pull request #3207 from ethomson/winhttp_eol Correct line endings on winhttp.def

3e8c5e45

2015-06-10T16:43:48

Merge pull request #3174 from libgit2/cmn/idx-fill-hole indexer: use lseek to extend the packfile

7f8cd672

2015-06-10T16:42:07

Merge pull request #3204 from git-up/git_diff_find_similar Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()

4f0f2b84

2015-06-10T16:36:38

Correct line endings on winhttp.def

2eecc288

2015-06-10T14:43:49

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

4e883b5e

2015-06-10T19:55:18

Merge pull request #3203 from ethomson/gitattributes gitattributes: let clients use native line endings

50456801

2015-06-10T10:09:10

Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar() git_diff_find_similar() now ignores git_diff_delta records with a status of GIT_DELTA_CONFLICTED, which fixes a crash due to assert() being hit.

f284e729

2015-06-10T12:24:06

gitattributes: let clients use native line endings Use "text=auto" to ensure that we get LFs in the repository, but let clients have their native line endings in their worktree.

da6720fc

2015-06-10T09:02:54

Merge pull request #3201 from libgit2/cmn/coverity A few more fixes from coverity

0137aba5

2015-06-10T11:08:05

filter: close the descriptor in case of error When we hit an error writing to the next stream from a file, we jump to 'done' which currently skips over closing the file descriptor. Make sure to close the descriptor if it has been set to a valid value.

969d4b70

2015-06-10T10:59:56

object: correct the expected ID size in prefix lookup We take in a possibly partial ID by taking a length and working off of that to figure out whether to just look up the object or ask the backends for a prefix lookup. Unfortunately we've been checking the size against `GIT_OID_HEXSZ` which is the size of a *string* containing a full ID, whereas we need to check against the size we can have when it's a 20-byte array. Change the checks and comment to use `GIT_OID_RAWSZ` which is the correct size of a git_oid to have when full.

878293f7

2015-06-10T10:44:14

pack: use git_buf when building the index name The way we currently do it depends on the subtlety of strlen vs sizeof and the fact that .pack is one longer than .idx. Let's use a git_buf so we can express the manipulation we want much more clearly.

ca2857d8

2015-06-10T10:30:08

merge: actually increment the counts, not the pointers `merge_diff_list_count_candidates()` takes pointers to the source and target counts, but when it comes time to increase them, we're increasing the pointer, rather than the value it's pointing to. Dereference the value to increase.

2d73075a

2015-06-10T10:23:08

cache: add a check for a failed allocation Rather minimal change, but it's the kind of thing we should do.

a166466c

2015-06-09T17:06:28

Merge pull request #3198 from libgit2/cmn/coverity A few fixes from Coverity

02980bdc

2015-06-09T16:53:07

Initialize a few variables Coverity complains about the git_rawobj ones because we use a loop in which we keep remembering the old version, and we end up copying our object as the base, so we want to have the data pointer be NULL.

81be2f46

2015-06-09T16:01:29

ssh: move NULL check to the free function Let `ssh_stream_free()` take a NULL stream, as free functions should, and remove the check from the connection setup. The connection setup would not need the check anyhow, as we always have a stream by the time we reach this code.

82a7a24c

2015-06-08T15:22:01

Merge pull request #3165 from ethomson/downcase Downcase

c0d79992

2015-06-08T12:21:36

Merge pull request #3188 from thentenaar/clean-up-after-openssl global: Ensure we free our SSL context.

20f8edb7

2015-06-04T02:22:10

global: Ensure we free our SSL context.

b6011e29

2015-06-07T15:10:28

Merge pull request #3185 from libgit2/cmn/foreach-cancel-loose path: error out if the callback returns an error

fdb82dcd

2015-06-07T15:10:13

Merge pull request #3175 from git-up/build_warnings Fixed build warnings on Xcode 6.1

2785544f

2015-06-07T10:45:39

remote: some error-handling issues from Coverity

3c4442a2

2015-06-07T10:03:31

Merge pull request #3179 from arielb2/master print_usage functions is defined but not used

8da44047

2015-06-06T03:55:28

path: error out if the callback returns an error When the callback returns an error, we should stop immediately. This broke when trying to make sure we pass specific errors up the chain. This broke cancelling out of the loose backend's foreach.

babdc376

2015-06-04T13:02:59

Merge pull request #3172 from Therzok/patch-2 Change error when running out of ssh agent keys

9334c86f

2015-06-03T14:54:26

print_usage functions is defined but not used Use the previously created function to display a message when the arguments are not valid. ticket 3095

9f3c18e2

2015-06-02T08:36:15

Fixed build warnings on Xcode 6.1

d71e3b25

2015-06-02T10:23:54

Change error when running out of ssh agent keys

aa57231f

2015-06-02T10:25:22

indexer: use lseek to extend the packfile We've been using `p_ftruncate()` to extend the packfile in order to mmap it and write the new data into it. This works well in the general case, but as truncation does not allocate space in the filesystem, it must do so when we write data to it. The only way the OS has to indicate a failure to allocate space is via SIGBUS which means we tried to write outside the file. This will cause everyone to crash as they don't expect to handle this signal. Switch to using `p_lseek()` and `p_write()` to extend the file in a way which tells the filesystem to allocate the space for the missing data. We can then be sure that we have space to write into.

10940736

2015-06-01T22:15:11

clone: fall back to copying when linking does not work We use heuristics to make a decent guess at when we can save time and space by linking object files during a clone. Unfortunately checking the device id isn't enough, as those would be the same during e.g. a bind-mount, but the OS still does not allow us to link between mounts of the same filesystem. If we fail to perform the links, fall back to copying the contents into a new file as a last attempt.

be5fda75

2015-05-31T19:21:42

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

449f9ec9

2015-05-31T18:53:42

Merge pull request #3152 from tkelman/patch-1 build maint branches on appveyor

ac587e75

2015-05-31T15:45:56

Merge pull request #3048 from pks-t/insteadof Implementation of url.*.insteadOf

9e88a823

2015-05-21T13:02:22

remote: test insteadOf for anonymous remotes

771069e1

2015-05-21T12:46:04

Add CHANGELOG entry for url.*.insteadOf feature.

ec0c4c40

2015-05-04T11:59:20

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

thodg/libgit2

Log