<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/libgit2.git/tests, branch cmn/diff-binary-patch</title>
<subtitle>github.com: libgit2/libgit2.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/'/>
<entry>
<title>binary diff: test that the diff and patch otputs are the same</title>
<updated>2015-06-24T12:33:02+00:00</updated>
<author>
<name>Carlos Martín Nieto</name>
<email>cmn@dwim.me</email>
</author>
<published>2015-06-24T12:25:36+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=76633215d155dff2d5cda302aa868043b2c7090c'/>
<id>76633215d155dff2d5cda302aa868043b2c7090c</id>
<content type='text'>
We test the generation of the textual patch via the patch function,
which are just one of two possibilities to get the output.

Add a second patch generation via the diff function to make sure both
outputs are in sync.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
We test the generation of the textual patch via the patch function,
which are just one of two possibilities to get the output.

Add a second patch generation via the diff function to make sure both
outputs are in sync.
</pre>
</div>
</content>
</entry>
<entry>
<title>Fixed Xcode 6.1 build warnings</title>
<updated>2015-06-24T03:57:09+00:00</updated>
<author>
<name>Pierre-Olivier Latour</name>
<email>pol@mac.com</email>
</author>
<published>2015-06-24T03:57:09+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=8113056c7a9e3efc543e75147fe72a25405fc9f3'/>
<id>8113056c7a9e3efc543e75147fe72a25405fc9f3</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #3222 from git-up/conflicted</title>
<updated>2015-06-24T03:52:03+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@edwardthomson.com</email>
</author>
<published>2015-06-24T03:52:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=cc605e73acad8b665c3b89a645eae9de4299774b'/>
<id>cc605e73acad8b665c3b89a645eae9de4299774b</id>
<content type='text'>
Fixed GIT_DELTA_CONFLICTED not returned in some cases</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fixed GIT_DELTA_CONFLICTED not returned in some cases</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #3226 from libgit2/cmn/racy-diff-again</title>
<updated>2015-06-24T03:30:58+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@edwardthomson.com</email>
</author>
<published>2015-06-24T03:30:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=bd670abd23944a20c6a84978ea590c8fd4258cb2'/>
<id>bd670abd23944a20c6a84978ea590c8fd4258cb2</id>
<content type='text'>
racy-git, the missing link</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
racy-git, the missing link</pre>
</div>
</content>
</entry>
<entry>
<title>repository: check the format version</title>
<updated>2015-06-23T18:44:27+00:00</updated>
<author>
<name>Carlos Martín Nieto</name>
<email>cmn@dwim.me</email>
</author>
<published>2015-06-23T18:44:27+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=16c73d3804407e338c7f88d5a076e3eb9786fe56'/>
<id>16c73d3804407e338c7f88d5a076e3eb9786fe56</id>
<content type='text'>
This is something we do on re-init but not when opening a
repository. This hasn't particularly mattered up to now as the version
has been 0 ever since the first release of git, but the times, they're
a-changing and we will soon see version 1 in the wild. We need to make
sure we don't open those.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This is something we do on re-init but not when opening a
repository. This hasn't particularly mattered up to now as the version
has been 0 ever since the first release of git, but the times, they're
a-changing and we will soon see version 1 in the wild. We need to make
sure we don't open those.
</pre>
</div>
</content>
</entry>
<entry>
<title>Fixed GIT_DELTA_CONFLICTED not returned in some cases</title>
<updated>2015-06-23T14:48:26+00:00</updated>
<author>
<name>Pierre-Olivier Latour</name>
<email>pol@mac.com</email>
</author>
<published>2015-06-15T18:14:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=8d8a2eefef0fbb42d7a7fb8f88ca7481515e2737'/>
<id>8d8a2eefef0fbb42d7a7fb8f88ca7481515e2737</id>
<content type='text'>
If an index entry for a file that is not in HEAD is in conflicted state,
when diffing HEAD with the index, the status field of the corresponding git_diff_delta was incorrectly reported as GIT_DELTA_ADDED instead of GIT_DELTA_CONFLICTED.

