summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-24 20:20:35 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-24 20:25:45 +0100
commitfc0f0a517d86fc5e4b1d9089c9960778435651cf (patch)
tree8eabf0f4310524836ffef12f0f202e43d29881f3 /git-debrebase
parentbd67a8122d87752668d1b5ee498359fcbcbe1ea5 (diff)
git-debrebase: trees_diff_walk: Support recursion
No-one specifies this yet, so NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase
index 4a70585..58d3a4a 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -232,12 +232,13 @@ sub trees_diff_walk ($$$;$) {
# $x and $y are as for get_tree
# where $name, $ix, $iy are $name and $info from get_tree
# opts are all call even for names same in both
+ # recurse call even for names same in both
my $opts = shift @_ if @_>=4;
my ($x,$y,$call) = @_;
my $all = $opts->{all};
return if !$all and $x eq $y;
- my @x = get_tree $x;
- my @y = get_tree $y;
+ my @x = get_tree $x, 0, $opts->{recurse};
+ my @y = get_tree $y, 0, $opts->{recurse};
printdebug "trees_diff_walk(..$x,$y..) ".Dumper(\@x,\@y)
if $debuglevel >= 3;
while (@x || @y) {