Re: [PATCH] rebase -i: Teach "--edit" action

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Sep 10, 2012, 16:25 UTC
Message-ID: <vpqk3w1j15v.fsf@bauges.imag.fr>
In-Reply-To: <1347293683-27996-2-git-send-email-andrew.kw.w@gmail.com>

Andrew Wong <andrew.kw.w@gmail.com> writes:

> This allows users to edit the todo list while they're in the middle of
> an interactive rebase.

I like the idea.

Show 6 quoted lines

> +edit)
> +  git_sequence_editor "$todo" ||
> +    die_abort "Could not execute editor"
> +
> +  exit
> +  ;;

Indent with space. Please, use tabs (same below).

Show 8 quoted lines

> index 15da926..c394b8d 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -38,6 +38,7 @@ C=!                passed to 'git apply'
>  continue!          continue
>  abort!             abort and check out the original branch
>  skip!              skip current patch and continue
> +edit!              edit the todo list during interactive rebase

Just "edit" may be a bit misleading, as we already have the "edit" action inside the todolist. I'd call this --edit-list to avoid ambiguity.

This lacks tests, IMHO, as there are many corner-cases (e.g. should we be allowed to --edit-list while the worktree is in conflict?) that would deserve to be at least discussed, and as much as possible automatically tested.

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