Adam Roben <aroben@xxxxxxxxx> writes:
> Here you go. I'm not terribly happy with the error message, though. I tried to
> be as clear as possible and to keep some of the nice information that was in
> the git-commit error message. Please improve upon it if you can.
>
> git-am.sh | 4 ++--
> git-commit.sh | 11 +----------
> git-rebase--interactive.sh | 2 +-
> git-sh-setup.sh | 15 +++++++++++++--
> git-tag.sh | 2 +-
> 5 files changed, 18 insertions(+), 16 deletions(-)
>
> diff --git a/git-am.sh b/git-am.sh
> index a5de0a1..dd517f4 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -7,7 +7,6 @@ USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
> or, when resuming [--skip | --resolved]'
> . git-sh-setup
> set_reflog_action am
> -set_editor
> require_work_tree
>
> git var GIT_COMMITTER_IDENT >/dev/null || exit
> @@ -365,7 +364,8 @@ do
> [yY]*) action=yes ;;
> [aA]*) action=yes interactive= ;;
> [nN]*) action=skip ;;
> - [eE]*) "$GIT_EDITOR" "$dotest/final-commit"
> + [eE]*) set_editor
> + "$GIT_EDITOR" "$dotest/final-commit"
> action=again ;;
> [vV]*) action=again
> LESS=-S ${PAGER:-less} "$dotest/patch" ;;
Sounds sane.
Could you please re-diff to make this into a single patch
without intermediate "Oh, doing it this way is cleaner", and
also with Dscho's Ack? I do not think we would need to have 3
commits for this topic --- it is not like wide userbase tested
each iteration.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
