kmx git

Commit	Date	Message
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
7e53e8ce	2017-03-22T20:26:52	Merge pull request #4167 from pks-t/pks/ci-fixes Coverity fixes
69d0b460	2017-03-22T20:22:45	Merge pull request #4172 from rcjsuen/patch-1 Fix the documentation for git_cred_acquire_cb
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.
e7330016	2017-03-20T12:38:28	diff_parse: check return value of `git_diff_init_options`
723bdf48	2017-03-20T09:35:23	patch_parse: check if advancing over header newline succeeds While parsing patch header lines, we iterate over each line and check if the line has trailing garbage. What we do not check though is that the line is actually a line ending with a trailing newline. Fix this by checking the return code of `parse_advance_expected_str`.
8d452448	2017-03-20T09:34:59	odb_pack: initialize `git_rawobj` structure The `pack_entry_find_prefix` function receives a `git_rawobj` structure as argument. While the function first initializes the structure to a sensible state, Coverity is unable to correctly detect this, resulting in a warning. Fix this warning by initializing the object to all-zeroes before passing it to the function.
2cf48e13	2017-03-20T09:34:41	config_file: check if section header buffer runs out of memory While parsing section headers, we use a buffer to store the actual section name. We do not check though if the buffer runs out of memory at any stage. Do so.
ff8d2eb1	2017-03-20T09:34:25	blame_git: check return value of object lookup The function `pass_whole_blame` performs an object lookup but does not check if the lookup actually succeeds. Convert the function to return an error code and check for it in the calling function.
33ea4aae	2017-03-21T13:41:24	Merge pull request #4139 from richardipsum/readme-running-tests README: Mention how to run tests
c6217973	2017-03-20T14:32:57	Merge pull request #4171 from rcjsuen/patch-1 Fix typo in remote.h API
12b7394c	2017-03-20T22:30:37	Fix typo in remote.h API
dd0b1e8c	2017-03-20T09:13:25	openssl_stream: fix releasing OpenSSL locks The OpenSSL library may require multiple locks to work correctly, where it is the caller's responsibility to initialize and release the locks. While we correctly initialized up to `n` locks, as determined by `CRYPTO_num_locks`, we were repeatedly freeing the same mutex in our shutdown procedure. Fix the issue by freeing locks at the correct index.
1d50f955	2017-03-20T11:29:27	Merge pull request #4166 from pks-t/pks/map-free-fix Remove `map_free` macros
31059923	2017-03-20T12:16:18	Merge pull request #4169 from csware/absolute-symlink
c10ce7c2	2017-03-20T12:11:05	tests: filebuf: test writing to symlink with absolute paths
86a8cd9f	2017-03-20T11:21:00	filebuf: fix resolving absolute symlinks The symlink destination is always concatenated to the original path. Fix this by using `git_buf_sets` instead of `git_buf_puts`.
e30a6ee3	2017-03-20T11:06:23	Merge pull request #4160 from pks-t/pks/diff-fixes Diff fixes
44b3b9fe	2017-03-20T11:05:03	Merge pull request #4162 from pks-t/pks/merge-source-fixes merge_driver: fix const-correctness for source getters
94af9155	2017-03-20T09:01:18	map: remove `*map_free` macros The `map_free` functions were not implemented as functions but instead as macros which also set the map to NULL. While this is most certainly sensible in most cases, we should prefer the more obvious behavior, namingly leaving the map pointer intact. Furthermore, this macro has been refactored incorrectly during the map-refactorings: the two statements are not actually grouped together by a `do { ... } while (0)` block, as it is required for macros to match the behavior of functions more closely. This has led to at least one subtle nesting error in `pack-objects.c`. The following code block ``` if (pb->object_ix) git_oidmap_free(pb->object_ix); ``` would be expanded to ``` if (pb->object_ix) git_oidmap__free(pb->object_ix); pb->object_ix = NULL; ``` which is not what one woudl expect. While it is not a bug here as it would simply become a no-op, the wrong implementation could lead to bugs in other occasions. Fix this by simply removing the macro altogether and replacing it with real function calls. This leaves the burden of setting the pointer to NULL afterwards to the caller, but this is actually expected and behaves like other `free` functions.
77c8ee74	2017-03-20T08:59:30	checkout: fix double-free of checkout_data's mkdir_map We currently call `git_strmap_free` on `checkout_data.mkdir_map` in the `checkout_data_clear` function. The only thing protecting us from a double-free is that the `git_strmap_free` function is in fact not a function, but a macro that also sets the map to NULL. Remove the second call to `git_strmap_free` and explicitly set the map member to NULL.
b0c9bc92	2017-03-15T13:38:54	submodule: resolve URLs relative to main worktree It is possible to specify submodule URLs relative to the repository location. E.g. having a submodule with URL "../submodule" will look for the submodule at "repo/../submodule". With the introduction of worktrees, though, we cannot simply resolve the URL relative to the repository location itself. If the repository for which a URL is to be resolved is a working tree, we have to resolve the URL relative to the parent's repository path. Otherwise, the URL would change depending on where the working tree is located. Fix this by special-casing when we have a working tree while getting the URL base.
097f0105	2017-03-17T08:54:53	refdb: create references in commondir References for a repository are usually created inside of its gitdir. When using worktrees, though, these references are not to be created inside the worktree gitdir, but instead inside the gitdir of its parent repository, which is the commondir. Like this, branches will still be available after the worktree itself has been deleted. The filesystem refdb currently still creates new references inside of the gitdir. Fix this and have it create references in commondir.
8f154be3	2017-03-17T08:13:59	worktree: write resolved paths into link files The three link files "worktree/.git", ".git/worktrees/<name>/commondir" and ".git/worktrees/<name>/gitdir" should always contain absolute and resolved paths. Adjust the logic creating new worktrees to first use `git_path_prettify_dir` before writing out these files, so that paths are resolved first.
7cf7a407	2017-03-17T08:06:49	worktree: rename variable in `git_worktree_add`
9dcc79bc	2017-03-15T16:35:43	worktree: use fully qualified reference name for created HEAD When creating a new worktree, we have to set up the initial data structures. Next to others, this also includes the HEAD pseudo-ref. We currently set it to the worktree respectively branch name, which is actually not fully qualified. Use the fully qualified branch name instead.
20a368e2	2017-03-15T15:29:29	worktree: parent path should point to the working dir The working tree's parent path should not point to the parent's gitdir, but to the parent's working directory. Pointing to the gitdir would not make any sense, as the parent's working directory is actually equal to both repository's common directory. Fix the issue.
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.
dfc98706	2017-03-15T13:54:14	worktree: split off function opening working directory Separate the logic of finding the worktree directory of a repository and actually opening the working tree's directory. This is a preparatory step for opening the worktree structure of a repository itself.
3e9c5d8a	2017-03-15T13:42:52	worktree: have `is_worktree_dir` accept a string instead of buffer This will be used in later commits, where it becomes cumbersome to always pass in a buffer.
f3c30686	2017-03-15T15:04:24	tests: worktree: use joinpath instead of printf to join paths
6dfb983c	2017-03-15T15:03:45	Merge pull request #4161 from pks-t/pks/submodule-index-fix submodule: catch when submodule is not staged on update
fdb3e24a	2017-03-15T14:23:59	tests: worktree: unify init/cleanup in open tests
548e5bdf	2017-03-15T12:28:05	tests: worktree: unify init/cleanup in submodule tests
aa593a65	2017-03-15T12:01:02	tests: worktree: move submodule tests into own suite
bb342159	2017-03-15T11:46:15	merge_driver: fix const-correctness for source getters
8051b47f	2017-03-15T08:20:26	Merge branch 'gumenikav/merge_driver_source_info'
0608d5df	2017-03-06T12:30:31	merge_driver: add unresolved getters for git_merge_driver_source
13bf4d7f	2017-03-14T15:04:18	Merge pull request #4146 from pks-t/pks/winhttp-errors winhttp: disambiguate error messages when sending requests
32ecc98e	2017-03-14T14:53:32	submodule: catch when submodule is not staged on update When calling `git_submodule_update` on a submodule, we have to retrieve the ID of the submodule entry in the index. If the function is called on a submodule which is only partly initialized, the submodule entry may not be added to the index yet. This leads to an assert when trying to look up the blob later on. Fix the issue by checking if the index actually holds the submodule's ID and erroring out if it does not.
c0eba379	2017-03-14T11:01:19	diff_parse: correctly set options for parsed diffs The function `diff_parsed_alloc` allocates and initializes a `git_diff_parsed` structure. This structure also contains diff options. While we initialize its flags, we fail to do a real initialization of its values. This bites us when we want to actually use the generated diff as we do not se the option's version field, which is required to operate correctly. Fix the issue by executing `git_diff_init_options` on the embedded struct.
ad5a909c	2017-03-14T09:39:37	patch_parse: fix parsing minimal trailing diff line In a diff, the shortest possible hunk with a modification (that is, no deletion) results from a file with only one line with a single character which is removed. Thus the following hunk @@ -1 +1 @@ -a + is the shortest valid hunk modifying a line. The function parsing the hunk body though assumes that there must always be at least 4 bytes present to make up a valid hunk, which is obviously wrong in this case. The absolute minimum number of bytes required for a modification is actually 2 bytes, that is the "+" and the following newline. Note: if there is no trailing newline, the assumption will not be offended as the diff will have a line "\ No trailing newline" at its end. This patch fixes the issue by lowering the amount of bytes required.
62a2fc06	2017-03-14T13:06:25	patch_generate: move `git_diff_foreach` to diff.c Now that the `git_diff_foreach` function does not depend on internals of the `git_patch_generated` structure anymore, we can easily move it to the actual diff code.
ace3508f	2017-03-14T10:37:47	patch_generate: fix `git_diff_foreach` only working with generated diffs The current logic of `git_diff_foreach` makes the assumption that all diffs passed in are actually derived from generated diffs. With these assumptions we try to derive the actual diff by inspecting either the working directory files or blobs of a repository. This obviously cannot work for diffs parsed from a file, where we do not necessarily have a repository at hand. Since the introduced split of parsed and generated patches, there are multiple functions which help us to handle patches generically, being indifferent from where they stem from. Use these functions and remove the old logic specific to generated patches. This allows re-using the same code for invoking the callbacks on the deltas.
41019152	2017-03-14T10:01:56	patch_generate: remove duplicated logic Under the existing logic, we try to load patch contents differently, depending on whether the patch files stem from the working directory or not. But actually, the executed code paths are completely equal to each other -- so we were always the code despite the condition. Remove the condition altogether and conflate both code paths.
53454be8	2017-03-11T19:52:05	Merge pull request #4157 from adamniedzielski/4099-git-sort-time-uninteresting Skip uninteresting commits in revwalk timesort iterator
0b3623ac	2017-03-11T19:09:27	Merge pull request #4156 from libgit2/ethomson/readbuffer_dont_hash git_futils_readbuffer: don't compute sha-1
ffd4df6b	2017-03-09T16:32:38	Merge pull request #4151 from novalis/dturner/rebase-submodule-untracked rebase: ignore untracked files in submodules
c11c08a5	2017-03-09T14:01:10	Skip uninteresting commits in revwalk timesort iterator Fixes #4099
11c8e756	2017-03-09T12:26:23	git_futils_readbuffer: don't compute sha-1 Don't compute the sha-1 in `git_futils_readbuffer_updated` unless the checksum was requested. This means that `git_futils_readbuffer` will not calculate the checksum unnecessarily.
b31b2360	2017-03-06T15:53:57	Merge pull request #4154 from libgit2/ethomson/namespaces Support namespaced references again
83580562	2017-03-06T13:14:47	refdb_fs: honor the namespace
d24ae06d	2017-03-06T13:13:47	refs::namespace: add namespace tests These simple tests only ensure that we enforce the existence of a namespace; these mirror the rugged tests, they are not exhaustive.
5c06111b	2017-02-25T17:13:15	README: Mention how to run tests
2270ca9f	2017-03-03T13:27:47	rebase: ignore untracked files in submodules An untracked file in a submodule should not prevent a rebase from starting. Even if the submodule's SHA is changed, and that file would conflict with a new tracked file, it's still OK to start the rebase and discover the conflict later. Signed-off-by: David Turner <dturner@twosigma.com>
467185ff	2017-03-03T16:12:12	Merge pull request #4150 from libgit2/ethomson/freshen_trees git_commit_create: freshen tree objects in commit
52d03f37	2017-03-03T13:26:29	git_commit_create: freshen tree objects in commit Freshen the tree object that a commit points to during commit time.
3348570a	2017-03-03T12:36:36	Merge pull request #4136 from libgit2/ethomson/sha1dc Introduce (optional) SHA1 collision attack detection
9f128d2a	2017-03-02T20:56:47	cmake: drop unset `SHA1_TYPE` We never set `SHA1_TYPE` to `builtin`. Don't bother testing for it.
d087c8f8	2017-02-24T14:14:56	hash: test for sha1 collision attack detection
2dfd1294	2017-02-24T13:34:01	hash: include sha1collisiondetection Include the SHA1 collision attack detection library from https://github.com/cr-marcstevens/sha1collisiondetection
a371a8ae	2017-02-24T13:03:15	hash: rename implementation selection constants
1c04a96b	2017-02-28T12:29:29	Honor `core.fsyncObjectFiles`
ba2bc491	2017-03-01T14:51:39	Merge pull request #4148 from pks-t/pks/fix-haiku-builds cmake: only enable supported compiler warning flags
a02e8a38	2017-03-01T13:58:15	cmake: only enable supported compiler warning flags We currently unconditionally enable the "-Wall" and "-Wextra" flags. Some platforms rely on compilers which do not support these flags, though. One of these platforms is Haiku, which does not support "-Wextra" due to being stuck on GCC version 2. Fix builds on such platforms by adding these flags only if supported by the compiler.
a454641e	2017-03-01T08:45:48	Merge pull request #4145 from pks-t/pks/refs-create-memleak tests: refs::create: fix memory leak
b65a5e9b	2017-03-01T07:58:40	winhttp: disambiguate error messages when sending requests
5aa1f12a	2017-03-01T07:45:14	tests: refs::create: fix memory leak
cf8e9a3a	2017-03-01T07:35:44	Merge pull request #4143 from richardipsum/issue-4094 Fix: make reflog include "(merge)" for merge commits
397cf1a1	2017-02-28T22:22:02	Add test for inclusion of (merge) in reflog This test ensures that the string '(merge)' is included in the reflog when a merge commit is made.
3ac05d11	2017-02-17T16:48:03	win32: don't fsync parent directories on Windows Windows doesn't support it.
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`.
1229e1c4	2017-02-17T16:36:53	fsync parent directories when fsyncing When fsync'ing files, fsync the parent directory in the case where we rename a file into place, or create a new file, to ensure that the directory entry is flushed correctly.
5a747e0c	2016-12-27T23:07:07	git_futils_writebuffer: default only when flags==0 Only use defaults for `git_futils_writebuffer` when flags == 0, lest (1 << 31) be treated as the defaults.
eb56ed81	2016-12-15T14:49:43	refdb_fs: optionally fsync packed refs
af3dcb0e	2016-12-15T10:56:52	refdb_fs: optionally fsync loose references
5312621b	2016-12-15T10:51:02	git_futils_writebuffer: optionally fsync Add a custom `O_FSYNC` bit (if it's not been defined by the operating system`) so that `git_futils_writebuffer` can optionally do an `fsync` when it's done writing. We call `fsync` ourselves, even on systems that define `O_FSYNC` because its definition is no guarantee of its actual support. Mac, for instance, defines it but doesn't support it in an `open(2)` call.
1c2c0ae2	2016-12-14T12:51:40	packbuilder: honor git_object__synchronized_writing Honor `git_object__synchronized_writing` when creating a packfile and corresponding index.
e6ed0d2f	2016-12-13T11:31:38	odb_loose: fsync tests Introduce a simple counter that `p_fsync` implements. This is useful for ensuring that `p_fsync` is called when we expect it to be, for example when we have enabled an odb backend to perform `fsync`s when writing objects.
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.
fc77891f	2016-12-13T10:07:42	git_filebuf: optionally fsync when committing
1255a9ac	2017-02-26T13:34:13	Fix: make reflog include "(merge)" for merge commits This fixes issue #4094
a4b5ac64	2017-02-26T16:12:30	Merge pull request #4138 from richardipsum/symbolic-create-arbitrary-tgt-test tests: Add create__symbolic_with_arbitrary_content
55d911d6	2017-02-26T16:08:00	Merge pull request #4142 from pblesi/patch-1 Fix minor typos in CONVENTIONS.md
6313a208	2017-02-26T16:01:32	Merge pull request #4141 from kainjow/patch-2 Fix inet_pton tests triggering an assert in Haiku
c1239e33	2017-02-25T23:09:42	Fix minor typos in CONVENTIONS.md
40170177	2017-02-25T10:21:59	Fix inet_pton tests triggering an assert in Haiku Haiku will assert in a nightly build if the "dst" input to inet_pton() is NULL.
b84e58f4	2017-02-25T14:17:10	Whitespace and style fixes Use C style comments as per style guide, and fix mismatching indentation.
d2b3a21f	2017-01-22T00:21:30	tests: Add create__symbolic_with_arbitrary_content This test ensures that it's possible to create a symbolic ref that has arbitrary data as its target. It also ensures it's possible to obtain the target of that symbolic reference from the git_reference object.
7143145f	2017-02-25T12:45:14	Merge pull request #4137 from libgit2/ethomson/appveyor appveyor: don't rewrite the system mingw
408a7b77	2017-02-24T17:37:00	appveyor: don't rewrite system mingw Download mingw-w64 into our build directory and execute it there, don't try to overwrite the system's mingw.
c3abb1d2	2017-02-24T17:38:42	appveyor: always build the 'appveyor' branch The 'appveyor' branch is useful for testing AppVeyor builds.
7f875fb4	2017-02-24T08:51:50	Merge pull request #4133 from stinb/khash-cleanup-regression fix regression from #4092
685f2251	2017-02-22T09:29:00	pack: fix looping over cache entries Fixes a regression from #4092. This is a crash on 32-bit and I assume that it doesn't do the right thing on 64-bit either. MSVC emits a warning for this, but of course, it's easy to get lost among all of the similar 'possible loss of data' warnings.
c03f00ea	2017-02-22T16:30:57	Merge pull request #4131 from pks-t/pks/attrcache-cleanups Attrcache cleanups
86201b92	2017-02-22T16:17:54	Merge pull request #4135 from libgit2/ethomson/ancient_gcc_not_threadsafe Provide error on gcc < 4.1 when THREADSAFE
aa5ea47f	2017-02-22T10:34:19	Provide error on gcc < 4.1 when THREADSAFE Provide a descriptive error message when compiling THREADSAFE on gcc versions < 4.1. We require the atomic primitives (eg `__sync_synchronize`) that were introduced in that version. (Note, clang setes `__GNUC__` but appears to set its version > 4.1.)
ce6f61da	2017-02-21T15:14:04	attrcache: remove useless `do_init` indirection Remove useless indirection from `git_attr_cache__init` to `git_attr_cache__do_init`. The difference is that the `git_attr_cache__init` macro first checks if the cache is already initialized and, if so, not call `git_attr_cache__do_init`. But actually, `git_attr_cache__do_init` already does the same thing and returns immediately if the cache is already initialized. Remove the indirection.

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

