[PATCH 2/2] Catch and handle git-commit failures in git-rebase --interactive
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:44:00
If git-commit fails for any reason then git-rebase needs to stop and not plow through the rest of the series. Its unlikely that a future git-commit will succeed if the current attempt failed. Signed-off-by: Shawn O. Pearce <redacted> --- Comments welcome. This is on top of my 1/2 patch but we could drop my 1/2 and rewrite this to not use --no-verify, but handle the git-commit error correctly. However that would force users to fix whitespace errors in later patches in a series if they use -i, even though non-i wouldn't require that sort of fix-up. So I think we should do both patches in the series. This has also bitten me a few times. :-\ git-rebase--interactive.sh | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index b846ea8..0f7d939 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh@@ -289,22 +289,22 @@ do_next () { output git reset --soft HEAD^ pick_one -n $sha1 || failed=t echo "$author_script" > "$DOTEST"/author-script - case $failed in - f) + if test $failed = f + then # This is like --amend, but with a different message eval "$author_script" GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \ GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \ GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \ - $USE_OUTPUT git commit --no-verify -F "$MSG" $EDIT_COMMIT - ;; - t) + $USE_OUTPUT git commit --no-verify -F "$MSG" $EDIT_COMMIT || failed=t + fi + if test $failed = t + then cp "$MSG" "$GIT_DIR"/MERGE_MSG warn warn "Could not apply $sha1... $rest" die_with_patch $sha1 "" - ;; - esac + fi ;; *) warn "Unknown command: $command $sha1 $rest"
@@ -372,7 +372,8 @@ do test ! -f "$DOTEST"/amend || git reset --soft HEAD^ } && export GIT_AUTHOR_NAME GIT_AUTHOR_NAME GIT_AUTHOR_DATE && - git commit --no-verify -F "$DOTEST"/message -e + git commit --no-verify -F "$DOTEST"/message -e || + die "Could not commit staged changes." require_clean_work_tree do_rest
--
1.5.4.rc0.1155.g12ed9