summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-06-04 11:44:47 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:46 +0100
commit6ea481cc3ed14084a6917b16443d228dc124bbe5 (patch)
tree12471d44de6c628fd22bff341458337560e2b4ce /dgit
parentfbb665eaf5e2ca9d027128dd8838adc15c934b30 (diff)
Split brain: Capture patches-unapplied tree object
No functional change as yet. But, now the correct value for $origtree is passed to quiltify.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit13
1 files changed, 9 insertions, 4 deletions
diff --git a/dgit b/dgit
index 5910c77..97bd283 100755
--- a/dgit
+++ b/dgit
@@ -2940,18 +2940,23 @@ END
changedir 'fake';
- ensuredir '.pc';
-
remove_stray_gits();
mktree_in_ud_here();
+ rmtree '.pc';
+
+ runcmd @git, qw(add -Af .);
+ my $origtree=git_write_tree();
+
+ printdebug "fake orig tree object $origtree\n";
+
+ ensuredir '.pc';
+
runcmd qw(sh -ec),
'exec dpkg-source --before-build . >/dev/null';
changedir '..';
- my $origtree='';
-
quilt_fixup_mkwork($headref);
my $mustdeletepc=0;