kmx git

Commit	Date	Message
f44fd59e	2014-02-05T11:21:14	refs: check the ref's old value when deleting Recognize when the reference has changed since we loaded it.
878fb66f	2014-02-05T10:19:17	refs: bring conditional symbolic updates to the frontend Bring the race detection goodness to symbolic references as well.
d6236cf6	2014-02-04T21:40:22	refs: add tests for conditional updates
bb13d391	2014-02-01T12:51:44	Test that emulates a strange filter implementation
16eb8b7c	2014-02-01T12:02:55	Tests merging staged files identical to result
b60149ec	2014-01-31T18:43:50	Tests merge when changes exist in workdir/index
3b6a5bac	2014-02-03T10:36:04	Merge pull request #2095 from libgit2/update-head-reflog Correct "new" id for reattached-HEAD reflog entry
50ad7cc2	2014-02-02T18:20:06	Add `git_reference_is_note`.
7ac1b899	2014-02-01T11:46:15	Add failing test case
7be88b4c	2014-01-31T13:44:09	Update to latest clar
db092c19	2014-01-30T16:10:18	Allow tests to run without user config
a1710a28	2014-01-29T10:35:46	Enhance testing of signature parameters
59bb1126	2014-01-28T11:45:30	Provide good default reflog messages in branch api
e871d89b	2014-01-28T11:32:09	Ensure moving a branch updates the reflog
540c1809	2014-01-28T10:44:33	Add reflog parameters to git_branch_move
48110f67	2014-01-28T10:31:54	Deleting a branch deletes its reflog
1cc974ab	2014-01-27T14:40:31	Augment clone API with reflog parameters
b31ebfbc	2014-01-27T14:12:29	Add reflog params to git_branch_create
ccf6ce5c	2014-01-28T11:30:36	Ensure renaming a reference updates the reflog
67c4716f	2014-01-27T13:47:48	Add passing reflog tests
2952a9d0	2014-01-27T13:39:48	Ensure creating HEAD creates its reflog
a2311f92	2014-01-27T13:12:31	Ensure updating HEAD updates reflog
94f263f5	2014-01-25T08:04:49	Add reflog params to set-head calls
8646b0a0	2014-01-30T15:10:39	Merge pull request #2085 from libgit2/rb/index-tree-blob-collision Index tree-bob collision
8606f33b	2014-01-30T09:59:15	Expand zstream tests and fix off-by-one error
d9b04d78	2014-01-29T15:02:35	Reorganize zstream API and fix wrap problems There were some confusing issues mixing up the number of bytes written to the zstream output buffer with the number of bytes consumed from the zstream input. This reorganizes the zstream API and makes it easier to deflate an arbitrarily large input while still using a fixed size output.
3cf11eef	2014-01-28T11:47:33	Misc cleanups
c0644c3f	2014-01-28T11:45:06	Make submodule fetchRecurse match other options This removes the fetchRecurse compiler warnings and makes the behavior match the other submodule options (i.e. the in-memory setting can be reset to the on-disk value).
bae8bea0	2014-01-29T12:53:01	More index collision tests
95fbedcd	2014-01-28T16:22:37	Add test for blob/tree name collisions in index
96f12e70	2014-01-29T12:50:42	Don't strcmp a git_buf, strcmp its char *
e7c16943	2014-01-28T19:39:14	Add `git_graph_descendant_of`.
a1a9d0bd	2014-01-27T15:35:39	Merge pull request #2066 from libgit2/rb/builtin-diff-drivers Add built in diff drivers
daebb598	2014-01-27T14:57:03	Add PHP tests and fix bug in PHP builtin driver
082e82db	2014-01-27T11:45:06	Update Javascript userdiff driver and tests Writing a sample Javascript driver pointed out some extra whitespace handling that needed to be done in the diff driver. This adds some tests with some sample javascript code that I pulled off of GitHub just to see what would happen. Also, to clean up the userdiff test data, I did a "git gc" and packed up the test objects.
93954245	2014-01-27T09:39:36	Merge pull request #2075 from libgit2/cmn/leftover-oid Leftover OID -> ID changes
46e7fc18	2014-01-27T09:36:24	Merge pull request #2077 from libgit2/cmn/buf-out Buff up returning strings
66d585c6	2014-01-27T04:58:23	MSVC doesn't like modern code
bf522e08	2014-01-26T16:59:36	refspec: move to git_buf for outputting strings
e1d7f003	2014-01-26T16:32:49	messsage: use git_buf in prettify() A lot of the tests were checking for overflow, which we don't have anymore, so we can remove them.
b25d87c9	2014-01-26T16:03:37	branch: move to git_buf when outputting newly-allocated strings Internally we already did everything with git_bufs, so this is just exposing those functions with public names.
7a3bd1e7	2014-01-26T15:35:17	repository: move to use a git_buf for outputting strings Since we now export that type, we can avoid making the user guess a size.
991b2840	2014-01-26T19:35:02	Make sure git_remote_dup copies a remote's refspecs correctly.
58582cd0	2014-01-26T06:31:38	Merge pull request #2057 from GrahamDennis/local-file-url-push-fix Fix local push to file:// URL.
a1bbc0ce	2014-01-25T04:14:37	merge: rename _oid() -> id() Following the rest of the series, use 'id' when refering to the value.
9950bb4e	2014-01-24T20:23:17	diff: rename the file's 'oid' to 'id' In the same vein as the previous commits in this series.
d541170c	2014-01-24T11:36:41	index: rename an entry's id to 'id' This was not converted when we converted the rest, so do it now.
027b8eda	2014-01-24T15:45:49	Move userdiff tests to be data driven This moves the expected and actual test data along with the source data for the userdiff tests into the tests/resources/userdiff test repo and updates the test to use that.
5d82c0df	2014-01-21T12:08:02	Update all tests for new pattern extraction
b8e86c62	2014-01-21T12:00:08	Implement matched pattern extract for fn headers
9bbc53d6	2014-01-21T11:36:43	Fix filemode updating in diff text
2c65602e	2014-01-21T10:39:27	Import git drivers and test HTML driver Reorganize the builtin driver table slightly so that core Git builtin definitions can be imported verbatim. Then take a few of the core Git drivers and pull them in. This also creates a test of diffs with the builtin HTML driver which led to some small error handling fixes in the driver selection logic.
d0a3de72	2014-01-24T11:18:51	note: rename the id getter to git_note_id() This was left over when we did the general switch.
ac8949ed	2014-01-22T15:41:25	Merge pull request #2073 from ethomson/zerobytes Sometimes a zero byte file is just a zero byte file
410a8e6f	2014-01-22T18:31:25	Sometimes a zero byte file is just a zero byte file Don't go to the ODB to resolve zero byte files in the workdir
238e8149	2014-01-22T14:41:04	Summarize empty messages
e8b81c69	2014-01-22T13:24:32	Preserve tree filemode in index during checkout Don't try to determine whether the system supports file modes when putting the tree data in the index during checkout. The tree's mode is canonical and did not come from stat(2) in the first place.
c05cd792	2014-01-22T17:51:32	Drop git_patch_to_str It's hard or even impossible to correctly free the string buffer allocated by git_patch_to_str in some circumstances. Drop the function so people have to use git_patch_to_buf instead - git_buf has a dedicated destructor.
0ef19fe1	2014-01-20T17:13:55	Merge submodules
db3462ce	2014-01-19T22:36:50	Support union merges
0e1ba46c	2014-01-19T20:03:13	Remove the "merge none" flag The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.
6891a862	2014-01-19T18:12:22	Load merge.conflictstyle setting from config
e651e8e2	2014-01-19T15:05:08	Introduce diff3 mode for checking out conflicts
6b92c99b	2014-01-19T01:20:25	Don't try to merge binary files
c1d648c5	2014-01-08T18:29:42	merge_file should use more aggressive levels The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem.
b554ca5d	2014-01-20T15:12:06	"Uninitialized" submodules are "unmodified" Extend the "unmodified" submodule workdir test to include uninitialized submodules, to prevent reporting submodules as modified when they're not in the workdir at all.
abdaf936	2014-01-20T11:42:12	add unit tests for git_buf_join corner cases
c7015424	2014-01-18T08:54:19	Fix a compile warning.
194d077c	2014-01-18T08:43:29	Add test for pushing to a local file:// URL.
0b28217b	2014-01-15T12:51:31	refs: remove the _with_log differentiation Any well-behaved program should write a descriptive message to the reflog whenever it updates a reference. Let's make this more prominent by removing the version without the reflog parameters.
40ef47dd	2014-01-14T21:03:01	Add `git_remote_dup`.
426d8456	2014-01-08T19:43:31	Merge pull request #2033 from xtao/blame_orig_commit Add orig_commit.
b92b434f	2014-01-09T11:18:38	Add orig & final commit test.
6adcaab7	2014-01-08T10:07:30	Handle git_buf's from users more liberally
f3a302ad	2014-01-02T05:10:04	Merge pull request #2019 from linquize/recurse-on-demand Accept 'submodule.*.fetchRecurseSubmodules' config 'on-demand' value
f38cb981	2013-12-31T11:27:32	Updated fetch.c test to pass. I am not sure why there was 6 in the first place.
41ceab25	2013-12-29T11:21:13	Update test related to fetchRecurseSubmodules
4e1f517c	2013-12-18T09:33:45	Merge pull request #1920 from libgit2/cmn/ref-with-log Reference operations with log
bf4a577c	2013-12-13T10:10:32	Overwrite ignored directories on checkout
81a2012d	2013-12-12T11:30:50	Overwrite ignored files on checkout
7a16d54b	2013-12-13T12:47:51	pool: Agh, this test doesn't really apply in 32-bit machines The size_t is 32-bit already, so it overflows before going into the function. The `-1` test should handle this gracefully in both cases anyway.
437f7d69	2013-12-13T12:41:22	pool: Correct overflow checks Ok, scrap the previous commit. This is the right overflow check that takes care of 64 bit overflow and 32-bit overflow, which needs to be considered because the pool malloc can only allocate 32-bit elements in one go.
452c7de6	2013-12-12T14:16:40	Add git_treebuilder_insert test and clarify doc This wasn't being tested and since it has a callback, I fixed it even though the return value of this callback is not treated like any of the other callbacks in the API.
11bd7a03	2013-12-12T11:14:51	More tests of canceling from callbacks This covers diff print, push, and ref foreach. This also has a fix for a small memory leak in the push tests.
7697e541	2013-12-11T15:02:20	Test cancel from indexer progress callback This adds tests that try canceling an indexer operation from within the progress callback. After writing the tests, I wanted to run this under valgrind and had a number of errors in that situation because mmap wasn't working. I added a CMake option to force emulation of mmap and consolidated the Amiga-specific code into that new place (so we don't actually need separate Amiga code now, just have to turn on -DNO_MMAP). Additionally, I made the indexer code propagate error codes more reliably than it used to.
8b22d862	2013-12-11T11:55:00	More improvements to callback return value tests This time actually checking return values in diff notify tests and actually testing callbacks for the index all-all/update-all/etc functions.
8046b26c	2013-12-10T16:16:36	Try a test that won't assert on Linux
8f1066a0	2013-12-10T16:02:24	Update clone doc and tests for callback return val Clone callbacks can return non-zero values to cancel the clone. This adds some tests to verify that this actually works and updates the documentation to be clearer that this can happen and that the return value will be propagated back by the clone function.
cbd04896	2013-12-10T14:38:35	Fix checkout notify callback docs and tests The checkout notify callback behavior on non-zero return values was not being tested. This adds tests, fixes a bug with positive values, and clarifies the documentation to make it clear that the checkout can be canceled via this mechanism.
19853bdd	2013-12-10T13:01:34	Update git_blob_create_fromchunks callback behavr The callback to supply data chunks could return a negative value to stop creation of the blob, but we were neither using GIT_EUSER nor propagating the return value. This makes things use the new behavior of returning the negative value back to the user.
25e0b157	2013-12-06T15:07:57	Remove converting user error to GIT_EUSER This changes the behavior of callbacks so that the callback error code is not converted into GIT_EUSER and instead we propagate the return value through to the caller. Instead of using the giterr_capture and giterr_restore functions, we now rely on all functions to pass back the return value from a callback. To avoid having a return value with no error message, the user can call the public giterr_set_str or some such function to set an error message. There is a new helper 'giterr_set_callback' that functions can invoke after making a callback which ensures that some error message was set in case the callback did not set one. In places where the sign of the callback return value is meaningful (e.g. positive to skip, negative to abort), only the negative values are returned back to the caller, obviously, since the other values allow for continuing the loop. The hardest parts of this were in the checkout code where positive return values were overloaded as meaningful values for checkout. I fixed this by adding an output parameter to many of the internal checkout functions and removing the overload. This added some code, but it is probably a better implementation. There is some funkiness in the network code where user provided callbacks could be returning a positive or a negative value and we want to rely on that to cancel the loop. There are still a couple places where an user error might get turned into GIT_EUSER there, I think, though none exercised by the tests.
dab89f9b	2013-12-04T21:22:57	Further EUSER and error propagation fixes This continues auditing all the places where GIT_EUSER is being returned and making sure to clear any existing error using the new giterr_user_cancel helper. As a result, places that relied on intercepting GIT_EUSER but having the old error preserved also needed to be cleaned up to correctly stash and then retrieve the actual error. Additionally, as I encountered places where error codes were not being propagated correctly, I tried to fix them up. A number of those fixes are included in the this commit as well.
96869a4e	2013-12-03T16:45:39	Improve GIT_EUSER handling This adds giterr_user_cancel to return GIT_EUSER and clear any error message that is sitting around. As a result of using that in places, we need to be more thorough with capturing errors that happen inside a callback when used internally. To help with that, this also adds giterr_capture and giterr_restore so that when we internally use a foreach-type function that clears errors and converts them to GIT_EUSER, it is easier to restore not just the return value, but the actual error message text.
0eedacb0	2013-12-11T10:39:36	Merge pull request #1985 from libgit2/diff-rename-config Rename detection using diff.renames
5588f073	2013-12-09T10:25:36	Clean up warnings
f2105129	2013-11-23T14:39:53	refs: expose has_log() on the backend The frontend used to look at the file directly, but that's obviously not the right thing to do. Expose it on the backend and use that function instead.
8d5ec910	2013-11-23T14:13:01	refs: expose a way to ensure a ref has a log Sometimes (e.g. stash) we want to make sure that a log will be written, even if it's not in one of the standard locations. Let's make that easier.
6f13a305	2013-11-17T23:26:49	reflog: write to the reflog following git's rules git-core only writes to the reflogs of HEAD, refs/heads/ and, refs/notes/ or if there is already a reflog in place. Adjust our code to follow these semantics.
7fb4147f	2013-12-06T13:38:59	Don't clobber whitespace settings
628e92cd	2013-12-05T14:47:04	Don't use weird return codes

