git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH/RFCv2 1/2] git-rebase -i: add command "drop" to remove a commit

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Jun 1, 2015, 18:36 UTC
Message-ID
<vpqoakz1dke.fsf@anie.imag.fr>
In-Reply-To
<563732680.250935.1433180720935.JavaMail.zimbra@ensimag.grenoble-inp.fr>
Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:
Show 10 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
>> Is this sufficient?
>
>> If you are going to do something in 2/2 that relies on the format of
>> this line being correct (as opposed to "noop" or "#" that can have
>> any garbage on the remainder of the line), wouldn't you want to at
>> least check $sha1 is sensible?
>
> That's also something that I was wondering, I wrote about it in the
> 0/2 part of this patch, I wanted some opinion about it.

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.

So, IMHO, why not do this check, but I'm not sure it will actually help much.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Remi Galan AlfonsoNext: Remi Galan Alfonso
Message 6 of 12 in “rebase -i : drop command and removed commits”
  1. 0/2 rebase -i : drop command and removed commitsGalan Rémi, Jun 1, 2015
  2. 1/2 git-rebase -i: add command "drop" to remove a commitGalan Rémi, Jun 1, 2015
  3. Junio C HamanoJun 1, 2015
  4. Matthieu MoyJun 1, 2015
  5. Remi Galan AlfonsoJun 1, 2015
  6. Matthieu MoyJun 1, 2015
  7. Remi Galan AlfonsoJun 2, 2015
  8. Matthieu MoyJun 2, 2015
  9. Junio C HamanoJun 2, 2015
  10. Remi Galan AlfonsoJun 3, 2015
  11. Junio C HamanoJun 3, 2015
  12. 2/2 git rebase -i: warn about removed commitsGalan Rémi, Jun 1, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.