From: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Date: Tue, 23 Jun 2015 20:47:00 GMT
Subject: Re: [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit
Message-ID: <460841845.733813.1435092420048.JavaMail.zimbra@ensimag.grenoble-inp.fr>
In-Reply-To: <xmqqa8vqcg7h.fsf@gitster.dls.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:
> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> 
> > Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:
> >
> >> 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.
> >
> > Read too quickly, it looks like a mis-indentation (I could laugh at Eric
> > here, but I made the same confusion when reading the code at first). By
> > "avoid the confusion" I mean "make it clear it's not a mis-indentation".
> 
> Yes, that stray " fooled me as well.  If it were following your
> suggestion in the earlier message on this thread, i.e.
> 
>         test_when_finished "
>                 ... &&
>                 ...
>         " &&
>         git checkout
> 
> I wouldn't have to waste time commenting on it ;-)

I will do it this way then. ;)

Thanks,
Rémi