chiark / gitweb /
git-debrebase: Drop a redundant call to $read_tree_upstream
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 12 Aug 2018 18:02:30 +0000 (19:02 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 12 Aug 2018 18:02:30 +0000 (19:02 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index 41373f3..482c432 100755 (executable)
@@ -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') {