kmx git

Commit	Date	Message
2ab6d2cd	2014-03-06T16:08:17	Revert pull request #1997
4d116c34	2014-03-06T16:08:12	Merge pull request #1997 from mgbowen/merge-options-init-fix Fix GIT_MERGE_OPTS_INIT on MSVC.
b9f81997	2014-03-05T21:49:23	Added function-based initializers for every options struct. The basic structure of each function is courtesy of arrbee.
13f7ecd7	2014-03-04T16:23:28	Add git_object_short_id API to get short id string This finds a short id string that will unambiguously select the given object, starting with the core.abbrev length (usually 7) and growing until it is no longer ambiguous.
f5753999	2014-03-04T15:34:23	Add exists_prefix to ODB backend and ODB API
96484ecd	2014-03-03T12:59:35	Fix the description for `GIT_FEATURE_SSH`.
ebb3c506	2014-03-03T12:40:25	features: Rename `_HAS_` to `_FEATURE_`
2491c416	2014-03-03T12:13:17	caps: Rename the enum name too!
c9f5298b	2014-03-03T12:09:17	caps: Rename to features to avoid confusion
6789b7a7	2014-02-27T14:13:22	Add buffer to buffer diff and patch APIs This adds `git_diff_buffers` and `git_patch_from_buffers`. This also includes a bunch of internal refactoring to increase the shared code between these functions and the blob-to-blob and blob-to-buffer APIs, as well as some higher level assert helpers in the tests to also remove redundancy.
1574d388	2014-02-26T16:58:20	Merge pull request #2137 from jru/blame-first-parent Blame first-parent history
899bd19a	2014-02-24T21:20:57	Document enumerator and rewording
c7c83394	2014-02-21T00:22:07	Add option to limit blame to first parent
c254e2b6	2014-02-21T08:55:30	Improve documentation for merging
72556cc6	2014-02-20T14:27:10	Address PR comments * Make GIT_INLINE an internal definition so it cannot be used in public headers * Fix language in CONTRIBUTING * Make index caps API use signed instead of unsigned values
978a4ed5	2014-02-20T11:00:31	Make git_oid_equal a non-inline API
15284a2c	2014-02-10T14:52:28	refs: move current_id before the reflog parameters Keep the reflog parameters as the last two, as they're the optional parameters.
77ad6754	2014-02-10T14:38:01	refs: conditional wording fixups This addresses arrbee's concerns about wording in the conditional reference udpate functions.
80c29fe9	2014-01-17T10:45:11	Add git_commit_amend API This adds an API to amend an existing commit, basically a shorthand for creating a new commit filling in missing parameters from the values of an existing commit. As part of this, I also added a new "sys" API to create a commit using a callback to get the parents. This allowed me to rewrite all the other commit creation APIs so that temporary allocations are no longer needed.
2d929194	2014-02-07T16:14:17	Merge pull request #2099 from libgit2/bs/more-reflog-stuff More reflogness
57c47af1	2014-02-07T16:05:19	Merge pull request #2042 from libgit2/cmn/conditional-ref refs: conditional ref updates
db55bb73	2014-02-06T11:18:10	Correct default reflog message for git_remote_fetch
2bfc6739	2014-02-06T10:39:57	Fix terrible indentation
0de2c4e3	2014-02-05T13:15:57	Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuff
df70de07	2014-02-05T10:25:50	Merge pull request #2094 from libgit2/cmn/push-non-commit Add flexibility to the revwalk API
d6006413	2014-01-30T17:24:46	docs: produce literal asterisks
d465e4e9	2014-02-01T15:19:13	revwalk: ignore wrong object type in glob pushes Pushing a whole namespace can cause us to attempt to push non-committish objects. Catch this situation and special-case it for ignoring this.
f61272e0	2014-02-01T12:51:36	revwalk: accept committish objects Let the user push committish objects and peel them to figure out which commit to push to our queue. This is for convenience and for allowing uses of git_revwalk_push_glob(w, "tags") with annotated tags.
5367ec4b	2014-02-05T12:02:52	refs: add an unconditional delete Add it under the git_reference_remove() name, letting the user pass the repo and name, analogous to unconditional setting/creation.
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.
7ee8c7e6	2014-02-05T11:07:34	refs: placeholder conditional delete We don't actually pass the old value yet.
878fb66f	2014-02-05T10:19:17	refs: bring conditional symbolic updates to the frontend Bring the race detection goodness to symbolic references as well.
91123661	2014-02-04T22:04:00	refdb: add conditional symbolic updates Add a parameter to the backend to allow checking for the old symbolic target.
fc4728e3	2014-01-29T14:07:18	refs: return GIT_EMODIFIED if the ref target moved In case we loose the race to update the reference, return GIT_EMODIFIED to let the user distinguish it from other types of errors.
5d96fe88	2014-01-14T15:33:29	refs: changes from feedback Change the name to _matching() intead of _if(), and force _set_target() to be a conditional update. If the user doesn't care about the old value, they should use git_reference_create().
9b148098	2013-12-18T19:58:16	refs: conditional ref updates Allow updating references if the old value matches the given one.
010cec3a	2014-02-04T20:50:40	Add reflog params to git_repository_detach_head
c3ab1e5a	2014-02-04T20:38:13	Add reflog parameters to remote apis Also added a test for git_remote_fetch.
491cecfe	2014-02-04T20:13:50	Add reflog parameters to git_push_update_tips
586be3b8	2014-02-03T15:05:55	Add reflog parameters to git_reset
50ad7cc2	2014-02-02T18:20:06	Add `git_reference_is_note`.
a1b07dca	2014-01-29T09:57:20	Document branch-creation reflog better
ccf6ce5c	2014-01-28T11:30:36	Ensure renaming a reference updates the reflog
540c1809	2014-01-28T10:44:33	Add reflog parameters to git_branch_move
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
94f263f5	2014-01-25T08:04:49	Add reflog params to set-head calls
e9d5e5f3	2014-01-28T16:25:42	Some fixes for Windows x64 warnings
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).
5572d2b8	2014-01-28T11:44:17	Some missing oid to id renames
e7c16943	2014-01-28T19:39:14	Add `git_graph_descendant_of`.
93954245	2014-01-27T09:39:36	Merge pull request #2075 from libgit2/cmn/leftover-oid Leftover OID -> ID changes
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.
ee550477	2014-01-26T16:11:18	config: use git_buf for returning paths Again, we already did this internally, so simply remove the conversions.
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.
11f6ad5f	2014-01-15T21:15:34	Add some missing const declarations.
a1bbc0ce	2014-01-25T04:14:37	merge: rename _oid() -> id() Following the rest of the series, use 'id' when refering to the value.
86bfc3e1	2014-01-24T20:30:10	diff: change id abbrev option's name to id_abbrev Same as the other commits in the series, we use 'id' when talking about thing rather than the datatype.
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.
f000ee4e	2014-01-24T18:23:46	tree: remove legacy 'oid' naming Rename git_tree_entry_byoid() to _byid() as per the convention.
47e28349	2014-01-24T12:01:34	commit: remvoe legacy 'oid' naming
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.
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.
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.
450e8e9e	2014-01-22T13:22:15	Expose patch serialization to git_buf Returning library-allocated strings from libgit2 works fine on Linux, but may cause problems on Windows because there is no one C Runtime that everything links against. With libgit2 not exposing its own allocator, freeing the string is a gamble. git_patch_to_str already serializes to a buffer, then returns the underlying memory. Expose the functionality directly, so callers can use the git_buf_free function to free the memory later.
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.
e651e8e2	2014-01-19T15:05:08	Introduce diff3 mode for checking out conflicts
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.
3f033c55	2014-01-16T21:53:25	Revert a wrong doc change.
3f0e3e16	2014-01-16T21:42:28	Fix some documentation issues.
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.
529f342a	2014-01-14T21:33:59	Align git_tree_entry_dup.
29be3a6d	2014-01-14T21:33:35	Align git_signature_dup. This changes git_signature_dup to actually honor oom conditions raised by the call to git__strdup. It also aligns it with the error code return pattern used everywhere else.
40ef47dd	2014-01-14T21:03:01	Add `git_remote_dup`.
6adcaab7	2014-01-08T10:07:30	Handle git_buf's from users more liberally
e7f89b46	2014-01-04T18:18:59	Fix spelling mistake Closes #2029
ac9f9231	2014-01-03T14:40:25	Merge pull request #2022 from KTXSoftware/development submodule branch option + little VS2013 fix
91524172	2014-01-02T14:30:24	Fix warnings with submodule changes
10311979	2014-01-02T03:14:03	Read the submodule branch option from Git 1.8.2.
fccadba2	2013-12-29T10:26:21	Accept 'submodule.*.fetchRecurseSubmodules' config 'on-demand' value
4e1f517c	2013-12-18T09:33:45	Merge pull request #1920 from libgit2/cmn/ref-with-log Reference operations with log
81a2012d	2013-12-12T11:30:50	Overwrite ignored files on checkout
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.
9cfce273	2013-12-12T12:11:38	Cleanups, renames, and leak fixes This renames git_vector_free_all to the better git_vector_free_deep and also contains a couple of memory leak fixes based on valgrind checks. The fixes are specifically: failure to free global dir path variables when not compiled with threading on and failure to free filters from the filter registry that had not be initialized fully.
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.
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.
373cf6a9	2013-12-09T10:17:47	Update docs for new callback return value behavior
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.
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.
9f77b3f6	2013-11-25T14:21:34	Add config read fns with controlled error behavior This adds `git_config__lookup_entry` which will look up a key in a config and return either the entry or NULL if the key was not present. Optionally, it can either suppress all errors or can return them (although not finding the key is not an error for this function). Unlike other accessors, this does not normalize the config key string, so it must only be used when the key is known to be in normalized form (i.e. all lower-case before the first dot and after the last dot, with no invalid characters). This also adds three high-level helper functions to look up config values with no errors and a fallback value. The three functions are for string, bool, and int values, and will resort to the fallback value for any error that arises. They are: * `git_config__get_string_force` * `git_config__get_bool_force` * `git_config__get_int_force` None of them normalize the config `key` either, so they can only be used for internal cases where the key is known to be in normal format.
0db93225	2013-12-09T10:43:05	Fix GIT_MERGE_OPTS_INIT on MSVC.
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.

