From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Feb 2018 20:30:32 +0000 (+0000)
Subject: git-debrebase: dgit import: honour $upp_limit
X-Git-Tag: archive/debian/5.0~203
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=93e32c149f6901257f10e688f2de60bcdbe8675e

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 ad2672f1..5fa4f473 100755
--- 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();