delta/libgit2.git/tests, branch ethomson/diff-read-empty-binary github.com: libgit2/libgit2.git diff: treat binary patches with no data special 2016-09-05T17:26:47+00:00 Edward Thomson ethomson@github.com 2016-09-02T07:03:45+00:00 adedac5aba9e4525475fd59d751cd02c6f2b3a4f When creating and printing diffs, deal with binary deltas that have binary data specially, versus diffs that have a binary file but lack the actual binary data. 
When creating and printing diffs, deal with binary deltas that have
binary data specially, versus diffs that have a binary file but lack the
actual binary data.
Merge pull request #3915 from pks-t/pks/index-collision-test-leak 2016-08-30T10:11:02+00:00 Carlos Martín Nieto carlosmn@github.com 2016-08-30T10:11:02+00:00 40b08124f26e6a1328fa35fc1c0f69911d31a2d8 tests: index: do not re-allocate index 
tests: index: do not re-allocate index
 git_checkout_tree options fix 2016-08-30T06:04:28+00:00 Stefan Huber steffhip@gmail.com 2016-08-23T23:20:39+00:00 88cfe61497dbf1f568e1c606f8b1c791602c71f4 According to the reference the git_checkout_tree and git_checkout_head functions should accept NULL in the opts field This was broken since the opts field was dereferenced and thus lead to a crash. 
According to the reference the git_checkout_tree and git_checkout_head
functions should accept NULL in the opts field

This was broken since the opts field was dereferenced and thus lead to a
crash.
tests: index: do not re-allocate index 2016-08-29T11:29:01+00:00 Patrick Steinhardt ps@pks.im 2016-08-29T11:09:58+00:00 86e88534d6ad2982d7519084e4323e93829a571c Plug a memory leak caused by re-allocating a `git_index` structure which has already been allocated by the test suite's initializer. 
Plug a memory leak caused by re-allocating a `git_index`
structure which has already been allocated by the test suite's
initializer.
Teach `git_patch_from_diff` about parsed diffs 2016-08-24T14:08:57+00:00 Edward Thomson ethomson@github.com 2016-08-24T04:38:39+00:00 b859faa61ce3f1fda5c29ac1e72a3d58fee2ede6 Ensure that `git_patch_from_diff` can return the patch for parsed diffs, not just generate a patch for a generated diff. 
Ensure that `git_patch_from_diff` can return the patch for parsed diffs,
not just generate a patch for a generated diff.
Merge pull request #3837 from novalis/dturner/indexv4 2016-08-17T14:24:44+00:00 Edward Thomson ethomson@github.com 2016-08-17T14:24:44+00:00 c1b370e9313a13df350974e2237997cc651a5d67 Support index v4 
Support index v4
 Merge pull request #3895 from pks-t/pks/negate-basename-in-subdirs 2016-08-17T13:54:48+00:00 Edward Thomson ethomson@github.com 2016-08-17T13:54:48+00:00 635a922274046ee077235b9764d0360e33d735ab ignore: allow unignoring basenames in subdirectories 
ignore: allow unignoring basenames in subdirectories
 ignore: allow unignoring basenames in subdirectories 2016-08-12T12:47:54+00:00 Patrick Steinhardt ps@pks.im 2016-08-12T07:06:15+00:00 fcb2c1c8956200f49263e6e0b3c681d100af4734 The .gitignore file allows for patterns which unignore previous ignore patterns. When unignoring a previous pattern, there are basically three cases how this is matched when no globbing is used: 1. when a previous file has been ignored, it can be unignored by using its exact name, e.g. foo/bar !foo/bar 2. when a file in a subdirectory has been ignored, it can be unignored by using its basename, e.g. foo/bar !bar 3. when all files with a basename are ignored, a specific file can be unignored again by specifying its path in a subdirectory, e.g. bar !foo/bar The first problem in libgit2 is that we did not correctly treat the second case. While we verified that the negative pattern matches the tail of the positive one, we did not verify if it only matches the basename of the positive pattern. So e.g. we would have also negated a pattern like foo/fruz_bar !bar Furthermore, we did not check for the third case, where a basename is being unignored in a certain subdirectory again. Both issues are fixed with this commit. 
The .gitignore file allows for patterns which unignore previous
ignore patterns. When unignoring a previous pattern, there are
basically three cases how this is matched when no globbing is
used:

1. when a previous file has been ignored, it can be unignored by
   using its exact name, e.g.

   foo/bar
   !foo/bar

2. when a file in a subdirectory has been ignored, it can be
   unignored by using its basename, e.g.

   foo/bar
   !bar

3. when all files with a basename are ignored, a specific file
   can be unignored again by specifying its path in a
   subdirectory, e.g.

   bar
   !foo/bar

The first problem in libgit2 is that we did not correctly treat
the second case. While we verified that the negative pattern
matches the tail of the positive one, we did not verify if it
only matches the basename of the positive pattern. So e.g. we
would have also negated a pattern like

    foo/fruz_bar
    !bar

Furthermore, we did not check for the third case, where a
basename is being unignored in a certain subdirectory again.

Both issues are fixed with this commit.
index: support index v4 2016-08-10T18:19:30+00:00 David Turner dturner@twopensource.com 2016-05-17T19:40:32+00:00 5625d86b994fd81f1b0d887890e8168d7b5f46cc Support reading and writing index v4. Index v4 uses a very simple compression scheme for pathnames, but is otherwise similar to index v3. Signed-off-by: David Turner <dturner@twitter.com> 
Support reading and writing index v4.  Index v4 uses a very simple
compression scheme for pathnames, but is otherwise similar to index v3.

Signed-off-by: David Turner <dturner@twitter.com>
varint: Add varint encoding/decoding 2016-08-10T18:19:06+00:00 David Turner dturner@twopensource.com 2016-05-17T19:40:46+00:00 aeb5ee5ab50a062aac02ca084b02582430669808 This code is ported from git.git Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: David Turner <dturner@twopensource.com> 
This code is ported from git.git

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: David Turner <dturner@twopensource.com>