All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>,
	Eric Sunshine <sunshine@sunshineco.com>,
	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>
Subject: Re: [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit
Date: Tue, 23 Jun 2015 13:39:14 -0700	[thread overview]
Message-ID: <xmqqa8vqcg7h.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <vpq8ubamaz0.fsf@anie.imag.fr> (Matthieu Moy's message of "Tue, 23 Jun 2015 22:22:11 +0200")

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 ;-)

  reply	other threads:[~2015-06-23 20:39 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
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 [this message]
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqa8vqcg7h.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=antoine.delaite@ensimag.grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=guillaume.pages@ensimag.grenoble-inp.fr \
    --cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
    --cc=remi.galan-alfonso@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.