kmx git

Commit	Date	Message
8529ac9b	2018-04-17T23:38:46	Merge pull request #4524 from pks-t/pks/worktree-refs worktree: add ability to create worktree with pre-existing branch
0eca4230	2018-04-06T10:03:09	Merge pull request #4597 from cjhoward92/fix/cert-check-docs remote/proxy: fix git_transport_certificate_check_db description
a57f42ac	2018-04-06T09:40:34	Merge pull request #4587 from rcjsuen/patch-2 Flag options in describe.h as being optional
370ecdb2	2018-03-27T10:10:09	types: remove unused git_merge_result `git_merge_result` is currently unused in the codebase and generates a blank page in the [documentation](https://libgit2.github.com/libgit2/#HEAD/type/git_merge_result).
e6c720ea	2018-03-27T10:05:21	remote/proxy: fix git_transport_certificate_check_db comment
db90e951	2018-03-27T20:09:45	Flag options in describe.h as being optional The git_describe_options in git_describe_commit and git_describe_workdir and the git_describe_format_options in git_describe_format are optional and can be NULL. State this in the documentation to make people's lives easier when calling these functions. Signed-off-by: Remy Suen <remy.suen@gmail.com>
cdd0bc2f	2018-03-26T18:44:13	checkout: change default strategy to SAFE As per #4200, our default is quite surprising to users that expect checkout to just "do the thing".
937e7e26	2018-03-13T13:04:38	Merge pull request #4544 from josharian/docs pathspec: improve git_pathspec_flag_t doc rendering
358cc2e2	2018-03-12T09:50:00	Merge pull request #4396 from libgit2/cmn/config-regex-is-normalised config: specify how we match the regular expressions
2f89bd90	2018-03-11T12:36:13	config: explicitly state that subsections are case-sensitive
5f6383ca	2018-03-08T08:17:29	diff: ensure an unsigned number is shifted
12356076	2018-03-02T12:41:04	worktree: lock reason should be const
b72717b0	2018-02-23T08:19:49	pathspec: improve git_pathspec_flag_t doc rendering By placing docs per enum value rather than in a large block, the automated doc generation tool can make nicer docs, as could other automated tools, such as the mooted https://github.com/libgit2/git2go/issues/427. The current rendering is somewhat ugly: https://libgit2.github.com/libgit2/#HEAD/type/git_pathspec_flag_t No textual changes, just reorganization.
23d4a91b	2018-02-16T08:38:44	Update version number to v0.27
a22f19e6	2018-02-09T10:38:11	worktree: add ability to create worktree with pre-existing branch Currently, we always create a new branch after the new worktree's name when creating a worktree. In some workflows, though, the caller may want to check out an already existing reference instead of creating a new one, which is impossible to do right now. Add a new option `ref` to the options structure for adding worktrees. In case it is set, a branch and not already checked out by another worktree, we will re-use this reference instead of creating a new one.
97f9a5f0	2017-12-17T01:12:49	odb: provide length and type with streaming read The streaming read functionality should provide the length and the type of the object, like the normal read functionality does.
9d8510b3	2018-01-31T09:28:43	Merge pull request #4488 from libgit2/ethomson/conflict_marker_size Use longer conflict markers in recursive merge base
d23ce187	2018-01-22T11:55:28	odb: export mempack backend Fixes #4492, #4496.
b8e9467a	2018-01-20T19:39:34	merge: allow custom conflict marker size Allow for a custom conflict marker size, allowing callers to override the default size of the "<<<<<<<" and ">>>>>>>" markers in the conflicted output file.
dcb668ba	2018-01-19T01:11:37	message: update docs for git_message_prettify We used to hard-code the octothorpe as the comment character and the documentation still mentions this even though we accept the comment character as a parameter. Update the line to indicate this and clean up the first paragraph a bit.
4893a9c0	2018-01-17T13:54:42	Merge pull request #4451 from libgit2/charliesome/trailer-info Implement message trailer parsing API
3e5239e4	2018-01-16T23:55:46	update code docs
d43974fb	2018-01-16T13:40:26	Change trailer API to return a simple array
5963292f	2018-01-12T13:03:19	refs: document need to free refs in foreach-callback References passed to the callback function of `git_reference_foreach` are expected to be owned by the callback. As such, they are never being freed by `git_reference_foreach`, but will have to be freed by the caller. This small detail is never mentioned in the function's documentation, though, making it easy to get wrong. Document this to make it discoverable.
5734768b	2018-01-10T19:19:34	Merge remote-tracking branch 'origin/master' into charliesome/trailer-info
fb29ba09	2018-01-03T18:32:09	remove empty lines between @-lines
e8bc8558	2018-01-02T13:29:49	Merge remote-tracking branch 'origin/master' into charliesome/trailer-info
346c1b16	2017-12-31T09:25:42	docs: git_treebuilder_insert validates entries The documentation for `git_treebuilder_insert` erroneously states that we do not validate that the entry being inserted exists. We do, as of https://github.com/libgit2/libgit2/pull/3633. Update the documentation to reflect the new reality.
d6210245	2017-12-30T13:09:43	Merge pull request #4159 from richardipsum/notes-commit Support using notes via a commit rather than a ref
1c43edca	2017-12-14T18:37:10	message: add routine for parsing trailers from messages This is implemented in trailer.c and borrows a large amount of logic from Git core to ensure compatibility.
429bb357	2017-12-01T11:45:53	Merge pull request #4318 from Uncommon/amend_status Add git_status_file_at
4ccacdc8	2017-07-21T17:07:10	status: Add a baseline field to git_status_options for comparing to trees other than HEAD
d439fb20	2017-11-25T15:48:03	Include git2/worktree.h in git2.h I'm not sure if worktree.h was intentionally left out of git2.h. Looks like an oversight since it is in fact documented.
7e3faf58	2017-10-29T15:05:28	diff: expose the "indent heuristic" in the diff options We default to off, but we might want to consider changing `GIT_DIFF_NORMAL` to include it.
158a42a5	2017-11-04T15:28:35	config: specify how we match the regular expressions We do it the same as git does: case-sensitively on the normalized form of the variable name. While here also specify that we're case-sensitive on the values when handling the values when setting or deleting multivars.
f063dafb	2017-11-12T10:56:50	signature: distinguish +0000 and -0000 UTC offsets Git considers '-0000' a valid offset for signature lines. They need to be treated as _not_ equal to a '+0000' signature offset. Parsing a signature line stores the offset in a signed integer which does not distinguish between `+0` and `-0`. This patch adds an additional flag `sign` to the `git_time` in the `signature` object which is populated with the sign of the offset. In addition to exposing this information to the user, this information is also used to compare signatures. /cc @pks-t @ethomson
38169764	2017-11-10T16:19:39	describe.h: fix spelling in comments optios -> options
529e873c	2017-05-23T11:51:00	config: pass repository when opening config files Our current configuration logic is completely oblivious of any repository, but only cares for actual file paths. Unfortunately, we are forced to break this assumption by the introduction of conditional includes, which are evaluated in the context of a repository. Right now, only one conditional exists with "gitdir:" -- it will only include the configuration if the current repository's git directory matches the value passed to "gitdir:". To support these conditionals, we have to break our API and make the repository available when opening a configuration file. This commit extends the `open` call of configuration backends to include another repository and adjusts existing code to have it available. This includes the user-visible functions `git_config_add_file_ondisk` and `git_config_add_backend`.
d02cf564	2017-05-23T12:56:41	repository: constify several repo parameters for getters Several functions to retrieve variables from a repository only return immutable values, which allows us to actually constify the passed-in repository parameter. Do so to help a later patch, which will only have access to a constant repository.
60bee89d	2017-03-19T18:34:07	notes: Add git_note_commit_iterator_new This also adds tests for this function.
9a02725d	2017-03-15T18:17:42	notes: Add git_note_commit_remove This also adds tests for this function.
7096bf1e	2017-03-15T11:54:45	notes: Add git_note_commit_read This also adds tests for this function.
a46e743d	2017-09-23T17:46:46	notes: Add git_note_commit_create This adds a new function that will allow creation of notes without necessarily updating a particular ref, the notes tree is obtained from the git_commit object parameter, a new commit object pointing to the current tip of the notes tree is optionally returned via the 'note_commit_out' parameter, optionally the blob id for the note is returned through the 'note_blob_out' object.
7138ce37	2017-10-06T07:16:26	remote: add typedef to normalize push_update_reference callback Very many callbacks in libgit2 have some sort of typedef to normalize the name at git_<name_of_operation>_cb. Add a typedef for push_update_references in the remote so the name follows the same conventions.
56ac6c0a	2017-09-30T17:23:11	graph: document that a commit isn't a descendant of itself
2a3cfc23	2017-08-11T17:15:51	Docs: Fix inline comments for git_diff_hunk
a9d6b9d5	2017-07-31T01:20:21	Merge pull request #4304 from pks-t/pks/patch-buffers patch_generate: represent buffers as void pointers
dca8c44f	2017-07-31T01:17:24	Merge pull request #4323 from libgit2/ethomson/remove_sys_remote_h Remove unused 'sys/remote.h' header
fb585d01	2017-07-31T00:58:58	Merge branch '4233'
37841317	2017-07-31T00:38:28	Remove unused 'sys/remote.h' header
a94a5402	2017-07-19T13:28:32	Merge pull request #4272 from pks-t/pks/patch-id Patch ID calculation
9093ced6	2017-07-10T11:42:26	patch_generate: represent buffers as void pointers Pointers to general data should usually be used as a void pointer such that it is possible to hand in variables of a different pointer type without the need to cast. This is the same when creating patches from buffers, where the buffers may contain arbitrary data. Instead of requiring the caller to care whether his buffer is e.g. `char ` or `unsigned char `, we should instead just accept a `void *`. This is also consistent in how we tread other types like for example `git_blob`, which also just has a void pointer as its raw contents.
d4e03be6	2017-06-30T11:21:18	git_reset_*: pass parameters as const pointers
89a34828	2017-06-16T13:34:43	diff: implement function to calculate patch ID The upstream git project provides the ability to calculate a so-called patch ID. Quoting from git-patch-id(1): A "patch ID" is nothing but a sum of SHA-1 of the file diffs associated with a patch, with whitespace and line numbers ignored." Patch IDs can be used to identify two patches which are probably the same thing, e.g. when a patch has been cherry-picked to another branch. This commit implements a new function `git_diff_patchid`, which gets a patch and derives an OID from the diff. Note the different terminology here: a patch in libgit2 are the differences in a single file and a diff can contain multiple patches for different files. The implementation matches the upstream implementation and should derive the same OID for the same diff. In fact, some code has been directly derived from the upstream implementation. The upstream implementation has two different modes to calculate patch IDs, which is the stable and unstable mode. The old way of calculating the patch IDs was unstable in a sense that a different ordering the diffs was leading to different results. This oversight was fixed in git 1.9, but as git tries hard to never break existing workflows, the old and unstable way is still default. The newer and stable way does not care for ordering of the diff hunks, and in fact it is the mode that should probably be used today. So right now, we only implement the stable way of generating the patch ID.
a78441bc	2017-06-13T11:05:40	Adding git_filter_init for initializing `git_filter` struct + unit test
7f7dabda	2017-06-12T13:40:47	adding GIT_FILTER_VERSION to GIT_FILTER_INIT as part of convention
9d49a43c	2017-06-12T12:01:10	repository_item_path: return ENOTFOUND when appropriate Disambiguate error values: return `GIT_ENOTFOUND` when the item cannot exist in the repository (perhaps because the repository is inmemory or otherwise not backed by a filesystem), return `-1` when there is a hard failure.
2a3cc403	2017-06-11T12:23:34	Update version number to v0.26
6c23704d	2017-06-08T21:40:18	settings: rename `GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION` Initially, the setting has been solely used to enable the use of `fsync()` when creating objects. Since then, the use has been extended to also cover references and index files. As the option is not yet part of any release, we can still correct this by renaming the option to something more sensible, indicating not only correlation to objects. This commit renames the option to `GIT_OPT_ENABLE_FSYNC_GITDIR`. We also move the variable from the object to repository source code.
dd0aa811	2017-06-04T22:46:07	Merge branch 'pr/4228'
f0848dd7	2017-06-04T22:44:30	worktree: upgrade lock to an int
883eeb5f	2017-05-02T12:35:59	worktree: switch over worktree pruning to an opts structure The current signature of `git_worktree_prune` accepts a flags field to alter its behavior. This is not as flexible as we'd like it to be when we want to enable passing additional options in the future. As the function has not been part of any release yet, we are still free to alter its current signature. This commit does so by using our usual pattern of an options structure, which is easily extendable without breaking the API.
8264a30f	2017-05-02T10:11:28	worktree: support creating locked worktrees When creating a new worktree, we do have a potential race with us creating the worktree and another process trying to delete the same worktree as it is being created. As such, the upstream git project has introduced a flag `git worktree add --locked`, which will cause the newly created worktree to be locked immediately after its creation. This mitigates the race condition. We want to be able to mirror the same behavior. As such, a new flag `locked` is added to the options structure of `git_worktree_add` which allows the user to enable this behavior.
4bc16c37	2016-07-08T01:37:22	remote: add function to create detached remotes Right now it is only possible to create remotes from a repository. While this is probably the most common use-case, there are commands which make sense even without a repository, e.g. the equivalence of `git ls-remote`. Add a new function `git_remote_create_detached`, which simply accepts a URL.
a7aa73a5	2017-05-02T10:02:36	worktree: introduce git_worktree_add options The `git_worktree_add` function currently accepts only a path and name for the new work tree. As we may want to expand these parameters in future versions without adding additional parameters to the function for every option, this commit introduces our typical pattern of an options struct. Right now, this structure is still empty, which will change with the next commit.
13c1bf07	2017-05-01T16:17:48	Merge pull request #4197 from pks-t/pks/verify-object-hashes Verify object hashes
d8702843	2017-05-01T16:11:56	Merge pull request #4206 from libgit2/cmn/transport-get-proxy transport: provide a getter for the proxy options
45071cec	2017-05-01T15:23:27	git_remote_push: document that NULL refspecs allowed
35079f50	2017-04-21T07:31:56	odb: add option to turn off hash verification Verifying hashsums of objects we are reading from the ODB may be costly as we have to perform an additional hashsum calculation on the object. Especially when reading large objects, the penalty can be as high as 35%, as can be seen when executing the equivalent of `git cat-file` with and without verification enabled. To mitigate for this, we add a global option for libgit2 which enables the developer to turn off the verification, e.g. when he can be reasonably sure that the objects on disk won't be corrupted.
28a0741f	2017-04-10T09:30:08	odb: verify object hashes The upstream git.git project verifies objects when looking them up from disk. This avoids scenarios where objects have somehow become corrupt on disk, e.g. due to hardware failures or bit flips. While our mantra is usually to follow upstream behavior, we do not do so in this case, as we never check hashes of objects we have just read from disk. To fix this, we create a new error class `GIT_EMISMATCH` which denotes that we have looked up an object with a hashsum mismatch. `odb_read_1` will then, after having read the object from its backend, hash the object and compare the resulting hash to the expected hash. If hashes do not match, it will return an error. This obviously introduces another computation of checksums and could potentially impact performance. Note though that we usually perform I/O operations directly before doing this computation, and as such the actual overhead should be drowned out by I/O. Running our test suite seems to confirm this guess. On a Linux system with best-of-five timings, we had 21.592s with the check enabled and 21.590s with the ckeck disabled. Note though that our test suite mostly contains very small blobs only. It is expected that repositories with bigger blobs may notice an increased hit by this check. In addition to a new test, we also had to change the odb::backend::nonrefreshing test suite, which now triggers a hashsum mismatch when looking up the commit "deadbeef...". This is expected, as the fake backend allocated inside of the test will return an empty object for the OID "deadbeef...", which will obviously not hash back to "deadbeef..." again. We can simply adjust the hash to equal the hash of the empty object here to fix this test.
f4d1592c	2017-04-21T07:09:59	global: fix typo in `git_libgit2_init` description
8d89e409	2017-04-17T17:19:03	Merge pull request #4192 from libgit2/ethomson/win32_posix Refactor some of the win32 POSIX emulation
5c760960	2017-04-17T13:03:03	transport: provide a getter for the proxy options As with the callbacks, third-party implementations of smart subtransports cannot reach into the opaque struct and thus cannot know what options the user set. Add a getter for these options to copy the proxy options into something external implementors can use.
d5e6ca1e	2017-01-14T18:39:32	Allow to configure default file share mode for opening files This can prevent FILE_SHARED_VIOLATIONS when used in tools such as TortoiseGit TGitCache and FILE_SHARE_DELETE, because files can be opened w/o being locked any more. Signed-off-by: Sven Strickroth <email@cs-ware.de>
a12796dd	2017-04-02T23:05:48	Correct typos that reference a non-existing file There are references to odb_backends.h when the file is actually named odb_backend.h and in the sys folder.
cc8d9a29	2017-04-01T10:44:17	win32: introduce `do_with_retries` macro Provide a macro that will allow us to run a function with posix-like return values multiple times in a retry loop, with an optional cleanup function called between invocations.
f623cf89	2017-03-22T20:32:55	Merge pull request #4163 from pks-t/pks/submodules-with-worktrees Worktree fixes
6fd6c678	2017-03-22T20:29:22	Merge pull request #4030 from libgit2/ethomson/fsync fsync all the things
84b4e573	2017-03-22T06:08:24	Use proper documentation tags git_cred_acquire_cb isn't using the standard @param and @return tags. This is causing the generated documentation to not be formatted properly.
12b7394c	2017-03-20T22:30:37	Fix typo in remote.h API
3017ba94	2017-03-15T14:24:25	worktree: implement `git_worktree_open_from_repository` While we already provide functionality to look up a worktree from a repository, we cannot do so the other way round. That is given a repository, we want to look up its worktree if it actually exists. Getting the worktree of a repository is useful when we want to get certain meta information like the parent's location, getting the locked status, etc.
bb342159	2017-03-15T11:46:15	merge_driver: fix const-correctness for source getters
2dfd1294	2017-02-24T13:34:01	hash: include sha1collisiondetection Include the SHA1 collision attack detection library from https://github.com/cr-marcstevens/sha1collisiondetection
2a5ad7d0	2017-02-17T16:42:40	fsync: call it "synchronous" object writing Rename `GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION` -> `GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION`.
6d3ad7e0	2016-12-13T10:58:43	Add `ENABLE_SYNCHRONIZED_OBJECT_CREATION` option Allow users to enable `SYNCHRONIZED_OBJECT_CREATION` with a setting.
fc27fe21	2016-12-13T10:35:05	odb_loose: actually honor the fsync option We've had an fsync option for a long time, but it was "ignored". Stop ignoring it.
19874e29	2017-02-16T08:40:49	Minor comment fix
a59545de	2017-02-13T14:38:12	Merge pull request #4122 from pks-t/pks/signature-dbl-free Signature cleanups
dc851d9e	2017-02-13T13:42:16	commit: clear user-provided buffers The functions `git_commit_header_field` and `git_commit_extract_signature` both receive buffers used to hand back the results to the user. While these functions called `git_buf_sanitize` on these buffers, this is not the right thing to do, as it will simply initialize or zero-terminate passed buffers. As we want to overwrite contents, we instead have to call `git_buf_clear` to completely reset them.
c576d4ff	2017-02-13T12:46:00	Merge pull request #4115 from gsaralms/users/gsaral/optionalOfsDelta Changes to provide option to turn off/on ofs_delta
1ba242c9	2017-02-03T13:52:23	worktree: extract git_worktree_is_prunable
e3acd37b	2015-11-06T12:08:15	branch: implement `git_branch_is_checked_out` Implement a new function that is able to determine if a branch is checked out in any repository connected to the current repository. In particular, this is required to check if for a given repository and branch, there exists any working tree connected to that repository that is referencing this branch.
04fb12ab	2015-10-27T12:37:51	worktree: implement functions reading HEAD Implement `git_repository_head_for_worktree` and `git_repository_head_detached_for_worktree` for directly accessing a worktree's HEAD without opening it as a `git_repository` first.
f0cfc341	2015-10-21T13:53:18	worktree: implement `git_worktree_prune` Implement the `git_worktree_prune` function. This function can be used to delete working trees from a repository. According to the flags passed to it, it can either delete the working tree's gitdir only or both gitdir and the working directory.
2a503485	2015-10-21T16:03:04	worktree: implement locking mechanisms Working trees support locking by creating a file `locked` inside the tree's gitdir with an optional reason inside. Support this feature by adding functions to get and set the locking status.
dea7488e	2015-10-23T14:11:44	worktree: implement `git_worktree_add` Implement the `git_worktree_add` function which can be used to create new working trees for a given repository.
372dc9ff	2015-10-21T13:49:55	worktree: implement `git_worktree_validate` Add a new function that checks wether a given `struct git_worktree` is valid. The validation includes checking if the gitdir, parent directory and common directory are present.
8c8d726e	2015-10-21T12:10:30	worktree: implement `git_repository_open_from_worktree` Add function `git_repository_open_from_worktree`, which allows to open a `git_worktree` as repository.
cb3269c9	2016-11-11T13:46:59	repository: add function to retrieve paths for repo items
d3bc09e8	2015-10-21T12:02:31	worktree: introduce `struct git_worktree` Introduce a new `struct git_worktree`, which holds information about a possible working tree connected to a repository. Introduce functions to allow opening working trees for a repository.

8529ac9b

2018-04-17T23:38:46

Merge pull request #4524 from pks-t/pks/worktree-refs worktree: add ability to create worktree with pre-existing branch

0eca4230

2018-04-06T10:03:09

Merge pull request #4597 from cjhoward92/fix/cert-check-docs remote/proxy: fix git_transport_certificate_check_db description

a57f42ac

2018-04-06T09:40:34

Merge pull request #4587 from rcjsuen/patch-2 Flag options in describe.h as being optional

370ecdb2

2018-03-27T10:10:09

types: remove unused git_merge_result `git_merge_result` is currently unused in the codebase and generates a blank page in the [documentation](https://libgit2.github.com/libgit2/#HEAD/type/git_merge_result).

e6c720ea

2018-03-27T10:05:21

remote/proxy: fix git_transport_certificate_check_db comment

db90e951

2018-03-27T20:09:45

Flag options in describe.h as being optional The git_describe_options in git_describe_commit and git_describe_workdir and the git_describe_format_options in git_describe_format are optional and can be NULL. State this in the documentation to make people's lives easier when calling these functions. Signed-off-by: Remy Suen <remy.suen@gmail.com>

cdd0bc2f

2018-03-26T18:44:13

checkout: change default strategy to SAFE As per #4200, our default is quite surprising to users that expect checkout to just "do the thing".

937e7e26

2018-03-13T13:04:38

Merge pull request #4544 from josharian/docs pathspec: improve git_pathspec_flag_t doc rendering

358cc2e2

2018-03-12T09:50:00

Merge pull request #4396 from libgit2/cmn/config-regex-is-normalised config: specify how we match the regular expressions

2f89bd90

2018-03-11T12:36:13

config: explicitly state that subsections are case-sensitive

5f6383ca

2018-03-08T08:17:29

diff: ensure an unsigned number is shifted

12356076

2018-03-02T12:41:04

worktree: lock reason should be const

b72717b0

2018-02-23T08:19:49

pathspec: improve git_pathspec_flag_t doc rendering By placing docs per enum value rather than in a large block, the automated doc generation tool can make nicer docs, as could other automated tools, such as the mooted https://github.com/libgit2/git2go/issues/427. The current rendering is somewhat ugly: https://libgit2.github.com/libgit2/#HEAD/type/git_pathspec_flag_t No textual changes, just reorganization.

23d4a91b

2018-02-16T08:38:44

Update version number to v0.27

a22f19e6

2018-02-09T10:38:11

worktree: add ability to create worktree with pre-existing branch Currently, we always create a new branch after the new worktree's name when creating a worktree. In some workflows, though, the caller may want to check out an already existing reference instead of creating a new one, which is impossible to do right now. Add a new option `ref` to the options structure for adding worktrees. In case it is set, a branch and not already checked out by another worktree, we will re-use this reference instead of creating a new one.

97f9a5f0

2017-12-17T01:12:49

odb: provide length and type with streaming read The streaming read functionality should provide the length and the type of the object, like the normal read functionality does.

9d8510b3

2018-01-31T09:28:43

Merge pull request #4488 from libgit2/ethomson/conflict_marker_size Use longer conflict markers in recursive merge base

d23ce187

2018-01-22T11:55:28

odb: export mempack backend Fixes #4492, #4496.

b8e9467a

2018-01-20T19:39:34

merge: allow custom conflict marker size Allow for a custom conflict marker size, allowing callers to override the default size of the "<<<<<<<" and ">>>>>>>" markers in the conflicted output file.

dcb668ba

2018-01-19T01:11:37

message: update docs for git_message_prettify We used to hard-code the octothorpe as the comment character and the documentation still mentions this even though we accept the comment character as a parameter. Update the line to indicate this and clean up the first paragraph a bit.

4893a9c0

2018-01-17T13:54:42

Merge pull request #4451 from libgit2/charliesome/trailer-info Implement message trailer parsing API

3e5239e4

2018-01-16T23:55:46

update code docs

d43974fb

2018-01-16T13:40:26

Change trailer API to return a simple array

5963292f

2018-01-12T13:03:19

refs: document need to free refs in foreach-callback References passed to the callback function of `git_reference_foreach` are expected to be owned by the callback. As such, they are never being freed by `git_reference_foreach`, but will have to be freed by the caller. This small detail is never mentioned in the function's documentation, though, making it easy to get wrong. Document this to make it discoverable.

5734768b

2018-01-10T19:19:34

Merge remote-tracking branch 'origin/master' into charliesome/trailer-info

fb29ba09

2018-01-03T18:32:09

remove empty lines between @-lines

e8bc8558

2018-01-02T13:29:49

Merge remote-tracking branch 'origin/master' into charliesome/trailer-info

346c1b16

2017-12-31T09:25:42

docs: git_treebuilder_insert validates entries The documentation for `git_treebuilder_insert` erroneously states that we do not validate that the entry being inserted exists. We do, as of https://github.com/libgit2/libgit2/pull/3633. Update the documentation to reflect the new reality.

d6210245

2017-12-30T13:09:43

Merge pull request #4159 from richardipsum/notes-commit Support using notes via a commit rather than a ref

1c43edca

2017-12-14T18:37:10

message: add routine for parsing trailers from messages This is implemented in trailer.c and borrows a large amount of logic from Git core to ensure compatibility.

429bb357

2017-12-01T11:45:53

Merge pull request #4318 from Uncommon/amend_status Add git_status_file_at

4ccacdc8

2017-07-21T17:07:10

status: Add a baseline field to git_status_options for comparing to trees other than HEAD

d439fb20

2017-11-25T15:48:03

Include git2/worktree.h in git2.h I'm not sure if worktree.h was intentionally left out of git2.h. Looks like an oversight since it is in fact documented.

7e3faf58

2017-10-29T15:05:28

diff: expose the "indent heuristic" in the diff options We default to off, but we might want to consider changing `GIT_DIFF_NORMAL` to include it.

158a42a5

2017-11-04T15:28:35

config: specify how we match the regular expressions We do it the same as git does: case-sensitively on the normalized form of the variable name. While here also specify that we're case-sensitive on the values when handling the values when setting or deleting multivars.

f063dafb

2017-11-12T10:56:50

signature: distinguish +0000 and -0000 UTC offsets Git considers '-0000' a valid offset for signature lines. They need to be treated as _not_ equal to a '+0000' signature offset. Parsing a signature line stores the offset in a signed integer which does not distinguish between `+0` and `-0`. This patch adds an additional flag `sign` to the `git_time` in the `signature` object which is populated with the sign of the offset. In addition to exposing this information to the user, this information is also used to compare signatures. /cc @pks-t @ethomson

38169764

2017-11-10T16:19:39

describe.h: fix spelling in comments optios -> options

529e873c

2017-05-23T11:51:00

config: pass repository when opening config files Our current configuration logic is completely oblivious of any repository, but only cares for actual file paths. Unfortunately, we are forced to break this assumption by the introduction of conditional includes, which are evaluated in the context of a repository. Right now, only one conditional exists with "gitdir:" -- it will only include the configuration if the current repository's git directory matches the value passed to "gitdir:". To support these conditionals, we have to break our API and make the repository available when opening a configuration file. This commit extends the `open` call of configuration backends to include another repository and adjusts existing code to have it available. This includes the user-visible functions `git_config_add_file_ondisk` and `git_config_add_backend`.

d02cf564

2017-05-23T12:56:41

repository: constify several repo parameters for getters Several functions to retrieve variables from a repository only return immutable values, which allows us to actually constify the passed-in repository parameter. Do so to help a later patch, which will only have access to a constant repository.

60bee89d

2017-03-19T18:34:07

notes: Add git_note_commit_iterator_new This also adds tests for this function.

9a02725d

2017-03-15T18:17:42

notes: Add git_note_commit_remove This also adds tests for this function.

7096bf1e

2017-03-15T11:54:45

notes: Add git_note_commit_read This also adds tests for this function.

a46e743d

2017-09-23T17:46:46

notes: Add git_note_commit_create This adds a new function that will allow creation of notes without necessarily updating a particular ref, the notes tree is obtained from the git_commit object parameter, a new commit object pointing to the current tip of the notes tree is optionally returned via the 'note_commit_out' parameter, optionally the blob id for the note is returned through the 'note_blob_out' object.

7138ce37

2017-10-06T07:16:26

remote: add typedef to normalize push_update_reference callback Very many callbacks in libgit2 have some sort of typedef to normalize the name at git_<name_of_operation>_cb. Add a typedef for push_update_references in the remote so the name follows the same conventions.

56ac6c0a

2017-09-30T17:23:11

graph: document that a commit isn't a descendant of itself

2a3cfc23

2017-08-11T17:15:51

Docs: Fix inline comments for git_diff_hunk

a9d6b9d5

2017-07-31T01:20:21

Merge pull request #4304 from pks-t/pks/patch-buffers patch_generate: represent buffers as void pointers

dca8c44f

2017-07-31T01:17:24

Merge pull request #4323 from libgit2/ethomson/remove_sys_remote_h Remove unused 'sys/remote.h' header

fb585d01

2017-07-31T00:58:58

Merge branch '4233'

37841317

2017-07-31T00:38:28

Remove unused 'sys/remote.h' header

a94a5402

2017-07-19T13:28:32

Merge pull request #4272 from pks-t/pks/patch-id Patch ID calculation

9093ced6

2017-07-10T11:42:26

patch_generate: represent buffers as void pointers Pointers to general data should usually be used as a void pointer such that it is possible to hand in variables of a different pointer type without the need to cast. This is the same when creating patches from buffers, where the buffers may contain arbitrary data. Instead of requiring the caller to care whether his buffer is e.g. `char *` or `unsigned char *`, we should instead just accept a `void *`. This is also consistent in how we tread other types like for example `git_blob`, which also just has a void pointer as its raw contents.

d4e03be6

2017-06-30T11:21:18

git_reset_*: pass parameters as const pointers

89a34828

2017-06-16T13:34:43

diff: implement function to calculate patch ID The upstream git project provides the ability to calculate a so-called patch ID. Quoting from git-patch-id(1): A "patch ID" is nothing but a sum of SHA-1 of the file diffs associated with a patch, with whitespace and line numbers ignored." Patch IDs can be used to identify two patches which are probably the same thing, e.g. when a patch has been cherry-picked to another branch. This commit implements a new function `git_diff_patchid`, which gets a patch and derives an OID from the diff. Note the different terminology here: a patch in libgit2 are the differences in a single file and a diff can contain multiple patches for different files. The implementation matches the upstream implementation and should derive the same OID for the same diff. In fact, some code has been directly derived from the upstream implementation. The upstream implementation has two different modes to calculate patch IDs, which is the stable and unstable mode. The old way of calculating the patch IDs was unstable in a sense that a different ordering the diffs was leading to different results. This oversight was fixed in git 1.9, but as git tries hard to never break existing workflows, the old and unstable way is still default. The newer and stable way does not care for ordering of the diff hunks, and in fact it is the mode that should probably be used today. So right now, we only implement the stable way of generating the patch ID.

a78441bc

2017-06-13T11:05:40

Adding git_filter_init for initializing `git_filter` struct + unit test

7f7dabda

2017-06-12T13:40:47

adding GIT_FILTER_VERSION to GIT_FILTER_INIT as part of convention

9d49a43c

2017-06-12T12:01:10

repository_item_path: return ENOTFOUND when appropriate Disambiguate error values: return `GIT_ENOTFOUND` when the item cannot exist in the repository (perhaps because the repository is inmemory or otherwise not backed by a filesystem), return `-1` when there is a hard failure.

2a3cc403

2017-06-11T12:23:34

Update version number to v0.26

6c23704d

2017-06-08T21:40:18

settings: rename `GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION` Initially, the setting has been solely used to enable the use of `fsync()` when creating objects. Since then, the use has been extended to also cover references and index files. As the option is not yet part of any release, we can still correct this by renaming the option to something more sensible, indicating not only correlation to objects. This commit renames the option to `GIT_OPT_ENABLE_FSYNC_GITDIR`. We also move the variable from the object to repository source code.

dd0aa811

2017-06-04T22:46:07

Merge branch 'pr/4228'

f0848dd7

2017-06-04T22:44:30

worktree: upgrade lock to an int

883eeb5f

2017-05-02T12:35:59

worktree: switch over worktree pruning to an opts structure The current signature of `git_worktree_prune` accepts a flags field to alter its behavior. This is not as flexible as we'd like it to be when we want to enable passing additional options in the future. As the function has not been part of any release yet, we are still free to alter its current signature. This commit does so by using our usual pattern of an options structure, which is easily extendable without breaking the API.

8264a30f

2017-05-02T10:11:28

worktree: support creating locked worktrees When creating a new worktree, we do have a potential race with us creating the worktree and another process trying to delete the same worktree as it is being created. As such, the upstream git project has introduced a flag `git worktree add --locked`, which will cause the newly created worktree to be locked immediately after its creation. This mitigates the race condition. We want to be able to mirror the same behavior. As such, a new flag `locked` is added to the options structure of `git_worktree_add` which allows the user to enable this behavior.

4bc16c37

2016-07-08T01:37:22

remote: add function to create detached remotes Right now it is only possible to create remotes from a repository. While this is probably the most common use-case, there are commands which make sense even without a repository, e.g. the equivalence of `git ls-remote`. Add a new function `git_remote_create_detached`, which simply accepts a URL.

a7aa73a5

2017-05-02T10:02:36

worktree: introduce git_worktree_add options The `git_worktree_add` function currently accepts only a path and name for the new work tree. As we may want to expand these parameters in future versions without adding additional parameters to the function for every option, this commit introduces our typical pattern of an options struct. Right now, this structure is still empty, which will change with the next commit.

13c1bf07

2017-05-01T16:17:48

Merge pull request #4197 from pks-t/pks/verify-object-hashes Verify object hashes

d8702843

2017-05-01T16:11:56

Merge pull request #4206 from libgit2/cmn/transport-get-proxy transport: provide a getter for the proxy options

45071cec

2017-05-01T15:23:27

git_remote_push: document that NULL refspecs allowed

35079f50

2017-04-21T07:31:56

odb: add option to turn off hash verification Verifying hashsums of objects we are reading from the ODB may be costly as we have to perform an additional hashsum calculation on the object. Especially when reading large objects, the penalty can be as high as 35%, as can be seen when executing the equivalent of `git cat-file` with and without verification enabled. To mitigate for this, we add a global option for libgit2 which enables the developer to turn off the verification, e.g. when he can be reasonably sure that the objects on disk won't be corrupted.

28a0741f

2017-04-10T09:30:08

odb: verify object hashes The upstream git.git project verifies objects when looking them up from disk. This avoids scenarios where objects have somehow become corrupt on disk, e.g. due to hardware failures or bit flips. While our mantra is usually to follow upstream behavior, we do not do so in this case, as we never check hashes of objects we have just read from disk. To fix this, we create a new error class `GIT_EMISMATCH` which denotes that we have looked up an object with a hashsum mismatch. `odb_read_1` will then, after having read the object from its backend, hash the object and compare the resulting hash to the expected hash. If hashes do not match, it will return an error. This obviously introduces another computation of checksums and could potentially impact performance. Note though that we usually perform I/O operations directly before doing this computation, and as such the actual overhead should be drowned out by I/O. Running our test suite seems to confirm this guess. On a Linux system with best-of-five timings, we had 21.592s with the check enabled and 21.590s with the ckeck disabled. Note though that our test suite mostly contains very small blobs only. It is expected that repositories with bigger blobs may notice an increased hit by this check. In addition to a new test, we also had to change the odb::backend::nonrefreshing test suite, which now triggers a hashsum mismatch when looking up the commit "deadbeef...". This is expected, as the fake backend allocated inside of the test will return an empty object for the OID "deadbeef...", which will obviously not hash back to "deadbeef..." again. We can simply adjust the hash to equal the hash of the empty object here to fix this test.

f4d1592c

2017-04-21T07:09:59

global: fix typo in `git_libgit2_init` description

8d89e409

2017-04-17T17:19:03

Merge pull request #4192 from libgit2/ethomson/win32_posix Refactor some of the win32 POSIX emulation

5c760960

2017-04-17T13:03:03

transport: provide a getter for the proxy options As with the callbacks, third-party implementations of smart subtransports cannot reach into the opaque struct and thus cannot know what options the user set. Add a getter for these options to copy the proxy options into something external implementors can use.

d5e6ca1e

2017-01-14T18:39:32

Allow to configure default file share mode for opening files This can prevent FILE_SHARED_VIOLATIONS when used in tools such as TortoiseGit TGitCache and FILE_SHARE_DELETE, because files can be opened w/o being locked any more. Signed-off-by: Sven Strickroth <email@cs-ware.de>

a12796dd

2017-04-02T23:05:48

Correct typos that reference a non-existing file There are references to odb_backends.h when the file is actually named odb_backend.h and in the sys folder.

cc8d9a29

2017-04-01T10:44:17

win32: introduce `do_with_retries` macro Provide a macro that will allow us to run a function with posix-like return values multiple times in a retry loop, with an optional cleanup function called between invocations.

f623cf89

2017-03-22T20:32:55

Merge pull request #4163 from pks-t/pks/submodules-with-worktrees Worktree fixes

6fd6c678

2017-03-22T20:29:22

Merge pull request #4030 from libgit2/ethomson/fsync fsync all the things

84b4e573

2017-03-22T06:08:24

Use proper documentation tags git_cred_acquire_cb isn't using the standard @param and @return tags. This is causing the generated documentation to not be formatted properly.

12b7394c

2017-03-20T22:30:37

Fix typo in remote.h API

3017ba94

2017-03-15T14:24:25

worktree: implement `git_worktree_open_from_repository` While we already provide functionality to look up a worktree from a repository, we cannot do so the other way round. That is given a repository, we want to look up its worktree if it actually exists. Getting the worktree of a repository is useful when we want to get certain meta information like the parent's location, getting the locked status, etc.

bb342159

2017-03-15T11:46:15

merge_driver: fix const-correctness for source getters

2dfd1294

2017-02-24T13:34:01

hash: include sha1collisiondetection Include the SHA1 collision attack detection library from https://github.com/cr-marcstevens/sha1collisiondetection

2a5ad7d0

2017-02-17T16:42:40

fsync: call it "synchronous" object writing Rename `GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION` -> `GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION`.

6d3ad7e0

2016-12-13T10:58:43

Add `ENABLE_SYNCHRONIZED_OBJECT_CREATION` option Allow users to enable `SYNCHRONIZED_OBJECT_CREATION` with a setting.

fc27fe21

2016-12-13T10:35:05

odb_loose: actually honor the fsync option We've had an fsync option for a long time, but it was "ignored". Stop ignoring it.

19874e29

2017-02-16T08:40:49

Minor comment fix

a59545de

2017-02-13T14:38:12

Merge pull request #4122 from pks-t/pks/signature-dbl-free Signature cleanups

dc851d9e

2017-02-13T13:42:16

commit: clear user-provided buffers The functions `git_commit_header_field` and `git_commit_extract_signature` both receive buffers used to hand back the results to the user. While these functions called `git_buf_sanitize` on these buffers, this is not the right thing to do, as it will simply initialize or zero-terminate passed buffers. As we want to overwrite contents, we instead have to call `git_buf_clear` to completely reset them.

c576d4ff

2017-02-13T12:46:00

Merge pull request #4115 from gsaralms/users/gsaral/optionalOfsDelta Changes to provide option to turn off/on ofs_delta

1ba242c9

2017-02-03T13:52:23

worktree: extract git_worktree_is_prunable

e3acd37b

2015-11-06T12:08:15

branch: implement `git_branch_is_checked_out` Implement a new function that is able to determine if a branch is checked out in any repository connected to the current repository. In particular, this is required to check if for a given repository and branch, there exists any working tree connected to that repository that is referencing this branch.

04fb12ab

2015-10-27T12:37:51

worktree: implement functions reading HEAD Implement `git_repository_head_for_worktree` and `git_repository_head_detached_for_worktree` for directly accessing a worktree's HEAD without opening it as a `git_repository` first.

f0cfc341

2015-10-21T13:53:18

worktree: implement `git_worktree_prune` Implement the `git_worktree_prune` function. This function can be used to delete working trees from a repository. According to the flags passed to it, it can either delete the working tree's gitdir only or both gitdir and the working directory.

2a503485

2015-10-21T16:03:04

worktree: implement locking mechanisms Working trees support locking by creating a file `locked` inside the tree's gitdir with an optional reason inside. Support this feature by adding functions to get and set the locking status.

dea7488e

2015-10-23T14:11:44

worktree: implement `git_worktree_add` Implement the `git_worktree_add` function which can be used to create new working trees for a given repository.

372dc9ff

2015-10-21T13:49:55

worktree: implement `git_worktree_validate` Add a new function that checks wether a given `struct git_worktree` is valid. The validation includes checking if the gitdir, parent directory and common directory are present.

8c8d726e

2015-10-21T12:10:30

worktree: implement `git_repository_open_from_worktree` Add function `git_repository_open_from_worktree`, which allows to open a `git_worktree` as repository.

cb3269c9

2016-11-11T13:46:59

repository: add function to retrieve paths for repo items

d3bc09e8

2015-10-21T12:02:31

worktree: introduce `struct git_worktree` Introduce a new `struct git_worktree`, which holds information about a possible working tree connected to a repository. Introduce functions to allow opening working trees for a repository.

thodg/libgit2/include

include

Log