From: Andrew Wong Date: Mon, 28 Nov 2011 16:15:52 GMT Subject: [PATCH] rebase -i: interrupt rebase when "commit --amend" failed during "reword" Message-ID: <1322496952-23819-2-git-send-email-andrew.kw.w@gmail.com> In-Reply-To: <1322496952-23819-1-git-send-email-andrew.kw.w@gmail.com> "commit --amend" could fail in cases like the user empties the commit message, or pre-commit failed. When it fails, rebase should be interrupted, rather than ignoring the error and continue on rebasing. This gives users a way to gracefully interrupt a "reword" if they decided they actually want to do an "edit", or even "rebase --abort". Signed-off-by: Andrew Wong --- git-rebase--interactive.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 804001b..669f378 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -408,7 +408,8 @@ do_next () { mark_action_done pick_one $sha1 || die_with_patch $sha1 "Could not apply $sha1... $rest" - git commit --amend --no-post-rewrite + git commit --amend --no-post-rewrite || + die_with_patch $sha1 "Cannot amend commit after successfully picking $sha1... $rest" record_in_rewritten $sha1 ;; edit|e) -- 1.7.8.rc3.32.gb2fac