f44fd59e

2014-02-05T11:21:14

refs: check the ref's old value when deleting Recognize when the reference has changed since we loaded it.

878fb66f

2014-02-05T10:19:17

refs: bring conditional symbolic updates to the frontend Bring the race detection goodness to symbolic references as well.

d6236cf6

2014-02-04T21:40:22

refs: add tests for conditional updates

bb13d391

2014-02-01T12:51:44

Test that emulates a strange filter implementation

16eb8b7c

2014-02-01T12:02:55

Tests merging staged files identical to result

b60149ec

2014-01-31T18:43:50

Tests merge when changes exist in workdir/index

3b6a5bac

2014-02-03T10:36:04

Merge pull request #2095 from libgit2/update-head-reflog Correct "new" id for reattached-HEAD reflog entry

50ad7cc2

2014-02-02T18:20:06

Add `git_reference_is_note`.

7ac1b899

2014-02-01T11:46:15

Add failing test case

7be88b4c

2014-01-31T13:44:09

Update to latest clar

db092c19

2014-01-30T16:10:18

Allow tests to run without user config

a1710a28

2014-01-29T10:35:46

Enhance testing of signature parameters

59bb1126

2014-01-28T11:45:30

Provide good default reflog messages in branch api

e871d89b

2014-01-28T11:32:09

