All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Cc: Junio C Hamano <gitster@pobox.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>,
	Johannes Schindelin <johannes.schindelin@gmx.de>,
	Stefan Beller <sbeller@google.com>,
	Philip Oakley <philipoakley@iee.org>,
	Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH/RFCv2 1/2] git-rebase -i: add command "drop" to remove a commit
Date: Tue, 02 Jun 2015 09:45:20 +0200	[thread overview]
Message-ID: <vpqa8wiwo33.fsf@anie.imag.fr> (raw)
In-Reply-To: <150689518.4344.1433229813195.JavaMail.zimbra@ensimag.grenoble-inp.fr> (Remi Galan Alfonso's message of "Tue, 2 Jun 2015 09:23:33 +0200 (CEST)")

Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:

>> Ideally, I think we should do a sanity check before starting the rebase,
>> and error out if we encounter an invalid command, a command that should
>> be followed by a valid sha1 and does not, ...
>> 
>> But currently, we do the verification while applying commands, and I
>> don't think there's anything really helpful to do if we encounter a
>> "drop this-is-not-a-sha1" command.
>
> While I agree that doing a sanity check before starting the rebase is
> a better idea, it would not be logic to do so only for the 'drop'
> command, it should be done for all of the various commands (as you
> said, checking if the commands are valid, checking if the SHA-1
> following the command is valid if it was expecting one...).

Yes, that's what I had in mind.

> However I think that it should be in a different patch, changing the
> whole checking system of rebase is not directly linked to the idea of
> the 'drop' command.

Agreed.

Discussions on this list often lead to "Oh, BTW, shall we do XYZ also?",
but you shouldn't take this kind of remark as blocking (as long as XYZ
is not incompatible with your patch, which is the case here).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

  reply	other threads:[~2015-06-02  7:45 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-01  9:57 [PATCH/RFCv2 0/2] rebase -i : drop command and removed commits Galan Rémi
2015-06-01  9:57 ` [PATCH/RFCv2 1/2] git-rebase -i: add command "drop" to remove a commit Galan Rémi
2015-06-01 16:39   ` Junio C Hamano
2015-06-01 17:06     ` Matthieu Moy
2015-06-01 17:45     ` Remi Galan Alfonso
2015-06-01 18:36       ` Matthieu Moy
2015-06-02  7:23         ` Remi Galan Alfonso
2015-06-02  7:45           ` Matthieu Moy [this message]
2015-06-02 17:14             ` Junio C Hamano
2015-06-03  9:13               ` Remi Galan Alfonso
2015-06-03 17:52                 ` Junio C Hamano
2015-06-01  9:57 ` [PATCH/RFCv2 2/2] git rebase -i: warn about removed commits Galan Rémi
2015-06-01 11:52 [PATCH/RFCv2 1/2] git-rebase -i: add command "drop" to remove a commit Galan Rémi

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=vpqa8wiwo33.fsf@anie.imag.fr \
    --to=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=johannes.schindelin@gmx.de \
    --cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
    --cc=philipoakley@iee.org \
    --cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
    --cc=remi.lespinet@ensimag.grenoble-inp.fr \
    --cc=sbeller@google.com \
    --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.