summaryrefslogtreecommitdiff
path: root/git-difftool.perl
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2017-01-02 16:27:34 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-01-09 14:57:29 -0800
commit52865279ee1187a0f630779d2015587ae702b1f4 (patch)
tree21c07f3bd916c3efd56e8eec7bccdcfc49c71ed9 /git-difftool.perl
parentsequencer (rebase -i): skip some revert/cherry-pick specific code path (diff)
downloadtgif-52865279ee1187a0f630779d2015587ae702b1f4.tar.xz
sequencer (rebase -i): the todo can be empty when continuing
When the last command of an interactive rebase fails, the user needs to resolve the problem and then continue the interactive rebase. Naturally, the todo script is empty by then. So let's not complain about that! To that end, let's move that test out of the function that parses the todo script, and into the more high-level function read_populate_todo(). This is also necessary by now because the lower-level parse_insn_buffer() has no idea whether we are performing an interactive rebase or not. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions