Skip to content

Commit

Permalink
Merge branch 'js/rebase-exec-command-not-found'
Browse files Browse the repository at this point in the history
* js/rebase-exec-command-not-found:
  rebase -i: fix misleading error message after 'exec no-such' instruction
  • Loading branch information
Junio C Hamano committed Sep 30, 2012
2 parents a275e82 + ecfe1ea commit f5fd2a7
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
4 changes: 4 additions & 0 deletions git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions t/t3404-rebase-interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit f5fd2a7

Please sign in to comment.