7e53e8ce

2017-03-22T20:26:52

Merge pull request #4167 from pks-t/pks/ci-fixes Coverity fixes

69d0b460

2017-03-22T20:22:45

Merge pull request #4172 from rcjsuen/patch-1 Fix the documentation for git_cred_acquire_cb

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.

e7330016

2017-03-20T12:38:28

diff_parse: check return value of `git_diff_init_options`

723bdf48

2017-03-20T09:35:23

patch_parse: check if advancing over header newline succeeds While parsing patch header lines, we iterate over each line and check if the line has trailing garbage. What we do not check though is that the line is actually a line ending with a trailing newline. Fix this by checking the return code of `parse_advance_expected_str`.

8d452448

2017-03-20T09:34:59

odb_pack: initialize `git_rawobj` structure The `pack_entry_find_prefix` function receives a `git_rawobj` structure as argument. While the function first initializes the structure to a sensible state, Coverity is unable to correctly detect this, resulting in a warning. Fix this warning by initializing the object to all-zeroes before passing it to the function.

2cf48e13

2017-03-20T09:34:41

config_file: check if section header buffer runs out of memory While parsing section headers, we use a buffer to store the actual section name. We do not check though if the buffer runs out of memory at any stage. Do so.

ff8d2eb1

2017-03-20T09:34:25

