From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 24 Aug 2018 19:20:35 +0000 (+0100)
Subject: git-debrebase: trees_diff_walk: Support recursion
X-Git-Tag: archive/debian/6.10~70
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=fc0f0a517d86fc5e4b1d9089c9960778435651cf

git-debrebase: trees_diff_walk: Support recursion

No-one specifies this yet, so NFC.

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

diff --git a/git-debrebase b/git-debrebase
index 4a705854..58d3a4ab 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) {