rebase -i: Should --continue auto-amend after failed exec?
From: Johannes Sixt <hidden>
Date: 2016-06-15 22:51:46
Subsystem:
the rest · Maintainer:
Linus Torvalds
If after a failed "exec" instruction there are staged changes, then currently rebase --continue fails with: .../git-rebase--interactive: line 774: .../.git/rebase-merge/author-script: No such file or directory But shouldn't this amend the HEAD commit? The documentation is not clear (from git-rebase.txt): The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`. This may be interpreted to work like "edit", and IMO would be a very useful modus operandi. Here is a test case. Signed-off-by: Johannes Sixt <redacted>
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 47c8371..2146e47 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh@@ -527,6 +527,21 @@ test_expect_success 'auto-amend only edited commits after "edit"' ' git rebase --abort ' +test_expect_failure 'auto-amend after failed "exec"' ' + test_tick && + test_when_finished "git rebase --abort || :" && + ( + FAKE_LINES="1 exec_false" && + export FAKE_LINES && + test_must_fail git rebase -i HEAD^ + ) && + echo "edited again" > file7 && + git add file7 && + FAKE_COMMIT_MESSAGE="edited file7 again" git rebase --continue && + actual=$(git show HEAD:file7) && + test "edited again" = "$actual" +' + test_expect_success 'rebase a detached HEAD' ' grandparent=$(git rev-parse HEAD~2) && git checkout $(git rev-parse HEAD) &&