blame_git: check return value of object lookup The function `pass_whole_blame` performs an object lookup but does not check if the lookup actually succeeds. Convert the function to return an error code and check for it in the calling function.

33ea4aae

2017-03-21T13:41:24

Merge pull request #4139 from richardipsum/readme-running-tests README: Mention how to run tests

c6217973

2017-03-20T14:32:57

Merge pull request #4171 from rcjsuen/patch-1 Fix typo in remote.h API

12b7394c

2017-03-20T22:30:37

Fix typo in remote.h API

dd0b1e8c

2017-03-20T09:13:25

openssl_stream: fix releasing OpenSSL locks The OpenSSL library may require multiple locks to work correctly, where it is the caller's responsibility to initialize and release the locks. While we correctly initialized up to `n` locks, as determined by `CRYPTO_num_locks`, we were repeatedly freeing the same mutex in our shutdown procedure. Fix the issue by freeing locks at the correct index.

1d50f955

2017-03-20T11:29:27

Merge pull request #4166 from pks-t/pks/map-free-fix Remove `map_free` macros

31059923

2017-03-20T12:16:18

Merge pull request #4169 from csware/absolute-symlink

c10ce7c2

2017-03-20T12:11:05

tests: filebuf: test writing to symlink with absolute paths

86a8cd9f

