<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/libgit2.git/src/rebase.c, branch cmn/https-cap-no-hardcode</title>
<subtitle>github.com: libgit2/libgit2.git
</subtitle>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/libgit2.git/'/>
<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://trove.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: don't ask for time sorting</title>
<updated>2016-10-06T09:04:55+00:00</updated>
<author>
<name>Carlos Martín Nieto</name>
<email>cmn@dwim.me</email>
</author>
<published>2016-10-05T10:57:53+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/libgit2.git/commit/?id=3cc5ec94f8d4753d00e7c407d0033187fe79eb08'/>
<id>3cc5ec94f8d4753d00e7c407d0033187fe79eb08</id>
<content type='text'>
`git-rebase--merge` does not ask for time sorting, but uses the default. We now
produce the same default time-ordered output as git, so make us of that since
it's not always the same output as our time sorting.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
`git-rebase--merge` does not ask for time sorting, but uses the default. We now
produce the same default time-ordered output as git, so make us of that since
it's not always the same output as our time sorting.
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: change assertion to avoid</title>
<updated>2016-06-01T15:03:52+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-05-26T17:42:43+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/libgit2.git/commit/?id=4505a42a23cfb55fcfd88d89d150686a78636805'/>
<id>4505a42a23cfb55fcfd88d89d150686a78636805</id>
<content type='text'>
It looks like we're getting the operation and not doing anything
with it, when in fact we are asserting that it's not null.  Simply
assert that we are within the operation boundary instead of using
the `git_array_get` macro to do this for us.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
It looks like we're getting the operation and not doing anything
with it, when in fact we are asserting that it's not null.  Simply
assert that we are within the operation boundary instead of using
the `git_array_get` macro to do this for us.
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: handle no common ancestor for inmemory</title>
<updated>2016-05-03T19:29:50+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-05-03T19:29:50+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/libgit2.git/commit/?id=9a363d1b266d24f3641dc1cc2aa14be54dcfa3cf'/>
<id>9a363d1b266d24f3641dc1cc2aa14be54dcfa3cf</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</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://trove.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: handle detached HEADs in `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:29:19+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/libgit2.git/commit/?id=badc72838fdc387eaf96e01bd414a47369b95e8b'/>
<id>badc72838fdc387eaf96e01bd414a47369b95e8b</id>
<content type='text'>
When `init`ing a rebase from a detached HEAD, be sure to remember
that we were in a detached HEAD state so that we can correctly
`abort` the object that we just created.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When `init`ing a rebase from a detached HEAD, be sure to remember
that we were in a detached HEAD state so that we can correctly
`abort` the object that we just created.
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: plug memory leak in `rebase_alloc`</title>
<updated>2016-02-23T11:07:36+00:00</updated>
<author>
<name>Patrick Steinhardt</name>
<email>ps@pks.im</email>
</author>
<published>2016-02-22T15:05:13+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/libgit2.git/commit/?id=2afb6fa46df25ef77a166b92304cc6e725103c7c'/>
<id>2afb6fa46df25ef77a166b92304cc6e725103c7c</id>
<content type='text'>
Convert `rebase_alloc` to use our usual error propagation
patterns, that is accept an out-parameter and return an error
code that is to be checked by the caller. This allows us to use
the GITERR_CHECK_ALLOC macro, which helps static analysis.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Convert `rebase_alloc` to use our usual error propagation
patterns, that is accept an out-parameter and return an error
code that is to be checked by the caller. This allows us to use
the GITERR_CHECK_ALLOC macro, which helps static analysis.
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: persist a single in-memory index</title>
<updated>2016-02-15T19:27:06+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-02-15T17:16:00+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/libgit2.git/commit/?id=f28bae0c380467409515ffd25247f3204dcc4019'/>
<id>f28bae0c380467409515ffd25247f3204dcc4019</id>
<content type='text'>
When performing an in-memory rebase, keep a single index for the
duration, so that callers have the expected index lifecycle and
do not hold on to an index that is free'd out from under them.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When performing an in-memory rebase, keep a single index for the
duration, so that callers have the expected index lifecycle and
do not hold on to an index that is free'd out from under them.
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: allow custom merge_options</title>
<updated>2016-02-11T18:49:25+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-02-11T18:11:21+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/libgit2.git/commit/?id=a202e0d45bcfd672cf1ff75abc192e6a592874ba'/>
<id>a202e0d45bcfd672cf1ff75abc192e6a592874ba</id>
<content type='text'>
Allow callers of rebase to specify custom merge options.  This may
allow custom conflict resolution, or failing fast when conflicts
are detected.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Allow callers of rebase to specify custom merge options.  This may
allow custom conflict resolution, or failing fast when conflicts
are detected.
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: introduce inmemory rebasing</title>
<updated>2016-02-11T18:48:48+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-02-11T18:48:48+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/libgit2.git/commit/?id=ee6673070a6134f0a1743c866583b14a305b6a43'/>
<id>ee6673070a6134f0a1743c866583b14a305b6a43</id>
<content type='text'>
Introduce the ability to rebase in-memory or in a bare repository.

When `rebase_options.inmemory` is specified, the resultant `git_rebase`
session will not be persisted to disk.  Callers may still analyze
the rebase operations, resolve any conflicts against the in-memory
index and create the commits.  Neither `HEAD` nor the working
directory will be updated during this process.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Introduce the ability to rebase in-memory or in a bare repository.

When `rebase_options.inmemory` is specified, the resultant `git_rebase`
session will not be persisted to disk.  Callers may still analyze
the rebase operations, resolve any conflicts against the in-memory
index and create the commits.  Neither `HEAD` nor the working
directory will be updated during this process.
</pre>
</div>
</content>
</entry>
</feed>
