summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-29 22:28:05 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-29 22:28:05 -0700
commitf5fd2a7d179a8bb843ec44d2a594e6ccf50dfb3a (patch)
tree212e3cc2b4d1f342b236af4f5827e066fc5e3ef3 /git-rebase--interactive.sh
parenta275e823aceff5ddb5a49d4bfd1a0e96da312597 (diff)
parentecfe1ea96fde1fa5756ad04f717fd2960ead988a (diff)
downloadgit-f5fd2a7d179a8bb843ec44d2a594e6ccf50dfb3a.tar.gz
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
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a09e8423dd..56707d7a27 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