Re: [PATCH 4/5] rebase -i: learn to abbreviate command names

2017-12-02 Thread Junio C Hamano
Johannes Schindelin writes: > I am a fan of not relying too heavily on compiler optimization and e.g. > extract code from loops when it does not need to be evaluated every single > iteration. In this case: > > const char *pick = abbreviate_commands ? "p" : "pick"; > ... >

Re: [PATCH 4/5] rebase -i: learn to abbreviate command names

2017-11-29 Thread Johannes Schindelin
Hi Liam, On Tue, 28 Nov 2017, liam Beguin wrote: > On 27/11/17 06:04 PM, Johannes Schindelin wrote: > > > > On Sun, 26 Nov 2017, Liam Beguin wrote: > > > >> @@ -2483,7 +2491,9 @@ int sequencer_make_script(int keep_empty, FILE *out, > >>strbuf_reset(&buf); > >>if (!keep_e

Re: [PATCH 4/5] rebase -i: learn to abbreviate command names

2017-11-28 Thread liam Beguin
Hi Johannes, On 27/11/17 06:04 PM, Johannes Schindelin wrote: > Hi Liam, > > On Sun, 26 Nov 2017, Liam Beguin wrote: > >> diff --git a/Documentation/rebase-config.txt >> b/Documentation/rebase-config.txt >> index 30ae08cb5a4b..0820b60f6e12 100644 >> --- a/Documentation/rebase-config.txt >> +++

Re: [PATCH 4/5] rebase -i: learn to abbreviate command names

2017-11-28 Thread liam Beguin
Hi Peff, Thanks for taking the time to test this, I'll squash that patch in v2. On 27/11/17 06:11 PM, Jeff King wrote: > On Tue, Nov 28, 2017 at 12:04:45AM +0100, Johannes Schindelin wrote: > >>> +rebase.abbreviateCommands:: >>> + If set to true, `git rebase` will use abbreviated command names

Re: [PATCH 4/5] rebase -i: learn to abbreviate command names

2017-11-28 Thread liam Beguin
Hi Junio, On 27/11/17 12:19 AM, Junio C Hamano wrote: > Liam Beguin writes: > >> if (command == MAKE_SCRIPT && argc > 1) >> -return !!sequencer_make_script(keep_empty, stdout, argc, argv); >> +return !!sequencer_make_script(keep_empty, abbreviate_commands, >> +

Re: [PATCH 4/5] rebase -i: learn to abbreviate command names

2017-11-27 Thread Jeff King
On Tue, Nov 28, 2017 at 12:04:45AM +0100, Johannes Schindelin wrote: > > +rebase.abbreviateCommands:: > > + If set to true, `git rebase` will use abbreviated command names in the > > + todo list resulting in something like this: > > + > > +--- > > + p

Re: [PATCH 4/5] rebase -i: learn to abbreviate command names

2017-11-27 Thread Johannes Schindelin
Hi Liam, On Sun, 26 Nov 2017, Liam Beguin wrote: > diff --git a/Documentation/rebase-config.txt b/Documentation/rebase-config.txt > index 30ae08cb5a4b..0820b60f6e12 100644 > --- a/Documentation/rebase-config.txt > +++ b/Documentation/rebase-config.txt > @@ -30,3 +30,22 @@ rebase.instructionFormat

Re: [PATCH 4/5] rebase -i: learn to abbreviate command names

2017-11-26 Thread Junio C Hamano
Liam Beguin writes: > if (command == MAKE_SCRIPT && argc > 1) > - return !!sequencer_make_script(keep_empty, stdout, argc, argv); > + return !!sequencer_make_script(keep_empty, abbreviate_commands, > +stdout, argc, argv);

[PATCH 4/5] rebase -i: learn to abbreviate command names

2017-11-26 Thread Liam Beguin
`git rebase -i` already know how to interpret single-letter command names. Teach it to generate the todo list with these same abbreviated names. Based-on-patch-by: Johannes Schindelin Signed-off-by: Liam Beguin --- Documentation/rebase-config.txt | 19 +++ builtin/rebase--helper.c