- 02 Apr, 2017 1 commit
-
-
When `git_repository_set_head` is provided a remote reference, update the reflog with the tag name, like we do with a branch. This helps consumers match the semantics of `git checkout remote`.
Edward Thomson committed
-
- 21 Mar, 2017 2 commits
-
-
When `git_repository_set_head` is provided a tag reference, update the reflog with the tag name, like we do with a branch. This helps consumers match the semantics of `git checkout tag`.
Edward Thomson committed -
README: Mention how to run tests
Edward Thomson committed
-
- 20 Mar, 2017 10 commits
-
-
Fix typo in remote.h API
Patrick Steinhardt committed -
Remy Suen committed
-
Remove `map_free` macros
Edward Thomson committed -
Patrick Steinhardt committed
-
Patrick Steinhardt committed
-
The symlink destination is always concatenated to the original path. Fix this by using `git_buf_sets` instead of `git_buf_puts`.
Sven Strickroth2 committed -
Diff fixes
Patrick Steinhardt committed -
merge_driver: fix const-correctness for source getters
Patrick Steinhardt committed -
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.
Patrick Steinhardt committed -
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.
Patrick Steinhardt committed
-
- 15 Mar, 2017 4 commits
-
-
submodule: catch when submodule is not staged on update
Edward Thomson committed -
Patrick Steinhardt committed
-
Patrick Steinhardt committed
-
Gumenik Alexandr committed
-
- 14 Mar, 2017 7 commits
-
-
winhttp: disambiguate error messages when sending requests
Patrick Steinhardt committed -
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.
Patrick Steinhardt committed -
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.
Patrick Steinhardt committed -
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.
Patrick Steinhardt committed -
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.
Patrick Steinhardt committed -
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.
Patrick Steinhardt committed -
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.
Patrick Steinhardt committed
-
- 11 Mar, 2017 2 commits
-
-
Skip uninteresting commits in revwalk timesort iterator
Carlos Martín Nieto committed -
git_futils_readbuffer: don't compute sha-1
Carlos Martín Nieto committed
-
- 09 Mar, 2017 3 commits
-
-
rebase: ignore untracked files in submodules
Edward Thomson committed -
Fixes #4099
Adam Niedzielski committed -
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.
Edward Thomson committed
-
- 06 Mar, 2017 3 commits
-
-
Support namespaced references again
Edward Thomson committed -
Edward Thomson committed
-
These simple tests only ensure that we enforce the existence of a namespace; these mirror the rugged tests, they are not exhaustive.
Edward Thomson committed
-
- 05 Mar, 2017 1 commit
-
-
Richard Ipsum committed
-
- 03 Mar, 2017 7 commits
-
-
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>
David Turner committed -
git_commit_create: freshen tree objects in commit
Carlos Martín Nieto committed -
Freshen the tree object that a commit points to during commit time.
Edward Thomson committed -
Introduce (optional) SHA1 collision attack detection
Carlos Martín Nieto committed -
We never set `SHA1_TYPE` to `builtin`. Don't bother testing for it.
Edward Thomson committed -
Edward Thomson committed
-
Include the SHA1 collision attack detection library from https://github.com/cr-marcstevens/sha1collisiondetection
Edward Thomson committed
-