Ensure moving a branch updates the reflog

540c1809

2014-01-28T10:44:33

Add reflog parameters to git_branch_move

48110f67

2014-01-28T10:31:54

Deleting a branch deletes its reflog

1cc974ab

2014-01-27T14:40:31

Augment clone API with reflog parameters

b31ebfbc

2014-01-27T14:12:29

Add reflog params to git_branch_create

ccf6ce5c

2014-01-28T11:30:36

Ensure renaming a reference updates the reflog

67c4716f

2014-01-27T13:47:48

Add passing reflog tests

2952a9d0

2014-01-27T13:39:48

Ensure creating HEAD creates its reflog

a2311f92

2014-01-27T13:12:31

Ensure updating HEAD updates reflog

94f263f5

2014-01-25T08:04:49

Add reflog params to set-head calls

8646b0a0

2014-01-30T15:10:39

Merge pull request #2085 from libgit2/rb/index-tree-blob-collision Index tree-bob collision

8606f33b

2014-01-30T09:59:15

Expand zstream tests and fix off-by-one error

d9b04d78

2014-01-29T15:02:35

Reorganize zstream API and fix wrap problems There were some confusing issues mixing up the number of bytes written to the zstream output buffer with the number of bytes consumed from the zstream input. This reorganizes the zstream API and makes it easier to deflate an arbitrarily large input while still using a fixed size output.

