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

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 1, 2015, 16:39 UTC
Message-ID: <xmqqvbf7757q.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1433152643-4292-2-git-send-email-remi.galan-alfonso@ensimag.grenoble-inp.fr>

Galan Rémi  <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:

Show 8 quoted lines

> Instead of removing a line to remove the commit, you can use the
> command "drop" (just like "pick" or "edit"). It has the same effect as
> deleting the line (removing the commit) except that you keep a visual
> trace of your actions, allowing a better control and reducing the
> possibility of removing a commit by mistake.
>
> Signed-off-by: Galan Rémi <remi.galan-alfonso@ensimag.grenoble-inp.fr>
> ---

Matthieu, is this part of your class project?

I vaguely recall that your school wants your sign-off to release patches to us or something like that, and that I saw some other patches came with your sign-off, so I am being curious.

Show 9 quoted lines

> @@ -505,7 +506,7 @@ do_next () {
>  	rm -f "$msg" "$author_script" "$amend" || exit
>  	read -r command sha1 rest < "$todo"
>  	case "$command" in
> -	"$comment_char"*|''|noop)
> +	"$comment_char"*|''|noop|drop|d)
>  		mark_action_done
>  		;;
>  	pick|p)

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?