path: root/builtin/merge-tree.c
diff options
authorStefan Beller <>2018-06-29 01:21:55 (GMT)
committerJunio C Hamano <>2018-06-29 17:43:38 (GMT)
commitda14a7ff99e1d011192a1fe330dd3fddf8977dc3 (patch)
tree1e65afa27b386a73556aa57a1b06a90a35d54f86 /builtin/merge-tree.c
parent1268dfac1e98e973c63abb142551c64bba6a44ca (diff)
blob: add repository argument to lookup_blob
Add a repository argument to allow the callers of lookup_blob to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Jonathan Nieder <> Signed-off-by: Stefan Beller <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/merge-tree.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 8a8d579..f8023ba 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -2,6 +2,7 @@
#include "tree-walk.h"
#include "xdiff-interface.h"
#include "object-store.h"
+#include "repository.h"
#include "blob.h"
#include "exec-cmd.h"
#include "merge-blobs.h"
@@ -170,7 +171,7 @@ static struct merge_list *create_entry(unsigned stage, unsigned mode, const stru
res->stage = stage;
res->path = path;
res->mode = mode;
- res->blob = lookup_blob(oid);
+ res->blob = lookup_blob(the_repository, oid);
return res;