3cf11eef

2014-01-28T11:47:33

Misc cleanups

c0644c3f

2014-01-28T11:45:06

Make submodule fetchRecurse match other options This removes the fetchRecurse compiler warnings and makes the behavior match the other submodule options (i.e. the in-memory setting can be reset to the on-disk value).

bae8bea0

2014-01-29T12:53:01

More index collision tests

95fbedcd

2014-01-28T16:22:37

Add test for blob/tree name collisions in index

96f12e70

2014-01-29T12:50:42

Don't strcmp a git_buf, strcmp its char *

e7c16943

2014-01-28T19:39:14

Add `git_graph_descendant_of`.

a1a9d0bd

2014-01-27T15:35:39

Merge pull request #2066 from libgit2/rb/builtin-diff-drivers Add built in diff drivers

daebb598

2014-01-27T14:57:03

Add PHP tests and fix bug in PHP builtin driver

082e82db

2014-01-27T11:45:06

Update Javascript userdiff driver and tests Writing a sample Javascript driver pointed out some extra whitespace handling that needed to be done in the diff driver. This adds some tests with some sample javascript code that I pulled off of GitHub just to see what would happen. Also, to clean up the userdiff test data, I did a "git gc" and packed up the test objects.

93954245

2014-01-27T09:39:36

