mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'js/rebase-exec-command-not-found'
* js/rebase-exec-command-not-found: rebase -i: fix misleading error message after 'exec no-such' instruction
This commit is contained in:
commit
f5fd2a7d17
|
@ -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
|
||||
|
|
|
@ -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 &&
|
||||
|
|
Loading…
Reference in a new issue