X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=70808da019922f01d4fb0f77bb5748d1d7647197;hp=47a5712e35125ef3040387236854c1fa6ea9d518;hb=8900e2002df925ebdf4941d18094fc5ca408e027;hpb=8618ddfd0724f66e260e50f0b4dc39a8d85be220

diff --git a/git-debrebase b/git-debrebase
index 47a5712e..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) = @_;
@@ -842,7 +845,7 @@ sub cmd_analyse () {
     if (defined $old) {
 	$old = git_rev_parse $old;
     } else {
-	$old = get_head();
+	$old = git_rev_parse 'HEAD';
     }
     my ($dummy,$breakwater) = walk $old, 1,*STDOUT;
     STDOUT->error and die $!;
@@ -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
 
@@ -1180,7 +1182,7 @@ sub cmd_gbp2debrebase () {
 	# rebase the patch queue onto the new breakwater
 	runcmd @git, qw(reset --quiet --hard patch-queue/gdr-internal);
 	runcmd @git, qw(rebase --quiet --onto), $work, qw(gdr-internal);
-	$work = get_head();
+	$work = git_rev_parse 'HEAD';
     };
 
     update_head_checkout $old_head, $work, 'gbp2debrebase';