2017-03-20T11:21:00

filebuf: fix resolving absolute symlinks The symlink destination is always concatenated to the original path. Fix this by using `git_buf_sets` instead of `git_buf_puts`.

e30a6ee3

2017-03-20T11:06:23

Merge pull request #4160 from pks-t/pks/diff-fixes Diff fixes

44b3b9fe

2017-03-20T11:05:03

Merge pull request #4162 from pks-t/pks/merge-source-fixes merge_driver: fix const-correctness for source getters

94af9155

2017-03-20T09:01:18

map: remove `*map_free` macros The `map_free` functions were not implemented as functions but instead as macros which also set the map to NULL. While this is most certainly sensible in most cases, we should prefer the more obvious behavior, namingly leaving the map pointer intact. Furthermore, this macro has been refactored incorrectly during the map-refactorings: the two statements are not actually grouped together by a `do { ... } while (0)` block, as it is required for macros to match the behavior of functions more closely. This has led to at least one subtle nesting error in `pack-objects.c`. The following code block ``` if (pb->object_ix) git_oidmap_free(pb->object_ix); ``` would be expanded to ``` if (pb->object_ix) git_oidmap__free(pb->object_ix); pb->object_ix = NULL; ``` which is not what one woudl expect. While it is not a bug here as it would simply become a no-op, the wrong implementation could lead to bugs in other occasions. Fix this by simply removing the macro altogether and replacing it with real function calls. This leaves the burden of setting the pointer to NULL afterwards to the caller, but this is actually expected and behaves like other `free` functions.

