Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-05-07 Thread Phillip Wood
On 07/05/2019 17:07, Junio C Hamano wrote: SZEDER Gábor writes: This patch and the topic 'pw/rebase-abort-clean-rewritten' can't be compiled on its own, because it starts using 'struct replay_opts' here, which is defined in 'sequencer.h', but 'builtin/rebase.c' doesn't include that header yet.

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-05-07 Thread Junio C Hamano
SZEDER Gábor writes: > This patch and the topic 'pw/rebase-abort-clean-rewritten' can't be > compiled on its own, because it starts using 'struct replay_opts' > here, which is defined in 'sequencer.h', but 'builtin/rebase.c' > doesn't include that header yet. (Though 'pu' already builds fine, >

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-05-07 Thread SZEDER Gábor
On Fri, Apr 26, 2019 at 11:32:12AM +0100, Phillip Wood wrote: > From: Phillip Wood > > When `rebase -r` finishes it removes any refs under refs/rewritten > that it has created. However if the rebase is aborted these refs are > not removed. This can cause problems for future rebases. For example I

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-05-03 Thread Phillip Wood
Hi Dscho On 03/05/2019 10:21, Johannes Schindelin wrote: Hi Phillip, On Wed, 1 May 2019, Phillip Wood wrote: On 30/04/2019 23:49, Johannes Schindelin wrote: On Tue, 30 Apr 2019, Phillip Wood wrote: On 29/04/2019 17:07, Johannes Schindelin wrote: On Fri, 26 Apr 2019, Phillip Wood wrote:

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-05-03 Thread Johannes Schindelin
Hi Phillip, On Wed, 1 May 2019, Phillip Wood wrote: > On 30/04/2019 23:49, Johannes Schindelin wrote: > > > > On Tue, 30 Apr 2019, Phillip Wood wrote: > > > > > On 29/04/2019 17:07, Johannes Schindelin wrote: > > > > > > > > On Fri, 26 Apr 2019, Phillip Wood wrote: > > > > > > > > > From: Phillip

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-05-01 Thread Phillip Wood
Hi Dscho On 30/04/2019 23:49, Johannes Schindelin wrote: Hi Phillip, On Tue, 30 Apr 2019, Phillip Wood wrote: On 29/04/2019 17:07, Johannes Schindelin wrote: On Fri, 26 Apr 2019, Phillip Wood wrote: From: Phillip Wood When `rebase -r` finishes it removes any refs under refs/rewritten th

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-04-30 Thread Johannes Schindelin
Hi Phillip, On Tue, 30 Apr 2019, Phillip Wood wrote: > On 29/04/2019 17:07, Johannes Schindelin wrote: > > > > On Fri, 26 Apr 2019, Phillip Wood wrote: > > > > > From: Phillip Wood > > > > > > When `rebase -r` finishes it removes any refs under refs/rewritten > > > that it has created. However i

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-04-30 Thread Phillip Wood
Hi Dscho On 29/04/2019 17:07, Johannes Schindelin wrote: Hi Phillip, On Fri, 26 Apr 2019, Phillip Wood wrote: From: Phillip Wood When `rebase -r` finishes it removes any refs under refs/rewritten that it has created. However if the rebase is aborted these refs are not removed. This can caus

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-04-29 Thread Johannes Schindelin
Hi Phillip, On Fri, 26 Apr 2019, Phillip Wood wrote: > From: Phillip Wood > > When `rebase -r` finishes it removes any refs under refs/rewritten > that it has created. However if the rebase is aborted these refs are > not removed. This can cause problems for future rebases. For example I > recen

[PATCH] rebase --abort: cleanup refs/rewritten

2019-04-26 Thread Phillip Wood
From: Phillip Wood When `rebase -r` finishes it removes any refs under refs/rewritten that it has created. However if the rebase is aborted these refs are not removed. This can cause problems for future rebases. For example I recently wanted to merge a updated version of a topic branch into an in