From: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
To: Junio C Hamano <gitster@pobox.com>, Matthieu Moy <Matthieu.Moy@imag.fr>
Cc: 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>,
sunshine@sunshineco.com
Subject: Re: [PATCH 0/3] rebase -i: drop, missing commits and static checks
Date: Tue, 30 Jun 2015 19:02:04 +0200 (CEST) [thread overview]
Message-ID: <70428267.93232.1435683724659.JavaMail.zimbra@ensimag.grenoble-inp.fr> (raw)
In-Reply-To: <xmqq7fql8949.fsf@gitster.dls.corp.google.com>
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:
>
> > Galan Rémi <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:
> >> Shouldn't all the checking also be called in a 'rebase --continue',
> >> considering that it can be called after a 'rebase --edit-todo' ?
> >> (Right now it is only called after closing the editor in 'rebase -i')
> >
> > What's your opinion on it?
>
> It would probably be better to run the check when running "git rebase
> --continue". This way, we would have a guarantee that the todo-list is
> syntactically correct when going through it.
>
> Just checking after --edit-todo would not guarantee that:
That's actually what I had in mind, my message wasn't clear enough, my
bad.
> But in any case, the most important is the initial edition. It covers
> 99.9% of use-cases. So, I'd say: if you have time to add the checks at
> the other relevant places, good, but not doing it shouldn't block the
> inclusion of the series.
Agreed, that's something that can be done in a future patch without
interfering with this one.
Junio C Hamano <gitster@pobox.com> writes:
> The place where an error can be introduced is (assuming that what
> "rebase -i" writes out itself is perfect ;-) where we allow the user
> to edit, so instead of checking before "--continue", I would expect
> a sane design would check immediately after the editor we spawned
> returns.
Makes sense but we would have the problem mentioned by Matthieu:
> Warning: the command isn't recognized ...
>
> # Hmm, let's ignore that warning
> $ git rebase --continue
While in most cases it would be irrelevant (it would be the user that
ignored the error on purpose), I can imagine the following situation:
- 'git rebase --edit-todo'
- get an error
- go do something else, forgot where I was when I come back
- 'git status', "you are in the middle of a rebasing"
- 'git rebase --continue'
> The codepath that allows the insn sheet getting edited and the
> codepath that handles --edit-todo have to do many things the same
> way (i.e. use collapse_todo_ids to prepare the file for editing,
> spawn the editor, receive the result and use expand_todo_ids to
> prepare the file to be used by us), and I would have expected for
> these two to be using a single helper---and a sanity check like the
> above can and should be done when we receive the result from the
> editor, immediately before running expand_todo_ids perhaps.
>
> If they are not using such a single helper right now, perhaps that
> is the preliminary restructuring of the code that is needed?
Good point, maybe I'll try doing that at a later date, however as
Matthieu said, I think it doesn't hurt to add this patch (if there is
no further corrections to do) and do additional things in a later
patch.
Thanks,
Rémi
next prev parent reply other threads:[~2015-06-30 16:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-29 20:20 rebase -i: drop, missing commits and static checks Galan Rémi
2015-06-29 20:20 ` [PATCHv7 1/3] git-rebase -i: add command "drop" to remove a commit Galan Rémi
2015-06-29 20:20 ` [PATCHv7 2/3] git rebase -i: warn about removed commits Galan Rémi
2015-06-29 20:20 ` [PATCHv7 3/3] git rebase -i: add static check for commands and SHA-1 Galan Rémi
2015-06-30 9:19 ` [PATCH 0/3] rebase -i: drop, missing commits and static checks Matthieu Moy
2015-06-30 9:19 ` [PATCH 1/3] fixup! git rebase -i: add static check for commands and SHA-1 Matthieu Moy
2015-06-30 9:19 ` [PATCH 2/3] fixup! git rebase -i: warn about removed commits Matthieu Moy
2015-06-30 9:19 ` [PATCH 3/3] " Matthieu Moy
2015-06-30 15:06 ` [PATCH 0/3] rebase -i: drop, missing commits and static checks Remi Galan Alfonso
2015-06-30 15:39 ` Matthieu Moy
2015-06-30 16:16 ` Junio C Hamano
2015-06-30 17:02 ` Remi Galan Alfonso [this message]
2015-06-30 17:03 ` Matthieu Moy
2015-06-30 17:09 ` 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=70428267.93232.1435683724659.JavaMail.zimbra@ensimag.grenoble-inp.fr \
--to=remi.galan-alfonso@ensimag.grenoble-inp.fr \
--cc=Matthieu.Moy@imag.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).