77c8ee74

2017-03-20T08:59:30

checkout: fix double-free of checkout_data's mkdir_map We currently call `git_strmap_free` on `checkout_data.mkdir_map` in the `checkout_data_clear` function. The only thing protecting us from a double-free is that the `git_strmap_free` function is in fact not a function, but a macro that also sets the map to NULL. Remove the second call to `git_strmap_free` and explicitly set the map member to NULL.

b0c9bc92

2017-03-15T13:38:54

submodule: resolve URLs relative to main worktree It is possible to specify submodule URLs relative to the repository location. E.g. having a submodule with URL "../submodule" will look for the submodule at "repo/../submodule". With the introduction of worktrees, though, we cannot simply resolve the URL relative to the repository location itself. If the repository for which a URL is to be resolved is a working tree, we have to resolve the URL relative to the parent's repository path. Otherwise, the URL would change depending on where the working tree is located. Fix this by special-casing when we have a working tree while getting the URL base.

097f0105

2017-03-17T08:54:53

refdb: create references in commondir References for a repository are usually created inside of its gitdir. When using worktrees, though, these references are not to be created inside the worktree gitdir, but instead inside the gitdir of its parent repository, which is the commondir. Like this, branches will still be available after the worktree itself has been deleted. The filesystem refdb currently still creates new references inside of the gitdir. Fix this and have it create references in commondir.

