From: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Date: Tue, 23 Jun 2015 19:18:17 GMT
Subject: Re: [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit
Message-ID: <392249968.731834.1435087097209.JavaMail.zimbra@ensimag.grenoble-inp.fr>
In-Reply-To: <vpq1th2p7ka.fsf@anie.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:
> 
> > Eric Sunshine <sunshine@sunshineco.com> writes:
> >> > +test_rebase_end () {
> >> > +       test_when_finished "git checkout master &&
> >> > +       git branch -D $1 &&
> >> > +       test_might_fail git rebase --abort" &&
> >> > +       git checkout -b $1 master
> >> > +}
> >>
> >> The way this is indented makes it difficult to see that lines 2 and 3
> >> are continuations of 1. Perhaps format it like this instead?
> >>
> >>     test_rebase_end () {
> >>         test_when_finished "git checkout master &&
> >>             git branch -D $1 &&
> >>             test_might_fail git rebase --abort" &&
> >>         git checkout -b $1 master
> >>     }
> >
> > I completely agree with you, moreover it was indented like this before.
> > I'll change it in my local version for now.
> 
> Perhaps to avoid confusion, stg like:
> 
>         test_when_finished "
>                 ... &&
>                 ...
>         " &&
>         git checkout
> 
> (the closing " alone on its line)

I think that the indentation on its own is enough to avoid confusion
> test_rebase_end () {
> 	test_when_finished "git checkout master &&
> 		git branch -D $1 &&
> 		test_might_fail git rebase --abort" &&
> 	git checkout -b $1 master
> }
but your idea is fine as well, so I'm ok with either way.

Thanks,
Rémi