chiark / gitweb /
Split brain: Capture patches-unapplied tree object
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Jun 2016 10:44:47 +0000 (11:44 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:46 +0000 (16:47 +0100)
No functional change as yet.  But, now the correct value for $origtree
is passed to quiltify.

dgit

diff --git a/dgit b/dgit
index 5910c77..97bd283 100755 (executable)
--- 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;