mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/rebase-exec-command-not-found'

Browse Source 
* js/rebase-exec-command-not-found:
  rebase -i: fix misleading error message after 'exec no-such' instruction
This commit is contained in:
Junio C Hamano
2012-09-29 22:28:05 -07:00
parent a275e823ac ecfe1ea96f
commit f5fd2a7d17
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--interactive.sh
View File

@ -544,6 +544,10 @@ do_next () {
warn warn
warn " git rebase --continue" warn " git rebase --continue"
warn warn
if test $status -eq 127 # command not found
then
status=1
fi
exit "$status" exit "$status"
elif test "$dirty" = t elif test "$dirty" = t
then then

11
t/t3404-rebase-interactive.sh
View File

@ -118,6 +118,17 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' '
git rebase --continue 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' ' test_expect_success 'no changes are a nop' '
git checkout branch2 && git checkout branch2 &&
git rebase -i F && git rebase -i F &&