2ab6d2cd

2014-03-06T16:08:17

Revert pull request #1997

4d116c34

2014-03-06T16:08:12

Merge pull request #1997 from mgbowen/merge-options-init-fix Fix GIT_MERGE_OPTS_INIT on MSVC.

b9f81997

2014-03-05T21:49:23

Added function-based initializers for every options struct. The basic structure of each function is courtesy of arrbee.

13f7ecd7

2014-03-04T16:23:28

Add git_object_short_id API to get short id string This finds a short id string that will unambiguously select the given object, starting with the core.abbrev length (usually 7) and growing until it is no longer ambiguous.

f5753999

2014-03-04T15:34:23

Add exists_prefix to ODB backend and ODB API

96484ecd

2014-03-03T12:59:35

Fix the description for `GIT_FEATURE_SSH`.

ebb3c506

2014-03-03T12:40:25

features: Rename `_HAS_` to `_FEATURE_`

2491c416

2014-03-03T12:13:17

caps: Rename the enum name too!

c9f5298b

2014-03-03T12:09:17

caps: Rename to features to avoid confusion

6789b7a7

2014-02-27T14:13:22

Add buffer to buffer diff and patch APIs This adds `git_diff_buffers` and `git_patch_from_buffers`. This also includes a bunch of internal refactoring to increase the shared code between these functions and the blob-to-blob and blob-to-buffer APIs, as well as some higher level assert helpers in the tests to also remove redundancy.

