FIX

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

diff --git a/git-debrebase b/git-debrebase
index a1f3ded0c5576d446c827dbb43389fbb22bb63fa..f0cd2c88630375e89fcf00b4051346494cead12c 100755 (executable)
--- 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.',