diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-05 13:28:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-05 13:28:12 -0800 |
| commit | 8c8ddbd0821d552ff3c7e1b67c669dd7f11d63d7 (patch) | |
| tree | d33e7c82798b5672c86c955798e3e692066264c8 /git-rebase--interactive.sh | |
| parent | bc27a2e2fc882e708316df589a8ea293d21a95ed (diff) | |
| parent | c7b4d79c7dd1a20feb88c2e2ed1fd86bd2ea0570 (diff) | |
| download | git-8c8ddbd0821d552ff3c7e1b67c669dd7f11d63d7.tar.xz | |
Merge branch 'js/sequencer-cleanups'
Code cleanup.
* js/sequencer-cleanups:
sequencer: do not invent whitespace when transforming OIDs
sequencer: report when noop has an argument
sequencer: remove superfluous conditional
sequencer: strip bogus LF at end of error messages
rebase: do not continue when the todo list generation failed
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index e3f5a0abf3..b7f95672bd 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 |