From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 21 May 2015 06:40:46 +0000 (+0100)
Subject: Move is_fast_fwd into Dgit.pm
X-Git-Tag: debian/0.30~141
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=2f169a239c0ad428328fa2415649dc05318618bb

Move is_fast_fwd into Dgit.pm
---

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 2c9c9f91..f20f1bc4 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -19,7 +19,7 @@ BEGIN {
                       stat_exists fail waitstatusmsg failedcmd
                       cmdoutput cmdoutput_errok
                       git_rev_parse git_for_each_ref
-                      git_for_each_tag_referring
+                      git_for_each_tag_referring is_fast_fwd
                       $package_re $component_re $deliberately_re
                       $branchprefix
                       initdebug enabledebug enabledebuglevel
@@ -211,4 +211,16 @@ sub git_for_each_tag_referring ($$) {
     });
 }
 
+sub is_fast_fwd ($$) {
+    my ($ancestor,$child) = @_;
+    my @cmd = (qw(git merge-base), $ancestor, $child);
+    my $mb = cmdoutput_errok @cmd;
+    if (defined $mb) {
+	return git_rev_parse($mb) eq git_rev_parse($ancestor);
+    } else {
+	$?==256 or failedcmd @cmd;
+	return 0;
+    }
+}
+
 1;
diff --git a/dgit b/dgit
index c6a35966..9b401a22 100755
--- a/dgit
+++ b/dgit
@@ -1271,18 +1271,6 @@ sub ensure_we_have_orig () {
     }
 }
 
-sub is_fast_fwd ($$) {
-    my ($ancestor,$child) = @_;
-    my @cmd = (@git, qw(merge-base), $ancestor, $child);
-    my $mb = cmdoutput_errok @cmd;
-    if (defined $mb) {
-	return git_rev_parse($mb) eq git_rev_parse($ancestor);
-    } else {
-	$?==256 or failedcmd @cmd;
-	return 0;
-    }
-}
-
 sub git_fetch_us () {
     runcmd_ordryrun_local @git, qw(fetch),access_giturl(),fetchspec();
 }