chiark / gitweb /
Split brain: Make git tree in fake sooner (nfc)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 8 Nov 2015 22:59:46 +0000 (22:59 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:46 +0000 (16:47 +0100)
No overall functional change.

dgit

diff --git a/dgit b/dgit
index 2069298..4283a27 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2560,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();
@@ -2926,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;