From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 12 Aug 2018 18:02:30 +0000 (+0100)
Subject: git-debrebase: Drop a redundant call to $read_tree_upstream
X-Git-Tag: archive/debian/6.7~59
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d62795ff059d1c5854f49d6ea84e2bfebf94e621

git-debrebase: Drop a redundant call to $read_tree_upstream

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

diff --git a/git-debrebase b/git-debrebase
index 41373f3e..482c432d 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') {