|
e2cdc145
|
2015-09-23T17:48:52
|
|
patch: show modes when only the mode has changed
|
|
|
4ac2d8ac
|
2015-09-23T16:33:02
|
|
patch: quote filenames when necessary
|
|
|
72806f4c
|
2015-09-23T13:56:48
|
|
patch: don't print some headers on pure renames
|
|
|
82175084
|
2015-09-23T13:40:12
|
|
Introduce git_patch_options, handle prefixes
Handle prefixes (in terms of number of path components) for patch
parsing.
|
|
|
d3d95d5a
|
2015-09-23T16:30:48
|
|
git_buf_quote: quote ugly characters
|
|
|
19e46645
|
2015-09-23T11:07:04
|
|
patch printing: include rename information
|
|
|
28f70443
|
2015-09-23T10:38:51
|
|
patch_parse: use names from `diff --git` header
When a text file is added or deleted, use the file names from the
`diff --git` header instead of the `---` or `+++` lines. This is
for compatibility with git.
|
|
|
1462c95a
|
2015-09-23T09:54:25
|
|
patch_parse: set binary flag
We may have parsed binary data, set the `SHOW_BINARY` flag which
indicates that we have actually computed a binary diff.
|
|
|
2f3b922f
|
2015-09-22T18:54:10
|
|
patch_parse: test roundtrip patch parsing -> print
|
|
|
42b34428
|
2015-09-22T18:54:10
|
|
patch_parse: ensure we can parse a patch
|
|
|
bc6a31c9
|
2015-09-22T18:29:14
|
|
patch: when parsing, set nfiles correctly in delta
|
|
|
d68cb736
|
2015-09-22T18:25:03
|
|
diff: include oid length in deltas
Now that `git_diff_delta` data can be produced by reading patch
file data, which may have an abbreviated oid, allow consumers to
know that the id is abbreviated.
|
|
|
d536ceac
|
2015-09-23T10:47:34
|
|
patch_parse: don't set new mode when deleted
|
|
|
b85bd8ce
|
2015-09-16T11:37:03
|
|
patch: use delta's old_file/new_file members
No need to replicate the old_file/new_file members, or plumb them
strangely up.
|
|
804d5fe9
|
2015-09-11T08:37:12
|
|
patch: abstract patches into diff'ed and parsed
Patches can now come from a variety of sources - either internally
generated (from diffing two commits) or as the results of parsing
some external data.
|
|
|
8d2eef27
|
2015-07-10T09:09:27
|
|
patch parsing: ensure empty patches are illegal
|
|
|
5d17d726
|
2015-07-09T19:22:28
|
|
patch parsing: parse binary patch files
|
|
|
b8dc2fdb
|
2015-07-09T18:36:53
|
|
zstream: fail when asked to inflate garbage
When we are provided some input buffer (with a length) to inflate,
and it contains more data than simply the deflated data, fail.
zlib will helpfully tell us when it is done reading (via Z_STREAM_END),
so if there is data leftover in the input buffer, fail lest we
continually try to inflate it.
|
|
|
5b78dbdb
|
2015-07-09T13:04:10
|
|
git_buf: decode base85 inputs
|
|
|
e7ec327d
|
2015-09-22T17:56:42
|
|
patch parse: unset path prefix
|
|
|
8bca8b9e
|
2015-09-16T14:40:44
|
|
apply: move patch data to patch_common.h
|
|
|
3149ff6f
|
2015-06-17T18:13:10
|
|
patch application: apply binary patches
Handle the application of binary patches. Include tests that
produce a binary patch (an in-memory `git_patch` object),
then enusre that the patch applies correctly.
|
|
|
b88f1713
|
2015-06-17T08:07:34
|
|
zstream: offer inflating, `git_zstream_inflatebuf`
Introduce `git_zstream_inflatebuf` for simple uses.
|
|
|
1cd65991
|
2015-06-17T07:31:47
|
|
delta: refactor git_delta functions for consistency
Refactor the git_delta functions to have consistent naming and
parameters with the rest of the library.
|
|
|
6a2d2f8a
|
2015-06-17T06:42:20
|
|
delta: move delta application to delta.c
Move the delta application functions into `delta.c`, next to the
similar delta creation functions. Make the `git__delta_apply`
functions adhere to other naming and parameter style within the
library.
|
|
|
0004386f
|
2015-06-17T06:03:01
|
|
apply: handle empty patches
When a patch is empty, simply copy the source into the destination.
|
|
|
d34f6826
|
2014-04-08T17:18:47
|
|
Patch parsing from patch files
|
|
|
7cb904ba
|
2014-04-01T23:58:59
|
|
Introduce git_apply_patch
The beginnings of patch application from an existing (diff-created)
git_patch object: applies the hunks of a git_patch to a buffer.
|
|
784bb303
|
2016-05-26T10:28:00
|
|
Merge pull request #3799 from sschuberth/master
Use AppVeyor's Start-FileDownload cmdlet
|
|
|
e102daa4
|
2016-05-26T10:25:40
|
|
Merge pull request #3798 from mmuman/stat-test-fix
test: Fix stat() test to mask out unwanted bits
|
|
|
06f42b62
|
2016-05-26T01:20:41
|
|
Merge branch 'checkout_submodules'
|
|
c864b4ab
|
2016-05-12T13:18:07
|
|
Ignore submodules when checking for merge conflicts in the workdir.
|
|
|
afab1fff
|
2016-02-16T21:02:41
|
|
checkout: handle dirty submodules correctly
Don't generate conflicts when checking out a modified submodule and the
submodule is dirty or modified in the workdir.
|
|
|
fdf14637
|
2016-05-26T00:58:43
|
|
Merge pull request #3792 from edquist/misc
Fix comment for GIT_FILEMODE_LINK
|
|
247665ed
|
2016-05-25T12:10:44
|
|
Use AppVeyor's Start-FileDownload cmdlet
Start-FileDownload maintains current directory context and allows
specifying a request timeout, see [1].
[1] https://www.appveyor.com/docs/how-to/download-file#start-filedownload-cmdlet
|
|
407f2e9f
|
2016-05-24T19:07:09
|
|
test: Fix stat() test to mask out unwanted bits
Haiku and Hurd both pass extra bits in struct stat::st_mode.
|
|
c756448c
|
2016-05-24T16:15:57
|
|
Merge pull request #3797 from libgit2/cmn/remove-single-entry
tree: handle removal of all entries in the updater
|
|
a2cb4713
|
2016-05-24T14:30:43
|
|
tree: handle removal of all entries in the updater
When we remove all entries in a tree, we should remove that tree from
its parent rather than include the empty tree.
|
|
|
c91a1dc1
|
2016-05-23T18:02:24
|
|
Merge pull request #3794 from libgit2/cmn/tree-update-basename
Tree updater fixups
|
|
|
53412305
|
2016-05-19T15:29:53
|
|
tree: plug leaks in the tree updater
|
|
|
6ee08d2c
|
2016-05-19T15:22:02
|
|
tree: use the basename for the entry removal
When we want to remove the file, use the basename as the name of the
entry to remove, instead of the full one, which includes the directories
we've inserted into the stack.
|
|
|
92249656
|
2016-05-19T15:21:26
|
|
tree: use testrepo2 for the tree updater tests
This gives us trees with subdirectories, which the new test needs.
|
|
c8fb2e15
|
2016-05-18T16:00:01
|
|
Fix comment for GIT_FILEMODE_LINK
0120000 is symbolic link, not commit
|
|
|
1b56cda1
|
2016-05-18T11:30:02
|
|
Merge pull request #3770 from libgit2/cmn/tree-update
Add a method specifically for modifying trees
|
|
|
9464f9eb
|
2016-05-02T17:36:58
|
|
Introduce a function to create a tree based on a different one
Instead of going through the usual steps of reading a tree recursively
into an index, modifying it and writing it back out as a tree, introduce
a function to perform simple updates more efficiently.
`git_tree_create_updated` avoids reading trees which are not modified
and supports upsert and delete operations. It is not as versatile as
modifying the index, but it makes some common operations much more
efficient.
|
|
|
c1485330
|
2016-05-09T08:58:44
|
|
Merge pull request #3767 from pks-t/pks/misc-fixes
Misc fixes
|
|
|
6f02f198
|
2016-05-08T17:48:22
|
|
Merge pull request #3773 from lucasderraugh/patch-1
Fix unused variable 'message' warning
|
|
|
17a93afa
|
2016-05-06T18:44:37
|
|
Merge pull request #3757 from johnhaley81/jh/fix-create-initial-commit
Fix `git_commit_create` for an initial commit
|
|
2527db87
|
2016-05-05T23:34:23
|
|
Fix unused variable 'message' warning
|
|
5785ae9b
|
2016-05-04T11:14:17
|
|
Fix initial commit test
`test_commit_commit__create_initial_commit_parent_not_current` was not correctly
testing that `HEAD` was not changed. Now we grab the oid that it was pointing to
before the call to `git_commit_create` and the oid that it's pointing to afterwards
and compare those.
|
|
|
2e43a37b
|
2016-05-04T19:05:38
|
|
Merge pull request #3769 from libgit2/ethomson/rebase_inmemory_no_base
Rebase: rebase a branch with no merge base for in-memory
|
|
|
4f22ccb9
|
2016-05-03T13:32:22
|
|
Add tests for creating an initial commit
|
|
|
225cb880
|
2016-04-26T08:09:04
|
|
Fix `git_commit_create` for an initial commit
When calling `git_commit_create` with an empty array of `parents` and `parent_count == 0`
the call will segfault at https://github.com/libgit2/libgit2/blob/master/src/commit.c#L107
when it's trying to compare `current_id` to a null parent oid.
This just puts in a check to stop that segfault.
|
|
|
9a363d1b
|
2016-05-03T15:29:50
|
|
rebase: handle no common ancestor for inmemory
|
|
|
c7b4bbff
|
2016-05-03T15:22:22
|
|
rebase: test rebase (merge) w/ no common ancestor
|
|
fe3057b4
|
2016-05-03T17:36:09
|
|
diff: simplify code for handling empty dirs
When determining diffs between two iterators we may need to
recurse into an unmatched directory for the "new" iterator when
it is either a prefix to the current item of the "old" iterator
or when untracked/ignored changes are requested by the user and
the directory is untracked/ignored.
When advancing into the directory and no files are found, we will
get back `GIT_ENOTFOUND`. If so, we simply skip the directory,
handling resulting unmatched old items in the next iteration. The
other case of `iterator_advance_into` returning either
`GIT_NOERROR` or any other error but `GIT_ENOTFOUND` will be
handled by the caller, which will now either compare the first
directory entry of the "new" iterator in case of `GIT_ENOERROR`
or abort on other cases.
Improve readability of the code to make the above logic more
clear.
|
|
|
4d384d6b
|
2016-05-02T13:59:51
|
|
Merge pull request #3759 from libgit2/cmn/faster-header
odb: avoid inflating the full delta to read the header
|
|
|
153fde5b
|
2016-05-02T16:49:59
|
|
delta-apply: fix sign extension
We compute offsets by executing `off |= (*delta++ << 24)` for
multiple constants, where `off` is of type `size_t` and `delta`
is of type `unsigned char`. The usual arithmetic conversions (see
ISO C89 §3.2.1.5 "Usual arithmetic conversions") kick in here,
causing us to promote both operands to `int` and then extending
the result to an `unsigned long` when OR'ing it with `off`.
The integer promotion to `int` may result in wrong size
calculations for big values.
Fix the issue by making the constants `unsigned long`, causing both
operands to be promoted to `unsigned long`.
|
|
|
7f407710
|
2016-05-02T16:24:14
|
|
odb_loose: fix undefined behavior when computing size
An object's size is computed by reading the object header's size
field until the most significant bit is not set anymore. To get
the total size, we increase the shift on each iteration and add
the shifted value to the total size.
We read the current value into a variable of type `unsigned
char`, from which we then take all bits except the most
significant bit and shift the result. We will end up with a
maximum shift of 60, but this exceeds the width of the value's
type, resulting in undefined behavior.
Fix the issue by instead reading the values into a variable of
type `unsigned long`, which matches the required width. This is
equivalent to git.git, which uses an `unsigned long` as well.
|
|
|
7b24c4fd
|
2016-05-02T15:47:54
|
|
checkout: set ignorecase=0 when config lookup fails
When `git_repository__cvar` fails we may end up with a
`ignorecase` value of `-1`. As we subsequently check if
`ignorecase` is non-zero, we may end up reporting that data
should be removed when in fact it should not.
Err on the safer side and set `ignorecase = 0` when
`git_repository__cvar` fails.
|
|
|
fcd1b786
|
2016-05-02T14:46:14
|
|
merge_file: do not unnecessarily check ours/theirs for NULL
The `merge_file__xdiff` function checks if either `ours` or
`theirs` is `NULL`. The function is to be called with existing
files, though, and in fact already unconditionally dereferences
both pointers.
Remove the unnecessary check to silence warnings.
|
|
|
a97b769a
|
2016-04-27T12:00:31
|
|
odb: avoid inflating the full delta to read the header
When we read the header, we want to know the size and type of the
object. We're currently inflating the full delta in order to read the
first few bytes. This can mean hundreds of kB needlessly inflated for
large objects.
Instead use a packfile stream to read just enough so we can read the two
varints in the header and avoid inflating most of the delta.
|
|
|
f80852af
|
2016-05-02T14:30:14
|
|
index: fix memory leak on error case
|
|
|
d24425fa
|
2016-04-29T18:34:03
|
|
Merge pull request #3764 from libgit2/ethomson/cmake_pc
cmake: include threading libraries in pkg-config
|
|
|
097b0761
|
2016-04-29T10:18:04
|
|
cmake: include threading libraries in pkg-config
Include any required threading libraries in our `libgit2.pc`.
|
|
|
5e8ba35d
|
2016-04-29T10:36:01
|
|
Merge pull request #3763 from libgit2/ethomson/signature_from_buffer
Introduce `git_signature_from_buffer`
|
|
|
1e7fa834
|
2016-04-28T22:32:20
|
|
Merge pull request #3760 from backhub/bug/openssl_read
Fix return value of openssl_read (infinite loop)
|
|
|
d383c39b
|
2016-04-28T12:47:14
|
|
Introduce `git_signature_from_buffer`
Allow users to construct a signature from the type of signature
lines that actually appear in commits.
|
|
568c5a9f
|
2016-04-27T13:56:16
|
|
Fix style: no braces
|
|
|
88284dfb
|
2016-04-26T21:21:27
|
|
Merge pull request #3758 from libgit2/ethomson/annotated_commit_refs
Annotated commits: differentiate between the ref names and the description
|
|
|
d5592378
|
2016-04-26T11:39:53
|
|
annotated_commit: provide refs and description
Differentiate between the ref_name used to create an annotated_commit
(that can subsequently be used to look up the reference) and the
description that we resolved this with (which _cannot_ be looked up).
The description is used for things like reflogs (and may be a ref name,
and ID something that we revparsed to get here), while the ref name must
actually be a reference name, and is used for things like rebase to
return to the initial branch.
|
|
|
4734c52a
|
2016-04-26T18:04:03
|
|
Fix return value of openssl_read (infinite loop)
openssl_read should return -1 in case of error.
SSL_read returns values <= 0 in case of error.
A return value of 0 can lead to an infinite loop, so the return value
of ssl_set_error will be returned if SSL_read is not successful (analog
to openssl_write).
|
|
|
b3ffd8f6
|
2016-04-26T11:48:11
|
|
rebase::abort: test we can abort rebase by revspec
Test that we can properly abort a rebase when it is initialized by a
revspec. This ensures that we do not conflate revspecs and refnames.
|
|
|
cb2dfa46
|
2016-04-26T13:40:03
|
|
Merge pull request #3755 from arthurschreiber/patch-9
Remove traces of `git_blob_create_fromchunks`
|
|
a3e379cb
|
2016-04-26T11:10:31
|
|
Remove traces of `git_blob_create_fromchunks`
|
|
|
9068704b
|
2016-04-26T11:02:45
|
|
Merge pull request #3749 from arthurschreiber/arthur/add-git-reference-dup
Allow creating copies of `git_reference` objects.
|
|
|
c30955e0
|
2016-04-26T11:02:05
|
|
Merge pull request #3748 from libgit2/ethomson/rebase_detached
Rebase improvements with IDs
|
|
|
b058297a
|
2016-04-25T09:45:27
|
|
Merge pull request #3752 from libgit2/cmn/silly-tags
tag: ignore extra header fields
|
|
|
eb39284b
|
2016-04-25T12:16:05
|
|
tag: ignore extra header fields
While no extra header fields are defined for tags, git accepts them by
ignoring them and continuing the search for the message. There are a few
tags like this in the wild which git parses just fine, so we should do
the same.
|
|
|
908f24fd
|
2016-04-22T10:34:17
|
|
Allow creating copies of `git_reference` objects.
|
|
|
512bd2c7
|
2016-04-22T15:40:08
|
|
Merge pull request #3747 from libgit2/ethomson/warnings
:zap: some warnings
|
|
|
1f84caf0
|
2016-04-21T18:16:37
|
|
rebase: correctly finish rebasing detached heads
When rebasing with IDs, we do not return to the `branch`,
we remain in a detached HEAD state.
|
|
|
badc7283
|
2016-04-21T17:29:19
|
|
rebase: handle detached HEADs in `init`
When `init`ing a rebase from a detached HEAD, be sure to remember
that we were in a detached HEAD state so that we can correctly
`abort` the object that we just created.
|
|
|
320f53cd
|
2016-04-21T17:03:21
|
|
rebase: test abort immediately after init
Instead of `open`ing a rebase and `abort`ing that, test that we can
`abort` a rebase that has just begun with `init`.
|
|
|
0bd77401
|
2016-04-21T11:05:21
|
|
clone test: annotate unused vars
|
|
|
375bb2fe
|
2016-04-21T11:02:31
|
|
transport: cast away constness for free
|
|
|
e0aed4bd
|
2016-04-21T11:01:09
|
|
stransport: pass proxy opts instead of char*
|
|
|
db22a91b
|
2016-04-21T10:58:22
|
|
iterator: ignore submodule in has_ended
|
|
|
1dc44910
|
2016-04-19T19:48:52
|
|
Merge pull request #3110 from libgit2/cmn/proxy-config
Proxy configuration
|
|
|
2638df77
|
2016-04-19T23:05:16
|
|
CI: download the proxy jar also on mingw
We were downloading the jar from within an block which only runs for
MSVC. Move the download to the start of the test so it gets downloaded
for both.
|
|
|
95fbc81d
|
2016-04-19T15:24:14
|
|
Merge pull request #3745 from libgit2/cmn/ignore-starstar
Improve star-star matching
|
|
|
d45928cc
|
2016-04-18T16:05:12
|
|
ignore: move star-star matching closer to it use
Instead of threading the state down to the larger loop, let's have the
loop where we detect the double star so each of them are easier to read.
|
|
|
1c3018eb
|
2016-04-18T13:34:18
|
|
ignore: fix directory limits when searching for star-star
In order to match the star-star, we disable the flag that's looking for
a single path element, but that leads to searching for the pattern in
the middle of elements in the input string.
Mark when we're handing a star-star so we jump over the elements in our
attempt to match the part of the pattern that comes after the star-star.
While here, tighten up the check so we don't allow invalid rules
through.
|
|
|
b8353236
|
2016-04-19T10:50:30
|
|
CI: run proxy tests with ctest
Running clar directly on appveyor makes it think the command returned
failure, so it stops the tests. Running it via ctest lets it go through.
|
|
|
0d72f67f
|
2016-03-14T17:36:04
|
|
proxy: don't specify the protocol in the type
We leave this up to the scheme in the url field. The type should only
tell us about whether we want a proxy and whether we want to auto-detect
it.
|
|
|
db01724f
|
2016-03-14T13:42:10
|
|
CI: start the proxy before the build so it's ready
It takes a bit for the propxy to get ready to accept connections, so
start it before the build so we can be reasonably sure that it's going
to be ready in time.
|
|
|
bf6f7ad2
|
2015-09-30T17:42:53
|
|
winhttp: correctly detect HTTPS usage
|
|
|
467e2cb1
|
2015-10-02T10:11:43
|
|
curl: ask for proxy credentials
|
|
|
60d717c6
|
2015-10-02T10:10:13
|
|
proxy: add a payload field for the proxy options
I don't quite recall what we do in the other places where we use this,
but we should pass this payload to the callbacks.
|
|
|
b373e9a6
|
2015-09-21T22:38:50
|
|
net: use proxy options struct in the stream config
|