From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 14 Aug 2013 18:19:26 +0000 (+0100)
Subject: break out is_fast_ff
X-Git-Tag: debian/0.1~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=682d66806b24a9d68b0d0cf4da96a8259267341e

break out is_fast_ff
---

diff --git a/dgit b/dgit
index 12f75100..072f8586 100755
--- a/dgit
+++ b/dgit
@@ -216,6 +216,12 @@ END
 
 my $lastupl_ref = "refs/remotes/$remotename/upload/$suite";
 
+sub is_fast_ff ($$) {
+    my ($ancestor,$child) = @_;
+    my $mb = cmdoutput qw(git merge-base), $dsc_hash, $lastupl_hash;
+    return $mb eq $ancestor;
+}
+
 sub fetch_from_archive () {
     # ensures that $lastupl_ref is what is actually in the archive,
     #  one way or another
@@ -230,10 +236,9 @@ sub fetch_from_archive () {
 	$hash = generate_commit_from_dsc();
     }
     if ($lastupl_hash) {
-	my $mb = cmdoutput qw(git merge-base), $dsc_hash, $lastupl_hash;
 	die "not fast forward on last upload branch!".
 	    " (archive's version left in DGIT_ARCHIVE)"
-	    unless $mb eq $lastupl_hash;
+	    unless is_fast_ff($lastupl_hash, $dsc_hash);
     }
     if ($lastupl_ref ne $hash) {
 	cmdoutput qw(git update-ref -m), 'dgit fetch', $lastupl_ref, $hash;