Skip to content

Commit 8d68493

Browse files
gitstergitster
committed
Merge branch 'mh/ref-api'
* mh/ref-api: add_ref(): take a (struct ref_entry *) parameter create_ref_entry(): extract function from add_ref() repack_without_ref(): remove temporary resolve_gitlink_ref_recursive(): change to work with struct ref_cache Pass a (ref_cache *) to the resolve_gitlink_*() helper functions resolve_gitlink_ref(): improve docstring get_ref_dir(): change signature refs: change signatures of get_packed_refs() and get_loose_refs() is_dup_ref(): extract function from sort_ref_array() add_ref(): add docstring parse_ref_line(): add docstring is_refname_available(): remove the "quiet" argument clear_ref_array(): rename from free_ref_array() refs: rename parameters result -> sha1 refs: rename "refname" variables struct ref_entry: document name member Conflicts: cache.h refs.c
2 parents 184a541 + dd73ecd commit 8d68493

File tree

3 files changed

+284
-258
lines changed

3 files changed

+284
-258
lines changed

‎cache.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,9 +833,9 @@ static inline int get_sha1_with_context(const char *str, unsigned char *sha1, st
833833
extern int get_sha1_hex(const char *hex, unsigned char *sha1);
834834

835835
extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */
836-
extern int read_ref_full(const char *filename, unsigned char *sha1,
836+
extern int read_ref_full(const char *refname, unsigned char *sha1,
837837
int reading, int *flags);
838-
extern int read_ref(const char *filename, unsigned char *sha1);
838+
extern int read_ref(const char *refname, unsigned char *sha1);
839839

840840
/*
841841
* Resolve a reference, recursively following symbolic refererences.

0 commit comments

Comments
 (0)