This was due to handle_unmatched_new_item() initially setting the status
to GIT_DELTA_CONFLICTED but then overriding it later with GIT_DELTA_ADDED.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
If an index entry for a file that is not in HEAD is in conflicted state,
when diffing HEAD with the index, the status field of the corresponding git_diff_delta was incorrectly reported as GIT_DELTA_ADDED instead of GIT_DELTA_CONFLICTED.

This was due to handle_unmatched_new_item() initially setting the status
to GIT_DELTA_CONFLICTED but then overriding it later with GIT_DELTA_ADDED.
</pre>
</div>
</content>
</entry>
<entry>
<title>Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()</title>
<updated>2015-06-23T04:37:41+00:00</updated>
<author>
<name>Pierre-Olivier Latour</name>
<email>pol@mac.com</email>
</author>
<published>2015-06-17T15:55:09+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=cb63e7e8971134e41e99a7010d9b2ad54e6639ff'/>
<id>cb63e7e8971134e41e99a7010d9b2ad54e6639ff</id>
<content type='text'>
This fixes a bug where if a file was in conflicted state in either diff,
it would not always remain in conflicted state in the merged diff.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This fixes a bug where if a file was in conflicted state in either diff,
it would not always remain in conflicted state in the merged diff.
</pre>
</div>
</content>
</entry>
<entry>
<title>crlf tests: ensure that Unix obeys autocrlf=true</title>
<updated>2015-06-22T16:00:26+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@edwardthomson.com</email>
</author>
<published>2015-06-09T03:50:00+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=1e46d54584ea46f024f24a913200568b5694a7a7'/>
<id>1e46d54584ea46f024f24a913200568b5694a7a7</id>
<content type='text'>
All platforms do terrible, horrible, no good, very bad translation
when core.autocrlf=true.  It's not just Windows!
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
All platforms do terrible, horrible, no good, very bad translation
when core.autocrlf=true.  It's not just Windows!
</pre>
</div>
</content>
</entry>
<entry>
<title>git_buf_text_lf_to_crlf: allow mixed line endings</title>
<updated>2015-06-22T16:00:23+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@microsoft.com</email>
</author>
<published>2015-06-08T17:51:28+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=8293c8f9a3ea18131af98b71fa9100dcba0ad438'/>
<id>8293c8f9a3ea18131af98b71fa9100dcba0ad438</id>
<content type='text'>
Allow files to have mixed line endings instead of skipping processing
on them.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Allow files to have mixed line endings instead of skipping processing
on them.
</pre>
</div>
</content>
</entry>
<entry>
<title>clar: support hierarchical test resource data</title>
<updated>2015-06-22T16:00:15+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@microsoft.com</email>
</author>
<published>2015-06-08T15:55:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=71686ddca660a3544c5aa6d4a34d1d06c031f4f9'/>
<id>71686ddca660a3544c5aa6d4a34d1d06c031f4f9</id>
<content type='text'>
Support hierarchical test resource data, such that you can have
`tests/resources/foo/bar` and move the `bar` directory in as
a fixture.

Calling `cl_fixture_sandbox` on a path that is not directly beneath
the test resources directory succeeds, placing that directory into
the test fixture.  (For example, `cl_fixture_sandbox("foo/bar")`
will sandbox the `foo/bar` directory as `bar`).

Add support for cleaning up directories created this way, by only
cleaning up the basename (in this example, `bar`) from the fixture
directory.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Support hierarchical test resource data, such that you can have
`tests/resources/foo/bar` and move the `bar` directory in as
a fixture.

Calling `cl_fixture_sandbox` on a path that is not directly beneath
the test resources directory succeeds, placing that directory into
the test fixture.  (For example, `cl_fixture_sandbox("foo/bar")`
will sandbox the `foo/bar` directory as `bar`).

Add support for cleaning up directories created this way, by only
cleaning up the basename (in this example, `bar`) from the fixture
directory.
</pre>
</div>
</content>
</entry>
</feed>