1574d388

2014-02-26T16:58:20

Merge pull request #2137 from jru/blame-first-parent Blame first-parent history

899bd19a

2014-02-24T21:20:57

Document enumerator and rewording

c7c83394

2014-02-21T00:22:07

Add option to limit blame to first parent

c254e2b6

2014-02-21T08:55:30

Improve documentation for merging

72556cc6

2014-02-20T14:27:10

Address PR comments * Make GIT_INLINE an internal definition so it cannot be used in public headers * Fix language in CONTRIBUTING * Make index caps API use signed instead of unsigned values

978a4ed5

2014-02-20T11:00:31

Make git_oid_equal a non-inline API

15284a2c

2014-02-10T14:52:28

refs: move current_id before the reflog parameters Keep the reflog parameters as the last two, as they're the optional parameters.

77ad6754

2014-02-10T14:38:01

refs: conditional wording fixups This addresses arrbee's concerns about wording in the conditional reference udpate functions.

80c29fe9

2014-01-17T10:45:11

Add git_commit_amend API This adds an API to amend an existing commit, basically a shorthand for creating a new commit filling in missing parameters from the values of an existing commit. As part of this, I also added a new "sys" API to create a commit using a callback to get the parents. This allowed me to rewrite all the other commit creation APIs so that temporary allocations are no longer needed.

