<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/libgit2.git/tests/rebase, branch peff/binary-search-do-while</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>tests: rebase::submodule: verify initialization method calls</title>
<updated>2017-07-28T07:01:41+00:00</updated>
<author>
<name>Patrick Steinhardt</name>
<email>ps@pks.im</email>
</author>
<published>2017-07-28T07:01:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=c0558c62989215d724ebc3b267ae1022618c49e8'/>
<id>c0558c62989215d724ebc3b267ae1022618c49e8</id>
<content type='text'>
Some return codes for functions which may fail are not being checked in
`test_rebase_submodule__initialize`. This may lead us to not notice
errors when initializing the environment and would possibly result in
either memory corruption or segfaults as soon as any of the
initialization steps fails. Fix this by wrapping these function calls
into `cl_git_pass`.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Some return codes for functions which may fail are not being checked in
`test_rebase_submodule__initialize`. This may lead us to not notice
errors when initializing the environment and would possibly result in
either memory corruption or segfaults as soon as any of the
initialization steps fails. Fix this by wrapping these function calls
into `cl_git_pass`.
</pre>
</div>
</content>
</entry>
<entry>
<title>tests: fix the rebase-submodule test</title>
<updated>2017-07-25T18:38:44+00:00</updated>
<author>
<name>Etienne Samson</name>
<email>samson.etienne@gmail.com</email>
</author>
<published>2017-07-20T21:00:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=35cb7b840d54030efdb22a0a908dd6acfd247aa7'/>
<id>35cb7b840d54030efdb22a0a908dd6acfd247aa7</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: ignore untracked files in submodules</title>
<updated>2017-03-03T20:07:54+00:00</updated>
<author>
<name>David Turner</name>
<email>dturner@twosigma.com</email>
</author>
<published>2017-03-03T18:27:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=2270ca9f8feecf93fe39a02a6fbde90a22c1a665'/>
<id>2270ca9f8feecf93fe39a02a6fbde90a22c1a665</id>
<content type='text'>
An untracked file in a submodule should not prevent a rebase from
starting.  Even if the submodule's SHA is changed, and that file would
conflict with a new tracked file, it's still OK to start the rebase
and discover the conflict later.

Signed-off-by: David Turner &lt;dturner@twosigma.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
An untracked file in a submodule should not prevent a rebase from
starting.  Even if the submodule's SHA is changed, and that file would
conflict with a new tracked file, it's still OK to start the rebase
and discover the conflict later.

Signed-off-by: David Turner &lt;dturner@twosigma.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: plug a leak in the tests</title>
<updated>2016-12-17T00:55:06+00:00</updated>
<author>
<name>Carlos Martín Nieto</name>
<email>cmn@dwim.me</email>
</author>
<published>2016-12-17T00:55:06+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=f7dcd58cc722d501665bc8c5b53945859b8b0615'/>
<id>f7dcd58cc722d501665bc8c5b53945859b8b0615</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>git_rebase_init: correctly handle detached HEAD</title>
<updated>2016-12-02T04:11:57+00:00</updated>
<author>
<name>David Turner</name>
<email>dturner@twosigma.com</email>
</author>
<published>2016-12-02T04:06:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=4db1fc7e5ead5c29ffb6594b229b84f4392b40f1'/>
<id>4db1fc7e5ead5c29ffb6594b229b84f4392b40f1</id>
<content type='text'>
git_rebase_finish relies on head_detached being set, but
rebase_init_merge was only setting it when branch-&gt;ref_name was unset.
But branch-&gt;ref_name would be set to "HEAD" in the case of detached
HEAD being either implicitly (NULL) or explicitly passed to
git_rebase_init.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
git_rebase_finish relies on head_detached being set, but
rebase_init_merge was only setting it when branch-&gt;ref_name was unset.
But branch-&gt;ref_name would be set to "HEAD" in the case of detached
HEAD being either implicitly (NULL) or explicitly passed to
git_rebase_init.
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: test rebasing a new commit with subfolder</title>
<updated>2016-06-02T07:38:18+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-06-02T06:58:25+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=5acf18ac6304fc216f1adecba64d61c895a883c8'/>
<id>5acf18ac6304fc216f1adecba64d61c895a883c8</id>
<content type='text'>
Test a rebase (both a merge rebase and an inmemory rebase) with a new
commit that adds files underneath a new subfolder.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Test a rebase (both a merge rebase and an inmemory rebase) with a new
commit that adds files underneath a new subfolder.
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: test rebase (merge) w/ no common ancestor</title>
<updated>2016-05-03T19:29:44+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-05-03T19:22:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=c7b4bbffcc559b03422f81d7c11ac762e2753fbf'/>
<id>c7b4bbffcc559b03422f81d7c11ac762e2753fbf</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase::abort: test we can abort rebase by revspec</title>
<updated>2016-04-26T15:49:05+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-04-26T15:48:11+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=b3ffd8f63840b2401fa2e636163512a8f0f17b47'/>
<id>b3ffd8f63840b2401fa2e636163512a8f0f17b47</id>
<content type='text'>
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.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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.
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: correctly finish rebasing detached heads</title>
<updated>2016-04-21T22:19:05+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-04-21T22:16:37+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=1f84caf0c0e1bb1c1b4b228cec618d4f3ab3e408'/>
<id>1f84caf0c0e1bb1c1b4b228cec618d4f3ab3e408</id>
<content type='text'>
When rebasing with IDs, we do not return to the `branch`,
we remain in a detached HEAD state.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When rebasing with IDs, we do not return to the `branch`,
we remain in a detached HEAD state.
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: test abort immediately after init</title>
<updated>2016-04-21T22:19:05+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-04-21T21:03:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=320f53cd6c95cdf19f2c157b50561fdd48193fe7'/>
<id>320f53cd6c95cdf19f2c157b50561fdd48193fe7</id>
<content type='text'>
Instead of `open`ing a rebase and `abort`ing that, test that we can
`abort` a rebase that has just begun with `init`.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Instead of `open`ing a rebase and `abort`ing that, test that we can
`abort` a rebase that has just begun with `init`.
</pre>
</div>
</content>
</entry>
</feed>
