Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
commit-graph: add repo arg to graph readers
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 41366e75e20edbb086efcf99098495da27f1fe63..1dd6ec384de132d24f96b2ee89639bb765de9589 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-3467,7
+3467,8
@@
static struct commit *get_ref(const struct object_id *oid, const char *name)
{
struct object *object;
- object = deref_tag(parse_object(the_repository, oid), name,
+ object = deref_tag(the_repository, parse_object(the_repository, oid),
+ name,
strlen(name));
if (!object)
return NULL;