summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-16 20:30:32 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:03:11 +0100
commit93e32c149f6901257f10e688f2de60bcdbe8675e (patch)
treeda7e6b4fb4a371bbde437544f074526b67f3eda0 /git-debrebase
parentda894f5bc73ad2a5cbf6d74533818ca359f141b0 (diff)
git-debrebase: dgit import: honour $upp_limit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index ad2672f..5fa4f47 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();