chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split brain: Make git tree in fake sooner (nfc)
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 2069298b906741e9d6f2a93f5afe793ccf5146c4..4283a27574020c2e32fe7fd0fb6a04a363af8435 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2560,8
+2560,6
@@
sub quiltify ($$) {
# should be contained within debian/patches.
changedir '../fake';
# 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();
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 $!";
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;
quilt_fixup_mkwork($headref);
my $mustdeletepc=0;