2d929194

2014-02-07T16:14:17

Merge pull request #2099 from libgit2/bs/more-reflog-stuff More reflogness

57c47af1

2014-02-07T16:05:19

Merge pull request #2042 from libgit2/cmn/conditional-ref refs: conditional ref updates

db55bb73

2014-02-06T11:18:10

Correct default reflog message for git_remote_fetch

2bfc6739

2014-02-06T10:39:57

Fix terrible indentation

0de2c4e3

2014-02-05T13:15:57

Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuff

df70de07

2014-02-05T10:25:50

Merge pull request #2094 from libgit2/cmn/push-non-commit Add flexibility to the revwalk API

d6006413

2014-01-30T17:24:46

docs: produce literal asterisks

d465e4e9

2014-02-01T15:19:13

revwalk: ignore wrong object type in glob pushes Pushing a whole namespace can cause us to attempt to push non-committish objects. Catch this situation and special-case it for ignoring this.

f61272e0

2014-02-01T12:51:36

revwalk: accept committish objects Let the user push committish objects and peel them to figure out which commit to push to our queue. This is for convenience and for allowing uses of git_revwalk_push_glob(w, "tags") with annotated tags.

5367ec4b

2014-02-05T12:02:52

refs: add an unconditional delete Add it under the git_reference_remove() name, letting the user pass the repo and name, analogous to unconditional setting/creation.

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.

7ee8c7e6

2014-02-05T11:07:34

refs: placeholder conditional delete We don't actually pass the old value yet.

878fb66f

2014-02-05T10:19:17

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

91123661

2014-02-04T22:04:00

refdb: add conditional symbolic updates Add a parameter to the backend to allow checking for the old symbolic target.

fc4728e3

2014-01-29T14:07:18

refs: return GIT_EMODIFIED if the ref target moved In case we loose the race to update the reference, return GIT_EMODIFIED to let the user distinguish it from other types of errors.

5d96fe88

2014-01-14T15:33:29

refs: changes from feedback Change the name to _matching() intead of _if(), and force _set_target() to be a conditional update. If the user doesn't care about the old value, they should use git_reference_create().

9b148098

2013-12-18T19:58:16

refs: conditional ref updates Allow updating references if the old value matches the given one.

010cec3a

2014-02-04T20:50:40

Add reflog params to git_repository_detach_head

c3ab1e5a

2014-02-04T20:38:13

Add reflog parameters to remote apis Also added a test for git_remote_fetch.

491cecfe

2014-02-04T20:13:50

Add reflog parameters to git_push_update_tips

586be3b8

2014-02-03T15:05:55

Add reflog parameters to git_reset

50ad7cc2

2014-02-02T18:20:06

Add `git_reference_is_note`.

a1b07dca

2014-01-29T09:57:20

Document branch-creation reflog better

ccf6ce5c

2014-01-28T11:30:36

Ensure renaming a reference updates the reflog

540c1809

2014-01-28T10:44:33

Add reflog parameters to git_branch_move

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

94f263f5

2014-01-25T08:04:49

Add reflog params to set-head calls

e9d5e5f3

2014-01-28T16:25:42

Some fixes for Windows x64 warnings

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

5572d2b8

2014-01-28T11:44:17

Some missing oid to id renames

e7c16943

