dgit: Break out quiltify_check_unrepresentable

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

1 files changed, 19 insertions, 11 deletions

diff --git a/dgit b/dgit
index d5715c8..c103481 100755
--- a/dgit
+++ b/dgit
@@ -5473,6 +5473,24 @@ sub quiltify_trees_differ ($$;$$$) {
     return $r;
 }
 
+sub quiltify_check_unrepresentable ($) {
+    my ($unrepres) = @_;
+    return unless @$unrepres;
+    if ($quilt_mode =~ m/baredebian/) {
+	# With baredebian, even if the upstream commitish has this
+	# problem, we don't want to print this message, as nothing
+	# is going to try to make a patch out of it anyway.
+	return;
+    }
+    print STDERR f_ "dgit:  cannot represent change: %s: %s\n",
+                    $_->[1], $_->[0]
+        foreach @$unrepres;
+
+    forceable_fail [qw(unrepresentable)], __ <<END;
+HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
+END
+}
+
 sub quiltify_tree_sentinelfiles ($) {
     # lists the `sentinel' files present in the tree
     my ($x) = @_;
@@ -6457,17 +6475,7 @@ END
   $us,                      $dl[0], $dl[1],              $dl[3], $dl[4],
   $us,        $uhead_whatshort, $dl[2],   $uhead_whatshort, $dl[5];
 
-    if (@unrepres && $quilt_mode !~ m/baredebian/) {
-	# With baredebian, even if the upstream commitish has this
-	# problem, we don't want to print this message, as nothing
-	# is going to try to make a patch out of it anyway.
-	print STDERR f_ "dgit:  cannot represent change: %s: %s\n",
-	                $_->[1], $_->[0]
-	    foreach @unrepres;
-	forceable_fail [qw(unrepresentable)], __ <<END;
-HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
-END
-    }
+    quiltify_check_unrepresentable(\@unrepres);
 
     my @failsuggestion;
     if ($onlydebian) {