8f154be3

2017-03-17T08:13:59

worktree: write resolved paths into link files The three link files "worktree/.git", ".git/worktrees/<name>/commondir" and ".git/worktrees/<name>/gitdir" should always contain absolute and resolved paths. Adjust the logic creating new worktrees to first use `git_path_prettify_dir` before writing out these files, so that paths are resolved first.

7cf7a407

2017-03-17T08:06:49

worktree: rename variable in `git_worktree_add`

9dcc79bc

2017-03-15T16:35:43

worktree: use fully qualified reference name for created HEAD When creating a new worktree, we have to set up the initial data structures. Next to others, this also includes the HEAD pseudo-ref. We currently set it to the worktree respectively branch name, which is actually not fully qualified. Use the fully qualified branch name instead.

20a368e2

2017-03-15T15:29:29

worktree: parent path should point to the working dir The working tree's parent path should not point to the parent's gitdir, but to the parent's working directory. Pointing to the gitdir would not make any sense, as the parent's working directory is actually equal to both repository's common directory. Fix the issue.

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.

dfc98706

2017-03-15T13:54:14

worktree: split off function opening working directory Separate the logic of finding the worktree directory of a repository and actually opening the working tree's directory. This is a preparatory step for opening the worktree structure of a repository itself.

3e9c5d8a

2017-03-15T13:42:52

worktree: have `is_worktree_dir` accept a string instead of buffer This will be used in later commits, where it becomes cumbersome to always pass in a buffer.

f3c30686

2017-03-15T15:04:24

tests: worktree: use joinpath instead of printf to join paths

6dfb983c

2017-03-15T15:03:45

Merge pull request #4161 from pks-t/pks/submodule-index-fix submodule: catch when submodule is not staged on update

fdb3e24a

2017-03-15T14:23:59

tests: worktree: unify init/cleanup in open tests

548e5bdf

2017-03-15T12:28:05

tests: worktree: unify init/cleanup in submodule tests

aa593a65

2017-03-15T12:01:02

tests: worktree: move submodule tests into own suite

bb342159

2017-03-15T11:46:15

merge_driver: fix const-correctness for source getters

8051b47f

2017-03-15T08:20:26

Merge branch 'gumenikav/merge_driver_source_info'

0608d5df

2017-03-06T12:30:31

merge_driver: add unresolved getters for git_merge_driver_source

13bf4d7f

2017-03-14T15:04:18

Merge pull request #4146 from pks-t/pks/winhttp-errors winhttp: disambiguate error messages when sending requests

32ecc98e

2017-03-14T14:53:32

submodule: catch when submodule is not staged on update When calling `git_submodule_update` on a submodule, we have to retrieve the ID of the submodule entry in the index. If the function is called on a submodule which is only partly initialized, the submodule entry may not be added to the index yet. This leads to an assert when trying to look up the blob later on. Fix the issue by checking if the index actually holds the submodule's ID and erroring out if it does not.

c0eba379

2017-03-14T11:01:19

diff_parse: correctly set options for parsed diffs The function `diff_parsed_alloc` allocates and initializes a `git_diff_parsed` structure. This structure also contains diff options. While we initialize its flags, we fail to do a real initialization of its values. This bites us when we want to actually use the generated diff as we do not se the option's version field, which is required to operate correctly. Fix the issue by executing `git_diff_init_options` on the embedded struct.

ad5a909c

2017-03-14T09:39:37

patch_parse: fix parsing minimal trailing diff line In a diff, the shortest possible hunk with a modification (that is, no deletion) results from a file with only one line with a single character which is removed. Thus the following hunk @@ -1 +1 @@ -a + is the shortest valid hunk modifying a line. The function parsing the hunk body though assumes that there must always be at least 4 bytes present to make up a valid hunk, which is obviously wrong in this case. The absolute minimum number of bytes required for a modification is actually 2 bytes, that is the "+" and the following newline. Note: if there is no trailing newline, the assumption will not be offended as the diff will have a line "\ No trailing newline" at its end. This patch fixes the issue by lowering the amount of bytes required.

62a2fc06

2017-03-14T13:06:25

patch_generate: move `git_diff_foreach` to diff.c Now that the `git_diff_foreach` function does not depend on internals of the `git_patch_generated` structure anymore, we can easily move it to the actual diff code.

ace3508f

2017-03-14T10:37:47

