git-debrebase: trees_diff_walk: Support recursion

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 4a705854c1581754e6eea4c69b1c672ea83b8ea7..58d3a4abf3e3bf4a0acd2a2c5d2fcfaab1b6fdfd 100755 (executable)
--- 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) {