Browse Source

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
maint
Junio C Hamano 12 years ago
parent
commit
f5fd2a7d17
  1. 4
      git-rebase--interactive.sh
  2. 11
      t/t3404-rebase-interactive.sh

4
git-rebase--interactive.sh

@ -544,6 +544,10 @@ do_next () { @@ -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

11
t/t3404-rebase-interactive.sh

@ -118,6 +118,17 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' ' @@ -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…
Cancel
Save