merge-recursive: restore accidentally dropped setting of path

diff --git a/walker.c b/walker.c
index 96990d84dabfdd34e169c8e9fcfd656633e4f31e..d74ae59c77fb3626be0af291c6ee6fbb9c52dbb1 100644 (file)
--- a/walker.c
+++ b/walker.c
@@ -50,13 +50,13 @@ static int process_tree(struct walker *walker, struct tree *tree)
                        continue;
                if (S_ISDIR(entry.mode)) {
                        struct tree *tree = lookup_tree(the_repository,
-                                                       entry.oid);
+                                                       &entry.oid);
                        if (tree)
                                obj = &tree->object;
                }
                else {
                        struct blob *blob = lookup_blob(the_repository,
-                                                       entry.oid);
+                                                       &entry.oid);
                        if (blob)
                                obj = &blob->object;
                }