<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/libgit2.git, branch rb/fix-submodules-with-tracked-content</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>Update submodules with parent-tracked content</title>
<updated>2014-04-08T21:47:20+00:00</updated>
<author>
<name>Russell Belfer</name>
<email>rb@github.com</email>
</author>
<published>2014-04-08T21:47:20+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=eb7e17cc900f1f59f653cd7b277750fb1d5b721a'/>
<id>eb7e17cc900f1f59f653cd7b277750fb1d5b721a</id>
<content type='text'>
This updates how libgit2 treats submodule-like directories that
actually have tracked content inside of them.  This is a strange
corner case, but it seems that many people have abortive submodule
setups and then just went ahead and added the files into the
parent repository.  In this case, we should just treat the
submodule as if it was a normal directory.

Libgit2 will still try to skip over real submodules and contained
repositories that do not have tracked files inside them, but this
adds some new handling for cases where the apparently submodule
data is in conflict with the actual list of tracked files.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This updates how libgit2 treats submodule-like directories that
actually have tracked content inside of them.  This is a strange
corner case, but it seems that many people have abortive submodule
setups and then just went ahead and added the files into the
parent repository.  In this case, we should just treat the
submodule as if it was a normal directory.

Libgit2 will still try to skip over real submodules and contained
repositories that do not have tracked files inside them, but this
adds some new handling for cases where the apparently submodule
data is in conflict with the actual list of tracked files.
</pre>
</div>
</content>
</entry>
<entry>
<title>graph: handle not finding a merge base gracefully</title>
<updated>2014-04-08T14:52:20+00:00</updated>
<author>
<name>Carlos Martín Nieto</name>
<email>cmn@dwim.me</email>
</author>
<published>2014-04-08T14:52:20+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=ce2e82694a19b9994acaa9376bff81bc8e968637'/>
<id>ce2e82694a19b9994acaa9376bff81bc8e968637</id>
<content type='text'>
git_merge_base() returns GIT_ENOTFOUND when it cannot find a merge
base. graph_desdendant_of() returns a boolean value (barring any
errors), so it needs to catch the NOTFOUND return value and convert it
into false, as not merge base means it cannot be a descendant.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
git_merge_base() returns GIT_ENOTFOUND when it cannot find a merge
base. graph_desdendant_of() returns a boolean value (barring any
errors), so it needs to catch the NOTFOUND return value and convert it
into false, as not merge base means it cannot be a descendant.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #2256 from jacquesg/graph-descendant</title>
<updated>2014-04-08T14:37:39+00:00</updated>
<author>
<name>Vicent Marti</name>
<email>vicent@github.com</email>
</author>
<published>2014-04-08T14:37:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=2795fb4ddd69ca72828c2d4f1b94b77e4d91db48'/>
<id>2795fb4ddd69ca72828c2d4f1b94b77e4d91db48</id>
<content type='text'>
Correct grouping of parentheses</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Correct grouping of parentheses</pre>
</div>
</content>
</entry>
<entry>
<title>Added a no path test for git_graph_descendant_of</title>
<updated>2014-04-08T14:32:06+00:00</updated>
<author>
<name>Jacques Germishuys</name>
<email>jacquesg@striata.com</email>
</author>
<published>2014-04-08T14:20:49+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=8a8e312792807dda38fbe417ec5d511f767f3ace'/>
<id>8a8e312792807dda38fbe417ec5d511f767f3ace</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Correct grouping of parentheses</title>
<updated>2014-04-08T14:30:26+00:00</updated>
<author>
<name>Jacques Germishuys</name>
<email>jacquesg@striata.com</email>
</author>
<published>2014-04-08T13:46:45+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=56f8e06e4985f7b14c1bf7c526a5195ba24fd6ee'/>
<id>56f8e06e4985f7b14c1bf7c526a5195ba24fd6ee</id>
<content type='text'>
git_graph_descendant_of was returning the result of an assignment
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
git_graph_descendant_of was returning the result of an assignment
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #2255 from libgit2/rb/fix-multiple-nfd-iconv-bug</title>
<updated>2014-04-07T18:51:39+00:00</updated>
<author>
<name>Vicent Marti</name>
<email>vicent@github.com</email>
</author>
<published>2014-04-07T18:51:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=5f74c476939894c4512262ec11188a44bfe4f50a'/>
<id>5f74c476939894c4512262ec11188a44bfe4f50a</id>
<content type='text'>
Fix bug with multiple iconv conversions in one dir</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix bug with multiple iconv conversions in one dir</pre>
</div>
</content>
</entry>
<entry>
<title>vmg is always right</title>
<updated>2014-04-07T18:51:12+00:00</updated>
<author>
<name>Russell Belfer</name>
<email>rb@github.com</email>
</author>
<published>2014-04-07T18:51:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=7167fd7ef80f5f34337dd1c696f77ea2bb4d8bd8'/>
<id>7167fd7ef80f5f34337dd1c696f77ea2bb4d8bd8</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix bug with multiple iconv conversions in one dir</title>
<updated>2014-04-07T18:45:32+00:00</updated>
<author>
<name>Russell Belfer</name>
<email>rb@github.com</email>
</author>
<published>2014-04-07T18:45:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=c813b345503f7b086da7ca1b2d95270e00594323'/>
<id>c813b345503f7b086da7ca1b2d95270e00594323</id>
<content type='text'>
The internal buffer in the `git_path_iconv_t` structure was not
being reset before the calls to `iconv` were made to convert data,
so if there were multiple decomposed Unicode paths in a single
directory, paths after the first one were being appended to the
first instead of treated as independent data.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The internal buffer in the `git_path_iconv_t` structure was not
being reset before the calls to `iconv` were made to convert data,
so if there were multiple decomposed Unicode paths in a single
directory, paths after the first one were being appended to the
first instead of treated as independent data.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #2249 from libgit2/rb/starstar-fnmatch</title>
<updated>2014-04-07T09:22:23+00:00</updated>
<author>
<name>Vicent Marti</name>
<email>vicent@github.com</email>
</author>
<published>2014-04-07T09:22:23+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=6720eef938d7614cd7a9fd2138a27da3667d62cf'/>
<id>6720eef938d7614cd7a9fd2138a27da3667d62cf</id>
<content type='text'>
Add support for ** matches in ignores</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Add support for ** matches in ignores</pre>
</div>
</content>
</entry>
<entry>
<title>Fix fnmatch comment to be clearer</title>
<updated>2014-04-06T18:20:22+00:00</updated>
<author>
<name>Russell Belfer</name>
<email>rb@github.com</email>
</author>
<published>2014-04-06T18:20:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=c7d9606066d3a9b75a87c4ca5dd3420a66d0b54f'/>
<id>c7d9606066d3a9b75a87c4ca5dd3420a66d0b54f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
