From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 15 Feb 2018 18:53:52 +0000 (+0000)
Subject: git-debrebase: use git_rev_parse 'HEAD' for "internal" head lookups
X-Git-Tag: archive/debian/5.0~232
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=4afe3a6c47fc816a81d71308d18173a8013978f0;p=dgit.git

git-debrebase: use git_rev_parse 'HEAD' for "internal" head lookups

We are going to make get_head check the tree is clean

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 47a5712e..5913aa33 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -842,7 +842,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 $!;
@@ -1180,7 +1180,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';