Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rollback_packed_refs(): take a `packed_ref_store *` parameter
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 92e0a63dcc8a4040fbdadf1f35d679a42e6d27d1..ae5238d82ca8c86b99391a0836a0539efe7eacde 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-2103,7
+2103,7
@@
static struct commit *get_ref(const struct object_id *oid, const char *name)
{
struct object *object;
- object = deref_tag(parse_object(oid
->hash
), name, strlen(name));
+ object = deref_tag(parse_object(oid), name, strlen(name));
if (!object)
return NULL;
if (object->type == OBJ_TREE)