git-debrebase: dgit import: honour $upp_limit

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

diff --git a/git-debrebase b/git-debrebase
index ad2672f1cd3e4f7633af0ee3b05874b6f06e80b5..5fa4f47377ae3e4035606f989beaee4aed40afb2 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -660,7 +660,6 @@ sub walk ($;$$) {
                $prline->(" Import");
                $rewrite_from_here->();
                $upp_limit //= $#upp_cl; # further, deeper, patches discarded
-                die 'BUG $upp_limit is not used anywhere?';
                $cur = $ovwr;
                next;
            } else {
@@ -702,6 +701,8 @@ sub walk ($;$$) {
        runcmd @git, qw(read-tree), $treeish;
        $read_tree_debian->($build);
     };
+
+    $#upp_cl = $upp_limit if defined $upp_limit;
  
     my $committer_authline = calculate_committer_authline();