[PATCH] rebase -i: fix misleading error message after 'exec no-such' instruction
- From
Johannes Sixt <j.sixt@viscovery.net>
- Date
- Sep 18, 2012, 11:15 UTC
- Message-ID
- <505857CE.3050909@viscovery.net>
From: Johannes Sixt <j6t@kdbg.org>
When the todo sheet of interactive rebase instructs to run a non-existing command, the operation stops with the following error:
Execution failed: no-such You can fix the problem, and then run
git rebase --continue
fatal: 'rebase' appears to be a git command, but we were not able to execute it. Maybe git-rebase is broken?
The reason is that the shell that attempted to run the command exits with code 127. rebase--interactive just forwards this code to the caller (the git wrapper). But our smart run-command infrastructure detects this special exit code and turns it into ENOENT, which in turn is interpreted by the git wrapper as if the external command that it just executed did not exist. This is finally translated to the misleading last two lines in error message cited above.
Fix it by translating the error code before it is forwarded.
Signed-off-by: Johannes Sixt <j6t@kdbg.org> --- An alternative fix would be to just ignore the shell's status code. I decided that it is worth keeping it: better safe than sorry.
BTW, the problem existed since day 1 of the 'exec' feature.
git-rebase--interactive.sh | 4 ++++ t/t3404-rebase-interactive.sh | 11 +++++++++++ 2 files changed, 15 insertions(+)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index a09e842..56707d7 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -544,6 +544,10 @@ do_next () { warn warn " git rebase --continue" warn + if test $status -eq 127 # command not found + then + status=1 + fi exit "$status" elif test "$dirty" = t then diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 7304b66..7a71760 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -118,6 +118,17 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' ' git rebase --continue ' +test_expect_success 'rebase -i with exec of inexistent command' ' + git checkout master && + test_when_finished "git rebase --abort" && + ( + FAKE_LINES="exec_this-command-does-not-exist 1" && + export FAKE_LINES && + test_must_fail git rebase -i HEAD^ >actual 2>&1 + ) && + ! grep "Maybe git-rebase is broken" actual +' + test_expect_success 'no changes are a nop' ' git checkout branch2 && git rebase -i F &&
-- 1.7.12.1720.gb55457a.dirty