chiark / gitweb /
git-debrebase: dgit import: honour $upp_limit
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 16 Feb 2018 20:30:32 +0000 (20:30 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:03:11 +0000 (16:03 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index ad2672f..5fa4f47 100755 (executable)
@@ -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();