patch_generate: fix `git_diff_foreach` only working with generated diffs The current logic of `git_diff_foreach` makes the assumption that all diffs passed in are actually derived from generated diffs. With these assumptions we try to derive the actual diff by inspecting either the working directory files or blobs of a repository. This obviously cannot work for diffs parsed from a file, where we do not necessarily have a repository at hand. Since the introduced split of parsed and generated patches, there are multiple functions which help us to handle patches generically, being indifferent from where they stem from. Use these functions and remove the old logic specific to generated patches. This allows re-using the same code for invoking the callbacks on the deltas.

41019152

2017-03-14T10:01:56

patch_generate: remove duplicated logic Under the existing logic, we try to load patch contents differently, depending on whether the patch files stem from the working directory or not. But actually, the executed code paths are completely equal to each other -- so we were always the code despite the condition. Remove the condition altogether and conflate both code paths.

53454be8

2017-03-11T19:52:05

Merge pull request #4157 from adamniedzielski/4099-git-sort-time-uninteresting Skip uninteresting commits in revwalk timesort iterator

0b3623ac

2017-03-11T19:09:27

Merge pull request #4156 from libgit2/ethomson/readbuffer_dont_hash git_futils_readbuffer: don't compute sha-1

ffd4df6b

2017-03-09T16:32:38

Merge pull request #4151 from novalis/dturner/rebase-submodule-untracked rebase: ignore untracked files in submodules

c11c08a5

2017-03-09T14:01:10

Skip uninteresting commits in revwalk timesort iterator Fixes #4099

11c8e756

2017-03-09T12:26:23

git_futils_readbuffer: don't compute sha-1 Don't compute the sha-1 in `git_futils_readbuffer_updated` unless the checksum was requested. This means that `git_futils_readbuffer` will not calculate the checksum unnecessarily.

b31b2360

2017-03-06T15:53:57

Merge pull request #4154 from libgit2/ethomson/namespaces Support namespaced references again

83580562

2017-03-06T13:14:47

refdb_fs: honor the namespace

d24ae06d

2017-03-06T13:13:47

refs::namespace: add namespace tests These simple tests only ensure that we enforce the existence of a namespace; these mirror the rugged tests, they are not exhaustive.

5c06111b

2017-02-25T17:13:15

README: Mention how to run tests

2270ca9f

2017-03-03T13:27:47

rebase: ignore untracked files in submodules An untracked file in a submodule should not prevent a rebase from starting. Even if the submodule's SHA is changed, and that file would conflict with a new tracked file, it's still OK to start the rebase and discover the conflict later. Signed-off-by: David Turner <dturner@twosigma.com>

467185ff

2017-03-03T16:12:12

Merge pull request #4150 from libgit2/ethomson/freshen_trees git_commit_create: freshen tree objects in commit

52d03f37

2017-03-03T13:26:29

git_commit_create: freshen tree objects in commit Freshen the tree object that a commit points to during commit time.

3348570a

2017-03-03T12:36:36

Merge pull request #4136 from libgit2/ethomson/sha1dc Introduce (optional) SHA1 collision attack detection

9f128d2a

2017-03-02T20:56:47

cmake: drop unset `SHA1_TYPE` We never set `SHA1_TYPE` to `builtin`. Don't bother testing for it.

d087c8f8

2017-02-24T14:14:56

hash: test for sha1 collision attack detection

2dfd1294

2017-02-24T13:34:01

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

a371a8ae

2017-02-24T13:03:15

hash: rename implementation selection constants

1c04a96b

2017-02-28T12:29:29

Honor `core.fsyncObjectFiles`

ba2bc491

2017-03-01T14:51:39

Merge pull request #4148 from pks-t/pks/fix-haiku-builds cmake: only enable supported compiler warning flags

a02e8a38

2017-03-01T13:58:15

cmake: only enable supported compiler warning flags We currently unconditionally enable the "-Wall" and "-Wextra" flags. Some platforms rely on compilers which do not support these flags, though. One of these platforms is Haiku, which does not support "-Wextra" due to being stuck on GCC version 2. Fix builds on such platforms by adding these flags only if supported by the compiler.

a454641e

2017-03-01T08:45:48

Merge pull request #4145 from pks-t/pks/refs-create-memleak tests: refs::create: fix memory leak

b65a5e9b

2017-03-01T07:58:40

winhttp: disambiguate error messages when sending requests

5aa1f12a

2017-03-01T07:45:14

tests: refs::create: fix memory leak

cf8e9a3a

2017-03-01T07:35:44

Merge pull request #4143 from richardipsum/issue-4094 Fix: make reflog include "(merge)" for merge commits

397cf1a1

2017-02-28T22:22:02

Add test for inclusion of (merge) in reflog This test ensures that the string '(merge)' is included in the reflog when a merge commit is made.

3ac05d11

2017-02-17T16:48:03

win32: don't fsync parent directories on Windows Windows doesn't support it.

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

1229e1c4

