RE: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Kerry, Richard
---Original Message- > From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Tuesday, December 05, 2017 4:06 PM > To: Kerry, Richard > Cc: git@vger.kernel.org; Johannes Schindelin > ; p...@peff.net; liam Beguin > > Subject: Re: [PATCH v2 6/9] rebase -i: update functions to

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Junio C Hamano
"Kerry, Richard" writes: > "Shorted" is what happens when you put a piece of wire across the terminals > of a battery ... (bang, smoke, etc). > It's short for "short-circuited". Or it is what you do to something that you sell and that you yet do not own, expecting that you can later buy it chea

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread liam Beguin
Hi, On 05/12/17 07:41 AM, Kerry, Richard wrote: > > "Shorted" is what happens when you put a piece of wire across the terminals > of a battery ... (bang, smoke, etc). > It's short for "short-circuited". > Yes, I think you mean "shortened" in this case. > Thanks for the explanation. Sorry, my e

RE: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Kerry, Richard
f Of Junio C Hamano > Sent: Tuesday, December 05, 2017 12:37 PM > To: liam Beguin > Cc: Johannes Schindelin ; > git@vger.kernel.org; p...@peff.net > Subject: Re: [PATCH v2 6/9] rebase -i: update functions to use a flags > parameter > > liam Beguin writes: > > > I&#

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Junio C Hamano
liam Beguin writes: > I'll change it to TODO_LIST_SHORTED_IDs. TODO_LIST_SHORTED_INSNS would > suggest the flag changes both parts of the todo. I am not a native speaker, but SHORTED does not sound like a right phrase. When you make something shorter, that thing is "shortened", not "shorted".

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-04 Thread liam Beguin
Hi Johannes, On 04/12/17 10:46 AM, Johannes Schindelin wrote: > Hi Liam, > > On Sun, 3 Dec 2017, Liam Beguin wrote: > >> diff --git a/sequencer.h b/sequencer.h >> index 4e444e3bf1c4..3bb6b0658192 100644 >> --- a/sequencer.h >> +++ b/sequencer.h >> @@ -45,10 +45,12 @@ int sequencer_continue(struc

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-04 Thread Johannes Schindelin
Hi Liam, On Mon, 4 Dec 2017, Johannes Schindelin wrote: > On Sun, 3 Dec 2017, Liam Beguin wrote: > > > diff --git a/sequencer.h b/sequencer.h > > index 4e444e3bf1c4..3bb6b0658192 100644 > > --- a/sequencer.h > > +++ b/sequencer.h > > @@ -45,10 +45,12 @@ int sequencer_continue(struct replay_opts

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-04 Thread Johannes Schindelin
Hi Liam, On Sun, 3 Dec 2017, Liam Beguin wrote: > diff --git a/sequencer.h b/sequencer.h > index 4e444e3bf1c4..3bb6b0658192 100644 > --- a/sequencer.h > +++ b/sequencer.h > @@ -45,10 +45,12 @@ int sequencer_continue(struct replay_opts *opts); > int sequencer_rollback(struct replay_opts *opts); >

[PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-03 Thread Liam Beguin
Update functions used in the rebase--helper so that they take a generic 'flags' parameter instead of a growing list of options. Signed-off-by: Liam Beguin --- builtin/rebase--helper.c | 13 +++-- sequencer.c | 9 + sequencer.h | 8 +--- 3 files cha