Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> writes:
> Remi Galan Alfonso <remi.galan-alfonso@xxxxxxxxxxxxxxxxxxxxxxx> writes:
>
> > Eric Sunshine <sunshine@xxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html