[PATCH] rebase -i: clean error message for --continue after failed exec
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:51:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] rebase -i: clean error message for --continue after failed exec · Johannes Sixt <hidden>
- 2016-06-15 · Re: [PATCH] rebase -i: clean error message for --continue after failed exec · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] rebase -i: clean error message for --continue after failed exec · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] rebase -i: clean error message for --continue after failed exec · Jeff King <hidden>
- 2016-06-15 · Re: [PATCH] rebase -i: clean error message for --continue after failed exec · Jeff King <hidden>
If after a failed "exec" instruction there are staged changes, before this patch, rebase --continue fails with this message, which is obviously wrong: .../git-rebase--interactive: line 774: .../.git/rebase-merge/author-script: No such file or directory We could try auto-amending HEAD, but this goes against the logic of .git/rebase-merge/author-script (see also the testcase 'auto-amend only edited commits after "edit"' in t3404-rebase-interactive.sh) to auto-amend something the user hasn't explicitely asked to edit. Instead of doing anything automatically, detect the situation and give a clean error message. While we're there, also clarify the error message in case '. "$author_script"' fails, which now corresponds to really weird senario where the author script exists but can't be read. Test-case-by: Johannes Sixt [off-list ref] Signed-off-by: Matthieu Moy <redacted> --- Here's my attempt at a patch. After noticing the existance of a test 'auto-amend only edited commits after "edit"', I'm convinced that auto-amending is not the right thing here. git-rebase--interactive.sh | 18 +++++++++++++++++- t/t3404-rebase-interactive.sh | 14 ++++++++++++++ 2 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index c6ba7c1..5c94506 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh@@ -647,8 +647,24 @@ continue) then : Nothing to commit -- skip this else + if ! test -f "$author_script" + then + die "You have staged changes in your working tree. If these changes are meant to be +squashed into the previous commit, run: + + git commit --amend + +If they are meant to go into a new commit, run: + + git commit + +In both case, once you're done, continue with: + + git rebase --continue +" + fi . "$author_script" || - die "Cannot find the author identity" + die "Error trying to find the author identity to amend commit" current_head= if test -f "$amend" then
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 8538813..b981572 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh@@ -527,6 +527,20 @@ test_expect_success 'auto-amend only edited commits after "edit"' ' git rebase --abort ' +test_expect_success 'clean error 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 && + test_must_fail git rebase --continue 2>error && + grep "You have staged changes in your working tree." error +' + test_expect_success 'rebase a detached HEAD' ' grandparent=$(git rev-parse HEAD~2) && git checkout $(git rev-parse HEAD) &&
--
1.7.6.580.gc2862.dirty