summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-11-08 22:59:46 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:46 +0100
commit1ad50a40447cf930bde69ee6b0a21b6d35c15104 (patch)
tree36be44fd3ed95ca08b161aeb5b9e6248b3221f22
parenta9fe4afebac6f0450fa7ed5ff73b8d6d7792fe32 (diff)
Split brain: Make git tree in fake sooner (nfc)
No overall functional change.
-rwxr-xr-xdgit9
1 files changed, 7 insertions, 2 deletions
diff --git a/dgit b/dgit
index 2069298..4283a27 100755
--- 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;