From 920d93ac6e3c0ddafb73eb5248058c16d9216308 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 17 Jan 2019 19:22:50 +0000
Subject: [PATCH] FIX

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/git-debrebase b/git-debrebase
index a1f3ded0..f0cd2c88 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2651,7 +2651,8 @@ END
     in_workarea sub {
 	if ($bare) {
 	    runcmd @git, qw(checkout -q -b gdr-internal), $upstream;
-	    read_tree_debian $old_head;
+	    runcmd @git, qw(rm --quiet -rf --ignore-unmatch debian);
+	    runcmd @git, qw(checkout -q), $old_head, qw(debian);
 	    runcmd @git, qw(commit --allow-empty -q -m ADD-DEBIAN);
 	} else {
 	    runcmd @git, qw(checkout -q -b gdr-internal), $old_head;
@@ -2668,6 +2669,9 @@ END
 			      ];
 	# make the anchor merge
 	# the tree is already exactly right
+	if ($bare) {
+	    runcmd @git, qw(reset -q), $upstream, qw(-- :/ :!/debian);
+	}
 	$work = make_commit [$work, $upstream], [
  'git-debrebase import: declare upstream',
  'First breakwater merge.',
-- 
2.30.2