aboutsummaryrefslogtreecommitdiff
path: root/refs/ref-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-23 14:29:19 +0900
committerJunio C Hamano <gitster@pobox.com>2017-05-23 14:29:19 +0900
commitca7b2ab07da7551a16f1eed49ade21aa5334021b (patch)
tree617e8174b9dbdb8218e6ad28156a91ff4d234e01 /refs/ref-cache.c
parent1eb437020a2c098a7c12da4c05082fbea10d98c9 (diff)
parentc251c83df276dc0bff4d008433268ad59b7a8df2 (diff)
downloadgit-ca7b2ab07da7551a16f1eed49ade21aa5334021b.tar.xz
Merge branch 'bc/object-id'
* bc/object-id: (53 commits) object: convert parse_object* to take struct object_id tree: convert parse_tree_indirect to struct object_id sequencer: convert do_recursive_merge to struct object_id diff-lib: convert do_diff_cache to struct object_id builtin/ls-tree: convert to struct object_id merge: convert checkout_fast_forward to struct object_id sequencer: convert fast_forward_to to struct object_id builtin/ls-files: convert overlay_tree_on_cache to object_id builtin/read-tree: convert to struct object_id sha1_name: convert internals of peel_onion to object_id upload-pack: convert remaining parse_object callers to object_id revision: convert remaining parse_object callers to object_id revision: rename add_pending_sha1 to add_pending_oid http-push: convert process_ls_object and descendants to object_id refs/files-backend: convert many internals to struct object_id refs: convert struct ref_update to use struct object_id ref-filter: convert some static functions to struct object_id Convert struct ref_array_item to struct object_id Convert the verify_pack callback to struct object_id Convert lookup_tag to struct object_id ...
Diffstat (limited to 'refs/ref-cache.c')
-rw-r--r--refs/ref-cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index 6059362f1d..6b11d9cd12 100644
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -32,7 +32,7 @@ struct ref_dir *get_ref_dir(struct ref_entry *entry)
}
struct ref_entry *create_ref_entry(const char *refname,
- const unsigned char *sha1, int flag,
+ const struct object_id *oid, int flag,
int check_name)
{
struct ref_entry *ref;
@@ -41,7 +41,7 @@ struct ref_entry *create_ref_entry(const char *refname,
check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
die("Reference has invalid format: '%s'", refname);
FLEX_ALLOC_STR(ref, name, refname);
- hashcpy(ref->u.value.oid.hash, sha1);
+ oidcpy(&ref->u.value.oid, oid);
oidclr(&ref->u.value.peeled);
ref->flag = flag;
return ref;