<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/libgit2.git/src, branch cmn/diff-binary-patch</title>
<subtitle>github.com: libgit2/libgit2.git
</subtitle>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/'/>
<entry>
<title>Fixed invalid error handling in git_repository_open_ext()</title>
<updated>2015-06-24T03:59:03+00:00</updated>
<author>
<name>Pierre-Olivier Latour</name>
<email>pol@mac.com</email>
</author>
<published>2015-06-24T03:59:03+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=6a8f3fa85044243d9103283a899bc8058b3149fe'/>
<id>6a8f3fa85044243d9103283a899bc8058b3149fe</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://91.123.203.49/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://91.123.203.49/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://91.123.203.49/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>repository: don't error out if there is no version</title>
<updated>2015-06-23T18:43:49+00:00</updated>
<author>
<name>Carlos Martín Nieto</name>
<email>cmn@dwim.me</email>
</author>
<published>2015-06-23T18:43:49+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=99e11cdd0231ec84ac0d0fc476803f067da97a34'/>
<id>99e11cdd0231ec84ac0d0fc476803f067da97a34</id>
<content type='text'>
git will assume the repository format version is 0 if the value is not
there. Do the same.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
git will assume the repository format version is 0 if the value is not
there. Do the same.
</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://91.123.203.49/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://91.123.203.49/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: give Unix the glory of autocrlf=true</title>
<updated>2015-06-22T16:00:30+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@edwardthomson.com</email>
</author>
<published>2015-06-09T00:42:28+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=146d0d084ea06527038e27549a8d4724d4fe5022'/>
<id>146d0d084ea06527038e27549a8d4724d4fe5022</id>
<content type='text'>
Perform LF-&gt;CRLF for core.autocrlf=true on non-Win32 because core
git does.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Perform LF-&gt;CRLF for core.autocrlf=true on non-Win32 because core
git does.
</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://91.123.203.49/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>crlf: use statistics to control to workdir filter</title>
<updated>2015-06-22T16:00:19+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@microsoft.com</email>
</author>
<published>2015-06-08T19:58:54+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=47e9a6cb0573aa2190ddabadb94c0a89ae14ba52'/>
<id>47e9a6cb0573aa2190ddabadb94c0a89ae14ba52</id>
<content type='text'>
Use statistics (like core git) to control the behavior of the
to workdir CRLF filter.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Use statistics (like core git) to control the behavior of the
to workdir CRLF filter.
</pre>
</div>
</content>
</entry>
</feed>