Merge pull request #2075 from libgit2/cmn/leftover-oid Leftover OID -> ID changes

46e7fc18

2014-01-27T09:36:24

Merge pull request #2077 from libgit2/cmn/buf-out Buff up returning strings

66d585c6

2014-01-27T04:58:23

MSVC doesn't like modern code

bf522e08

2014-01-26T16:59:36

refspec: move to git_buf for outputting strings

e1d7f003

2014-01-26T16:32:49

messsage: use git_buf in prettify() A lot of the tests were checking for overflow, which we don't have anymore, so we can remove them.

b25d87c9

2014-01-26T16:03:37

branch: move to git_buf when outputting newly-allocated strings Internally we already did everything with git_bufs, so this is just exposing those functions with public names.

7a3bd1e7

2014-01-26T15:35:17

repository: move to use a git_buf for outputting strings Since we now export that type, we can avoid making the user guess a size.

991b2840

2014-01-26T19:35:02

Make sure git_remote_dup copies a remote's refspecs correctly.

58582cd0

2014-01-26T06:31:38

Merge pull request #2057 from GrahamDennis/local-file-url-push-fix Fix local push to file:// URL.

a1bbc0ce

2014-01-25T04:14:37

merge: rename _oid() -> id() Following the rest of the series, use 'id' when refering to the value.

9950bb4e

2014-01-24T20:23:17

diff: rename the file's 'oid' to 'id' In the same vein as the previous commits in this series.

d541170c

2014-01-24T11:36:41

index: rename an entry's id to 'id' This was not converted when we converted the rest, so do it now.

027b8eda

2014-01-24T15:45:49

Move userdiff tests to be data driven This moves the expected and actual test data along with the source data for the userdiff tests into the tests/resources/userdiff test repo and updates the test to use that.

5d82c0df

2014-01-21T12:08:02

Update all tests for new pattern extraction

b8e86c62

2014-01-21T12:00:08

Implement matched pattern extract for fn headers

9bbc53d6

2014-01-21T11:36:43

Fix filemode updating in diff text

2c65602e

2014-01-21T10:39:27

Import git drivers and test HTML driver Reorganize the builtin driver table slightly so that core Git builtin definitions can be imported verbatim. Then take a few of the core Git drivers and pull them in. This also creates a test of diffs with the builtin HTML driver which led to some small error handling fixes in the driver selection logic.

d0a3de72

2014-01-24T11:18:51

note: rename the id getter to git_note_id() This was left over when we did the general switch.

ac8949ed

2014-01-22T15:41:25

