Split brain: Make git tree in fake sooner (nfc)

[dgit.git] / dgit

diff --git a/dgit b/dgit
index ae75cb9be9a127cc6b2438b544ba4164fcd683f4..4283a27574020c2e32fe7fd0fb6a04a363af8435 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1209,10 +1209,12 @@ our ($dsc_hash,$lastpush_hash);
 
 our $ud = '.git/dgit/unpack';
 
-sub prep_ud () {
-    rmtree($ud);
+sub prep_ud (;$) {
+    my ($d) = @_;
+    $d //= $ud;
+    rmtree($d);
     mkpath '.git/dgit';
-    mkdir $ud or die $!;
+    mkdir $d or die $!;
 }
 
 sub mktree_in_ud_here () {
@@ -1977,6 +1979,7 @@ END
     my $format = getfield $dsc, 'Format';
     printdebug "format $format\n";
     if (madformat($format)) {
+       # user might have not used dgit build, so maybe do this now:
        commit_quilty_patch();
     }
     check_not_dirty();
@@ -2557,8 +2560,6 @@ sub quiltify ($$) {
     # should be contained within debian/patches.
 
     changedir '../fake';
-    remove_stray_gits();
-    mktree_in_ud_here();
     rmtree '.pc';
     runcmd @git, qw(add -Af .);
     my $oldtiptree=git_write_tree();
@@ -2923,6 +2924,13 @@ END
     my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
     rename $fakexdir, "fake" or die "$fakexdir $!";
 
+    changedir 'fake';
+
+    remove_stray_gits();
+    mktree_in_ud_here();
+
+    changedir '..';
+
     quilt_fixup_mkwork($headref);
 
     my $mustdeletepc=0;