2017-02-17T16:36:53

fsync parent directories when fsyncing When fsync'ing files, fsync the parent directory in the case where we rename a file into place, or create a new file, to ensure that the directory entry is flushed correctly.

5a747e0c

2016-12-27T23:07:07

git_futils_writebuffer: default only when flags==0 Only use defaults for `git_futils_writebuffer` when flags == 0, lest (1 << 31) be treated as the defaults.

eb56ed81

2016-12-15T14:49:43

refdb_fs: optionally fsync packed refs

af3dcb0e

2016-12-15T10:56:52

refdb_fs: optionally fsync loose references

5312621b

2016-12-15T10:51:02

git_futils_writebuffer: optionally fsync Add a custom `O_FSYNC` bit (if it's not been defined by the operating system`) so that `git_futils_writebuffer` can optionally do an `fsync` when it's done writing. We call `fsync` ourselves, even on systems that define `O_FSYNC` because its definition is no guarantee of its actual support. Mac, for instance, defines it but doesn't support it in an `open(2)` call.

1c2c0ae2

2016-12-14T12:51:40

packbuilder: honor git_object__synchronized_writing Honor `git_object__synchronized_writing` when creating a packfile and corresponding index.

e6ed0d2f

2016-12-13T11:31:38

odb_loose: fsync tests Introduce a simple counter that `p_fsync` implements. This is useful for ensuring that `p_fsync` is called when we expect it to be, for example when we have enabled an odb backend to perform `fsync`s when writing objects.

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.

fc77891f

2016-12-13T10:07:42

git_filebuf: optionally fsync when committing

1255a9ac

2017-02-26T13:34:13

Fix: make reflog include "(merge)" for merge commits This fixes issue #4094

a4b5ac64

2017-02-26T16:12:30

Merge pull request #4138 from richardipsum/symbolic-create-arbitrary-tgt-test tests: Add create__symbolic_with_arbitrary_content

55d911d6

2017-02-26T16:08:00

Merge pull request #4142 from pblesi/patch-1 Fix minor typos in CONVENTIONS.md

6313a208

2017-02-26T16:01:32

Merge pull request #4141 from kainjow/patch-2 Fix inet_pton tests triggering an assert in Haiku

c1239e33

2017-02-25T23:09:42

Fix minor typos in CONVENTIONS.md

40170177

2017-02-25T10:21:59

Fix inet_pton tests triggering an assert in Haiku Haiku will assert in a nightly build if the "dst" input to inet_pton() is NULL.

b84e58f4

2017-02-25T14:17:10

Whitespace and style fixes Use C style comments as per style guide, and fix mismatching indentation.

d2b3a21f

2017-01-22T00:21:30

tests: Add create__symbolic_with_arbitrary_content This test ensures that it's possible to create a symbolic ref that has arbitrary data as its target. It also ensures it's possible to obtain the target of that symbolic reference from the git_reference object.

7143145f

2017-02-25T12:45:14

Merge pull request #4137 from libgit2/ethomson/appveyor appveyor: don't rewrite the system mingw

408a7b77

2017-02-24T17:37:00

appveyor: don't rewrite system mingw Download mingw-w64 into our build directory and execute it there, don't try to overwrite the system's mingw.

c3abb1d2

2017-02-24T17:38:42

appveyor: always build the 'appveyor' branch The 'appveyor' branch is useful for testing AppVeyor builds.

7f875fb4

2017-02-24T08:51:50

Merge pull request #4133 from stinb/khash-cleanup-regression fix regression from #4092

685f2251

2017-02-22T09:29:00

pack: fix looping over cache entries Fixes a regression from #4092. This is a crash on 32-bit and I assume that it doesn't do the right thing on 64-bit either. MSVC emits a warning for this, but of course, it's easy to get lost among all of the similar 'possible loss of data' warnings.

c03f00ea

2017-02-22T16:30:57

Merge pull request #4131 from pks-t/pks/attrcache-cleanups Attrcache cleanups

86201b92

2017-02-22T16:17:54

Merge pull request #4135 from libgit2/ethomson/ancient_gcc_not_threadsafe Provide error on gcc < 4.1 when THREADSAFE

aa5ea47f

2017-02-22T10:34:19

Provide error on gcc < 4.1 when THREADSAFE Provide a descriptive error message when compiling THREADSAFE on gcc versions < 4.1. We require the atomic primitives (eg `__sync_synchronize`) that were introduced in that version. (Note, clang setes `__GNUC__` but appears to set its version > 4.1.)

ce6f61da

2017-02-21T15:14:04

attrcache: remove useless `do_init` indirection Remove useless indirection from `git_attr_cache__init` to `git_attr_cache__do_init`. The difference is that the `git_attr_cache__init` macro first checks if the cache is already initialized and, if so, not call `git_attr_cache__do_init`. But actually, `git_attr_cache__do_init` already does the same thing and returns immediately if the cache is already initialized. Remove the indirection.

thodg/libgit2

Log