From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 30 Jan 2018 18:30:13 +0000 (+0000)
Subject: git-debrebase: bugfix
X-Git-Tag: archive/debian/5.0~295
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f7f1612c112ce478a3e9a2aaacaec08bebabcdd2;ds=sidebyside

git-debrebase: bugfix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 6fb2822c..1961bcc5 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -263,7 +263,7 @@ sub rm_subdir_cached ($) {
 sub read_tree_subdir ($$) {
     my ($subdir, $new_tree_object) = @_;
     rm_subdir_cached $subdir;
-    runcmd @git, qw(read-tree), "--prefix=$subdir/";
+    runcmd @git, qw(read-tree), "--prefix=$subdir/", $new_tree_object;
 }
 
 # classify returns an info hash like this