[PATCH 1/5] rebase: do not continue when the todo list generation failed
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Dec 22, 2017, 23:55 UTC
- Message-ID
- <834ea65b997a052dc47f1bcda5d95865d79a20c9.1513986836.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1513986836.git.johannes.schindelin@gmx.de>
This is a *really* long-standing bug. As a matter of fact, this bug has been with us from the very beginning of `rebase -i`: 1b1dce4bae7 (Teach rebase an interactive mode, 2007-06-25), where the output of `rev-list` was piped to `sed` (and any failure of the `rev-list` process would go completely undetected).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- git-rebase--interactive.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index e3f5a0abf3c..b7f95672bd9 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -893,7 +893,8 @@ fi if test t != "$preserve_merges" then git rebase--helper --make-script ${keep_empty:+--keep-empty} \ - $revisions ${restrict_revision+^$restrict_revision} >"$todo" + $revisions ${restrict_revision+^$restrict_revision} >"$todo" || + die "$(gettext "Could not generate todo list")" else format=$(git config --get rebase.instructionFormat) # the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse
-- 2.15.1.windows.2