summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-08-21 13:08:02 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-08-21 13:08:02 +0100
commit3f6aad2374593c67bb305dac75b3e7e249cfc828 (patch)
tree5a04060b2be8b6e7f482c5e0ea7aaaf2c6ba425a
parent65e408b63ca374ff30e165e5b876091c49f74370 (diff)
quilt fixup: Break out quilt_fixup_mkwork (nfc)
-rwxr-xr-xdgit14
1 files changed, 10 insertions, 4 deletions
diff --git a/dgit b/dgit
index e5edd55..4675944 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") {