From 6347d3e236ba3b578c1a6a259f51fc977e71b210 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 14 Aug 2013 19:22:14 +0100
Subject: fix is_fast_fwd (rename and introduce rev parse)

---
 dgit | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'dgit')

diff --git a/dgit b/dgit
index 072f858..55cdc0c 100755
--- a/dgit
+++ b/dgit
@@ -216,10 +216,14 @@ END
 
 my $lastupl_ref = "refs/remotes/$remotename/upload/$suite";
 
-sub is_fast_ff ($$) {
+sub rev_parse ($) {
+    return cmdoutput qw(git rev-parse --), "$_[0]~0";
+}
+
+sub is_fast_fwd ($$) {
     my ($ancestor,$child) = @_;
     my $mb = cmdoutput qw(git merge-base), $dsc_hash, $lastupl_hash;
-    return $mb eq $ancestor;
+    return rev_parse($mb) eq rev_parse($ancestor);
 }
 
 sub fetch_from_archive () {
@@ -238,7 +242,7 @@ sub fetch_from_archive () {
     if ($lastupl_hash) {
 	die "not fast forward on last upload branch!".
 	    " (archive's version left in DGIT_ARCHIVE)"
-	    unless is_fast_ff($lastupl_hash, $dsc_hash);
+	    unless is_fast_fwd($lastupl_hash, $dsc_hash);
     }
     if ($lastupl_ref ne $hash) {
 	cmdoutput qw(git update-ref -m), 'dgit fetch', $lastupl_ref, $hash;
-- 
cgit v1.2.3