Merge pull request #2073 from ethomson/zerobytes Sometimes a zero byte file is just a zero byte file

410a8e6f

2014-01-22T18:31:25

Sometimes a zero byte file is just a zero byte file Don't go to the ODB to resolve zero byte files in the workdir

238e8149

2014-01-22T14:41:04

Summarize empty messages

e8b81c69

2014-01-22T13:24:32

Preserve tree filemode in index during checkout Don't try to determine whether the system supports file modes when putting the tree data in the index during checkout. The tree's mode is canonical and did not come from stat(2) in the first place.

c05cd792

2014-01-22T17:51:32

Drop git_patch_to_str It's hard or even impossible to correctly free the string buffer allocated by git_patch_to_str in some circumstances. Drop the function so people have to use git_patch_to_buf instead - git_buf has a dedicated destructor.

0ef19fe1

2014-01-20T17:13:55

Merge submodules

db3462ce

2014-01-19T22:36:50

Support union merges

0e1ba46c

2014-01-19T20:03:13

Remove the "merge none" flag The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.

6891a862

2014-01-19T18:12:22

Load merge.conflictstyle setting from config

e651e8e2

2014-01-19T15:05:08

Introduce diff3 mode for checking out conflicts

6b92c99b

2014-01-19T01:20:25

Don't try to merge binary files

c1d648c5

2014-01-08T18:29:42

merge_file should use more aggressive levels The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem.

b554ca5d

2014-01-20T15:12:06

"Uninitialized" submodules are "unmodified" Extend the "unmodified" submodule workdir test to include uninitialized submodules, to prevent reporting submodules as modified when they're not in the workdir at all.

abdaf936

2014-01-20T11:42:12

add unit tests for git_buf_join corner cases

c7015424

2014-01-18T08:54:19

Fix a compile warning.

194d077c

2014-01-18T08:43:29

Add test for pushing to a local file:// URL.

0b28217b

2014-01-15T12:51:31

refs: remove the _with_log differentiation Any well-behaved program should write a descriptive message to the reflog whenever it updates a reference. Let's make this more prominent by removing the version without the reflog parameters.

40ef47dd

2014-01-14T21:03:01

Add `git_remote_dup`.

426d8456

2014-01-08T19:43:31

Merge pull request #2033 from xtao/blame_orig_commit Add orig_commit.

b92b434f

2014-01-09T11:18:38

Add orig & final commit test.

6adcaab7

2014-01-08T10:07:30

Handle git_buf's from users more liberally

f3a302ad

2014-01-02T05:10:04

Merge pull request #2019 from linquize/recurse-on-demand Accept 'submodule.*.fetchRecurseSubmodules' config 'on-demand' value

f38cb981

2013-12-31T11:27:32

Updated fetch.c test to pass. I am not sure why there was 6 in the first place.

41ceab25

2013-12-29T11:21:13

Update test related to fetchRecurseSubmodules

4e1f517c

2013-12-18T09:33:45

Merge pull request #1920 from libgit2/cmn/ref-with-log Reference operations with log

bf4a577c

2013-12-13T10:10:32

Overwrite ignored directories on checkout

81a2012d

2013-12-12T11:30:50

Overwrite ignored files on checkout

7a16d54b

2013-12-13T12:47:51

pool: Agh, this test doesn't really apply in 32-bit machines The size_t is 32-bit already, so it overflows before going into the function. The `-1` test should handle this gracefully in both cases anyway.

437f7d69

2013-12-13T12:41:22

pool: Correct overflow checks Ok, scrap the previous commit. This is the right overflow check that takes care of 64 bit overflow **and** 32-bit overflow, which needs to be considered because the pool malloc can only allocate 32-bit elements in one go.

452c7de6

2013-12-12T14:16:40

Add git_treebuilder_insert test and clarify doc This wasn't being tested and since it has a callback, I fixed it even though the return value of this callback is not treated like any of the other callbacks in the API.

11bd7a03

2013-12-12T11:14:51

More tests of canceling from callbacks This covers diff print, push, and ref foreach. This also has a fix for a small memory leak in the push tests.

7697e541

2013-12-11T15:02:20

Test cancel from indexer progress callback This adds tests that try canceling an indexer operation from within the progress callback. After writing the tests, I wanted to run this under valgrind and had a number of errors in that situation because mmap wasn't working. I added a CMake option to force emulation of mmap and consolidated the Amiga-specific code into that new place (so we don't actually need separate Amiga code now, just have to turn on -DNO_MMAP). Additionally, I made the indexer code propagate error codes more reliably than it used to.

