From 1318a9419f2b6dae0318146cb9fe08d3f4ceb780 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 15 Feb 2018 18:54:38 +0000 Subject: [PATCH] git-debrebase: check head is clean before starting Signed-off-by: Ian Jackson --- git-debrebase | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git-debrebase b/git-debrebase index 5913aa33..70808da0 100755 --- a/git-debrebase +++ b/git-debrebase @@ -795,7 +795,10 @@ sub walk ($;$$) { return @r } -sub get_head () { return git_rev_parse qw(HEAD); } +sub get_head () { + git_check_unmodified(); + return git_rev_parse qw(HEAD); +} sub update_head ($$$) { my ($old, $new, $mrest) = @_; @@ -929,7 +932,6 @@ sub record_ffq_prev () { } sub cmd_new_upstream_v0 () { - # tree should be clean and this is not checked # automatically and unconditionally launders before rebasing # if rebase --abort is used, laundering has still been done -- 2.30.2