From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 23 Apr 2018 00:15:50 +0000 (+0100)
Subject: dgit: Break out quiltify_nofix_bail (nfc)
X-Git-Tag: archive/debian/5.0~46
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d51c2ac366c86d1dd3cc9ac04d5b3b14b1ff23c5

dgit: Break out quiltify_nofix_bail (nfc)

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

diff --git a/dgit b/dgit
index c3b66f15..b43308df 100755
--- a/dgit
+++ b/dgit
@@ -3704,6 +3704,15 @@ sub commit_admin ($) {
     runcmd_ordryrun_local @git, qw(commit -m), $m;
 }
 
+sub quiltify_nofix_bail ($$) {
+    my ($headinfo, $xinfo) = @_;
+    if ($quilt_mode eq 'nofix') {
+	fail "quilt fixup required but quilt mode is \`nofix'\n".
+	    "HEAD commit".$headinfo." differs from tree implied by ".
+	    " debian/patches".$xinfo;
+    }
+}
+
 sub commit_quilty_patch () {
     my $output = cmdoutput @git, qw(status --porcelain);
     my %adds;
@@ -5197,11 +5206,7 @@ sub quiltify ($$$$) {
 	    last;
 	}
 
-	if ($quilt_mode eq 'nofix') {
-	    fail "quilt fixup required but quilt mode is \`nofix'\n".
-		"HEAD commit $c->{Commit} differs from tree implied by ".
-		" debian/patches (tree object $oldtiptree)";
-	}
+	quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
 	if ($quilt_mode eq 'smash') {
 	    printdebug " search quitting smash\n";
 	    last;