From: Ian Jackson Date: Sun, 8 Nov 2015 22:59:46 +0000 (+0000) Subject: Split brain: Make git tree in fake sooner (nfc) X-Git-Tag: archive/debian/2.0~333 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=1ad50a40447cf930bde69ee6b0a21b6d35c15104 Split brain: Make git tree in fake sooner (nfc) No overall functional change. --- diff --git a/dgit b/dgit index 2069298b..4283a275 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;