Merge branch 'sb/submodule-merge-in-merge-recursive'

diff --git a/walker.c b/walker.c
index 8eb7db7a52782c9862718979e5270724fd982d1f..0b162a09b95a3eadeef47f3e6d314d386215cc9f 100644 (file)
--- a/walker.c
+++ b/walker.c
@@ -88,7 +88,7 @@ static int process_commit(struct walker *walker, struct commit *commit)
 
        walker_say(walker, "walk %s\n", oid_to_hex(&commit->object.oid));
 
-       if (process(walker, &commit->tree->object))
+       if (process(walker, &get_commit_tree(commit)->object))
                return -1;
 
        for (parents = commit->parents; parents; parents = parents->next) {