8b22d862

2013-12-11T11:55:00

More improvements to callback return value tests This time actually checking return values in diff notify tests and actually testing callbacks for the index all-all/update-all/etc functions.

8046b26c

2013-12-10T16:16:36

Try a test that won't assert on Linux

8f1066a0

2013-12-10T16:02:24

Update clone doc and tests for callback return val Clone callbacks can return non-zero values to cancel the clone. This adds some tests to verify that this actually works and updates the documentation to be clearer that this can happen and that the return value will be propagated back by the clone function.

cbd04896

2013-12-10T14:38:35

Fix checkout notify callback docs and tests The checkout notify callback behavior on non-zero return values was not being tested. This adds tests, fixes a bug with positive values, and clarifies the documentation to make it clear that the checkout can be canceled via this mechanism.

19853bdd

2013-12-10T13:01:34

Update git_blob_create_fromchunks callback behavr The callback to supply data chunks could return a negative value to stop creation of the blob, but we were neither using GIT_EUSER nor propagating the return value. This makes things use the new behavior of returning the negative value back to the user.

25e0b157

2013-12-06T15:07:57

Remove converting user error to GIT_EUSER This changes the behavior of callbacks so that the callback error code is not converted into GIT_EUSER and instead we propagate the return value through to the caller. Instead of using the giterr_capture and giterr_restore functions, we now rely on all functions to pass back the return value from a callback. To avoid having a return value with no error message, the user can call the public giterr_set_str or some such function to set an error message. There is a new helper 'giterr_set_callback' that functions can invoke after making a callback which ensures that some error message was set in case the callback did not set one. In places where the sign of the callback return value is meaningful (e.g. positive to skip, negative to abort), only the negative values are returned back to the caller, obviously, since the other values allow for continuing the loop. The hardest parts of this were in the checkout code where positive return values were overloaded as meaningful values for checkout. I fixed this by adding an output parameter to many of the internal checkout functions and removing the overload. This added some code, but it is probably a better implementation. There is some funkiness in the network code where user provided callbacks could be returning a positive or a negative value and we want to rely on that to cancel the loop. There are still a couple places where an user error might get turned into GIT_EUSER there, I think, though none exercised by the tests.

dab89f9b

2013-12-04T21:22:57

Further EUSER and error propagation fixes This continues auditing all the places where GIT_EUSER is being returned and making sure to clear any existing error using the new giterr_user_cancel helper. As a result, places that relied on intercepting GIT_EUSER but having the old error preserved also needed to be cleaned up to correctly stash and then retrieve the actual error. Additionally, as I encountered places where error codes were not being propagated correctly, I tried to fix them up. A number of those fixes are included in the this commit as well.

96869a4e

2013-12-03T16:45:39

Improve GIT_EUSER handling This adds giterr_user_cancel to return GIT_EUSER and clear any error message that is sitting around. As a result of using that in places, we need to be more thorough with capturing errors that happen inside a callback when used internally. To help with that, this also adds giterr_capture and giterr_restore so that when we internally use a foreach-type function that clears errors and converts them to GIT_EUSER, it is easier to restore not just the return value, but the actual error message text.

0eedacb0

2013-12-11T10:39:36

Merge pull request #1985 from libgit2/diff-rename-config Rename detection using diff.renames

5588f073

2013-12-09T10:25:36

Clean up warnings

f2105129

2013-11-23T14:39:53

refs: expose has_log() on the backend The frontend used to look at the file directly, but that's obviously not the right thing to do. Expose it on the backend and use that function instead.

8d5ec910

2013-11-23T14:13:01

refs: expose a way to ensure a ref has a log Sometimes (e.g. stash) we want to make sure that a log will be written, even if it's not in one of the standard locations. Let's make that easier.

6f13a305

2013-11-17T23:26:49

reflog: write to the reflog following git's rules git-core only writes to the reflogs of HEAD, refs/heads/ and, refs/notes/ or if there is already a reflog in place. Adjust our code to follow these semantics.

7fb4147f

2013-12-06T13:38:59

Don't clobber whitespace settings

628e92cd

2013-12-05T14:47:04

Don't use weird return codes

thodg/libgit2/tests

tests

Log