Re: [PATCH 0/3] rebase -i: drop, missing commits and static checks

From: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Date: Jun 30, 2015, 15:06 UTC
Message-ID: <1849903896.89424.1435676774069.JavaMail.zimbra@ensimag.grenoble-inp.fr>
In-Reply-To: <1435655961-31263-1-git-send-email-Matthieu.Moy@imag.fr>

Matthieu Moy <Matthieu.Moy@imag.fr> writes:

Show 15 quoted lines

> Hi,
> 
> Here are a few fixes to squash into the commits of the series. Other
> than that, the series looks good to me.
> 
> Junio: do you prefer a reroll or do you want to apply locally?
> 
> Matthieu Moy (3):
>   fixup! git rebase -i: add static check for commands and SHA-1
>   fixup! git rebase -i: warn about removed commits
>   fixup! git rebase -i: warn about removed commits
> 
>  git-rebase--interactive.sh    | 32 +++++++++++++++++++++-----------
>  t/t3404-rebase-interactive.sh |  4 ++--
>  2 files changed, 23 insertions(+), 13 deletions(-)

Thanks for the various fixes !

However, I am still wondering about:

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?

Short example:

'git rebase -i HEAD~2'
	pick commit_sha_1 commit_msg_1
	tick commit_sha_2 commit_msg_2
An error is raised before anything is done.
'git rebase --edit-todo'
	pick commit_sha_1 commit_msg_1
	tick commit_sha_2 commit_msg_2
(nothing changed)
'git rebase --continue'
An error is raised after having picked the first commit.

The same is relevent with bad sha and missing commits (in fact even more relevant with missing commits since that would be silent loss of information).

Thanks, Rémi