chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e2ef345
)
git-debrebase: Drop a redundant call to $read_tree_upstream
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 12 Aug 2018 18:02:30 +0000
(19:02 +0100)
committer
Ian 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
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 41373f3e82f4083291bb74f586ba229303b799ef..482c432de9d0f6af2d3603b0965a45b27c422035 100755
(executable)
--- 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') {