From: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git List <git@vger.kernel.org>,
Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>,
Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr>,
Louis-Alexandre Stuber
<louis--alexandre.stuber@ensimag.grenoble-inp.fr>,
Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit
Date: Tue, 23 Jun 2015 21:01:19 +0200 (CEST) [thread overview]
Message-ID: <1637608183.731706.1435086079947.JavaMail.zimbra@ensimag.grenoble-inp.fr> (raw)
In-Reply-To: <CAPig+cT+idnGkR0V-UfwbHwvjd_U=zbjHx+so7Jz+4o1XU5eHw@mail.gmail.com>
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.
Ironically, it was modified after the following:
Galan Rémi <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:
> Eric Sunshine <sunshine@sunshineco.com> writes:
> > > +test_expect_success 'rebase -i respects rebase.missingCommitsCheck=ignore' '
> > > + test_config rebase.missingCommitsCheck ignore &&
> > > + test_when_finished "git checkout master &&
> > > + git branch -D tmp2" &&
> >
> > Strange indentation.
>
> Considering that 'git branch -D tmp2' is a part of test_when_finished,
> I wasn't sure of how it was supposed to be indented, so I did it this
> way to show that it was still within test_when_finished and not a
> separate command.
> > test_when_finished "git checkout master &&
> > git branch -D tmp2" &&
> Doesn't seem as clear, especially if you quickly read the lines.
>
> For now, I have removed the tab.
:p
Thanks,
Rémi
next prev parent reply other threads:[~2015-06-23 18:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-22 21:42 [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit Galan Rémi
2015-06-22 21:42 ` [PATCHv6 2/3] git rebase -i: warn about removed commits Galan Rémi
2015-06-22 21:42 ` [PATCHv6 3/3] git rebase -i: add static check for commands and SHA-1 Galan Rémi
2015-06-23 19:42 ` Junio C Hamano
2015-06-23 20:35 ` Remi Galan Alfonso
2015-06-23 18:24 ` [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit Eric Sunshine
2015-06-23 19:01 ` Remi Galan Alfonso [this message]
2015-06-23 19:07 ` Matthieu Moy
2015-06-23 19:18 ` Remi Galan Alfonso
2015-06-23 20:22 ` Matthieu Moy
2015-06-23 20:39 ` Junio C Hamano
2015-06-23 20:47 ` Remi Galan Alfonso
2015-06-23 19:17 ` Eric Sunshine
2015-06-23 19:27 ` Junio C Hamano
2015-06-23 20:08 ` Remi Galan Alfonso
2015-06-23 20:37 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1637608183.731706.1435086079947.JavaMail.zimbra@ensimag.grenoble-inp.fr \
--to=remi.galan-alfonso@ensimag.grenoble-inp.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=guillaume.pages@ensimag.grenoble-inp.fr \
--cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).