X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=70808da019922f01d4fb0f77bb5748d1d7647197;hb=1318a9419f2b6dae0318146cb9fe08d3f4ceb780;hp=5913aa3307afa57c0490a44e4765509af6a70024;hpb=4afe3a6c47fc816a81d71308d18173a8013978f0;p=dgit.git 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