summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-12 19:02:30 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-12 19:02:30 +0100
commitd62795ff059d1c5854f49d6ea84e2bfebf94e621 (patch)
treec39d81a9f20920bb940ed20a6f94998830b2c190
parente2ef34589c5758d96f492bec534eb9b3398fa960 (diff)
git-debrebase: Drop a redundant call to $read_tree_upstream
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase1
1 files changed, 0 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 41373f3..482c432 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1474,7 +1474,6 @@ sub walk ($;$$$) {
print "Found a general merge, will try to tidy it up.\n";
$rewriting = 1;
$read_tree_upstream->($cl->{MergeBestAnchor});
- $read_tree_upstream->($cl->{MergeBestAnchor});
read_tree_debian($cltree);
@parents = map { $_->{Breakwater} } @{ $cl->{Parents} };
} elsif ($method eq 'MergeMergeSeries') {