2014-01-28T19:39:14

Add `git_graph_descendant_of`.

93954245

2014-01-27T09:39:36

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

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.

ee550477

2014-01-26T16:11:18

config: use git_buf for returning paths Again, we already did this internally, so simply remove the conversions.

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.

11f6ad5f

2014-01-15T21:15:34

Add some missing const declarations.

a1bbc0ce

2014-01-25T04:14:37

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

86bfc3e1

2014-01-24T20:30:10

diff: change id abbrev option's name to id_abbrev Same as the other commits in the series, we use 'id' when talking about thing rather than the datatype.

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.

f000ee4e

2014-01-24T18:23:46

tree: remove legacy 'oid' naming Rename git_tree_entry_byoid() to _byid() as per the convention.

47e28349

2014-01-24T12:01:34

commit: remvoe legacy 'oid' naming

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.

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.

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.

450e8e9e

2014-01-22T13:22:15

Expose patch serialization to git_buf Returning library-allocated strings from libgit2 works fine on Linux, but may cause problems on Windows because there is no one C Runtime that everything links against. With libgit2 not exposing its own allocator, freeing the string is a gamble. git_patch_to_str already serializes to a buffer, then returns the underlying memory. Expose the functionality directly, so callers can use the git_buf_free function to free the memory later.

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.

e651e8e2

2014-01-19T15:05:08

Introduce diff3 mode for checking out conflicts

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.

3f033c55

2014-01-16T21:53:25

Revert a wrong doc change.

3f0e3e16

2014-01-16T21:42:28

Fix some documentation issues.

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.

529f342a

2014-01-14T21:33:59

Align git_tree_entry_dup.

29be3a6d

2014-01-14T21:33:35

Align git_signature_dup. This changes git_signature_dup to actually honor oom conditions raised by the call to git__strdup. It also aligns it with the error code return pattern used everywhere else.

40ef47dd

2014-01-14T21:03:01

Add `git_remote_dup`.

6adcaab7

2014-01-08T10:07:30

Handle git_buf's from users more liberally

e7f89b46

2014-01-04T18:18:59

Fix spelling mistake Closes #2029

ac9f9231

2014-01-03T14:40:25

Merge pull request #2022 from KTXSoftware/development submodule branch option + little VS2013 fix

91524172

2014-01-02T14:30:24

Fix warnings with submodule changes

10311979

2014-01-02T03:14:03

Read the submodule branch option from Git 1.8.2.

fccadba2

2013-12-29T10:26:21

Accept 'submodule.*.fetchRecurseSubmodules' config 'on-demand' value

4e1f517c

2013-12-18T09:33:45

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

81a2012d

2013-12-12T11:30:50

Overwrite ignored files on checkout

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.

9cfce273

2013-12-12T12:11:38

Cleanups, renames, and leak fixes This renames git_vector_free_all to the better git_vector_free_deep and also contains a couple of memory leak fixes based on valgrind checks. The fixes are specifically: failure to free global dir path variables when not compiled with threading on and failure to free filters from the filter registry that had not be initialized fully.

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.

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.

373cf6a9

2013-12-09T10:17:47

Update docs for new callback return value behavior

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.

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.

9f77b3f6

2013-11-25T14:21:34

Add config read fns with controlled error behavior This adds `git_config__lookup_entry` which will look up a key in a config and return either the entry or NULL if the key was not present. Optionally, it can either suppress all errors or can return them (although not finding the key is not an error for this function). Unlike other accessors, this does not normalize the config key string, so it must only be used when the key is known to be in normalized form (i.e. all lower-case before the first dot and after the last dot, with no invalid characters). This also adds three high-level helper functions to look up config values with no errors and a fallback value. The three functions are for string, bool, and int values, and will resort to the fallback value for any error that arises. They are: * `git_config__get_string_force` * `git_config__get_bool_force` * `git_config__get_int_force` None of them normalize the config `key` either, so they can only be used for internal cases where the key is known to be in normal format.

0db93225

2013-12-09T10:43:05

Fix GIT_MERGE_OPTS_INIT on MSVC.

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.

thodg/libgit2/include/git2

include/git2

Log