From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 21 Aug 2015 12:08:02 +0000 (+0100)
Subject: quilt fixup: Break out quilt_fixup_mkwork (nfc)
X-Git-Tag: debian/1.4~13
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3f6aad2374593c67bb305dac75b3e7e249cfc828

quilt fixup: Break out quilt_fixup_mkwork (nfc)
---

diff --git a/dgit b/dgit
index e5edd551..4675944f 100755
--- a/dgit
+++ b/dgit
@@ -2765,6 +2765,15 @@ sub build_maybe_quilt_fixup () {
         @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
 }
 
+sub quilt_fixup_mkwork ($) {
+    my ($headref) = @_;
+
+    mkdir "work" or die $!;
+    changedir "work";
+    mktree_in_ud_here();
+    runcmd @git, qw(reset --hard), $headref;
+}
+
 sub quilt_fixup_multipatch ($$$) {
     my ($clogp, $headref, $upstreamversion) = @_;
 
@@ -2859,10 +2868,7 @@ END
     my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
     rename $fakexdir, "fake" or die "$fakexdir $!";
 
-    mkdir "work" or die $!;
-    changedir "work";
-    mktree_in_ud_here();
-    runcmd @git, qw(reset --hard), $headref;
+    quilt_fixup_mkwork($headref);
 
     my $mustdeletepc=0;
     if (stat_exists ".pc") {