undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read_raw_ref(): take a (struct ref_store *) argument

Browse Source 
And make the function work for submodules.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2016-09-04 18:08:20 +02:00 committed by Junio C Hamano
parent b9180c9d5d
commit 34c7ad8ffc
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
refs.c
View File

@ -1222,6 +1222,7 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
static struct strbuf sb_refname = STRBUF_INIT; static struct strbuf sb_refname = STRBUF_INIT;
int unused_flags; int unused_flags;
int symref_count; int symref_count;
struct ref_store *refs = get_ref_store(NULL);
if (!flags) if (!flags)
flags = &unused_flags; flags = &unused_flags;
@ -1249,7 +1250,8 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
for (symref_count = 0; symref_count < SYMREF_MAXDEPTH; symref_count++) { for (symref_count = 0; symref_count < SYMREF_MAXDEPTH; symref_count++) {
unsigned int read_flags = 0; unsigned int read_flags = 0;
if (read_raw_ref(refname, sha1, &sb_refname, &read_flags)) { if (read_raw_ref(refs, refname,
sha1, &sb_refname, &read_flags)) {
*flags |= read_flags; *flags |= read_flags;
if (errno != ENOENT || (resolve_flags & RESOLVE_REF_READING)) if (errno != ENOENT || (resolve_flags & RESOLVE_REF_READING))
return NULL; return NULL;

18
refs/files-backend.c
View File

@ -1349,11 +1349,12 @@ static int resolve_packed_ref(struct files_ref_store *refs,
return -1; return -1;
} }
int read_raw_ref(const char *refname, unsigned char *sha1, int read_raw_ref(struct ref_store *ref_store,
const char *refname, unsigned char *sha1,
struct strbuf *referent, unsigned int *type) struct strbuf *referent, unsigned int *type)
{ {
struct files_ref_store *refs = struct files_ref_store *refs =
get_files_ref_store(NULL, "read_raw_ref"); files_downcast(ref_store, 1, "read_raw_ref");
struct strbuf sb_contents = STRBUF_INIT; struct strbuf sb_contents = STRBUF_INIT;
struct strbuf sb_path = STRBUF_INIT; struct strbuf sb_path = STRBUF_INIT;
const char *path; const char *path;
@ -1365,7 +1366,12 @@ int read_raw_ref(const char *refname, unsigned char *sha1,
*type = 0; *type = 0;
strbuf_reset(&sb_path); strbuf_reset(&sb_path);
strbuf_git_path(&sb_path, "%s", refname);
if (*refs->base.submodule)
strbuf_git_path_submodule(&sb_path, refs->base.submodule, "%s", refname);
else
strbuf_git_path(&sb_path, "%s", refname);
path = sb_path.buf; path = sb_path.buf;
stat_ref: stat_ref:
@ -1592,8 +1598,9 @@ static int lock_raw_ref(const char *refname, int mustexist,
unsigned int *type, unsigned int *type,
struct strbuf *err) struct strbuf *err)
{ {
struct ref_store *ref_store = get_ref_store(NULL);
struct files_ref_store *refs = struct files_ref_store *refs =
get_files_ref_store(NULL, "lock_raw_ref"); files_downcast(ref_store, 0, "lock_raw_ref");
struct ref_lock *lock; struct ref_lock *lock;
struct strbuf ref_file = STRBUF_INIT; struct strbuf ref_file = STRBUF_INIT;
int attempts_remaining = 3; int attempts_remaining = 3;
@ -1683,7 +1690,8 @@ retry:
* fear that its value will change. * fear that its value will change.
*/ */
if (read_raw_ref(refname, lock->old_oid.hash, referent, type)) { if (read_raw_ref(ref_store, refname,
lock->old_oid.hash, referent, type)) {
if (errno == ENOENT) { if (errno == ENOENT) {
if (mustexist) { if (mustexist) {
/* Garden variety missing reference. */ /* Garden variety missing reference. */

9
refs/refs-internal.h
View File

@ -484,9 +484,11 @@ extern struct ref_iterator *current_ref_iter;
int do_for_each_ref_iterator(struct ref_iterator *iter, int do_for_each_ref_iterator(struct ref_iterator *iter,
each_ref_fn fn, void *cb_data); each_ref_fn fn, void *cb_data);
struct ref_store;
/* /*
* Read the specified reference from the filesystem or packed refs * Read a reference from the specified reference store, non-recursively.
* file, non-recursively. Set type to describe the reference, and: * Set type to describe the reference, and:
* *
* - If refname is the name of a normal reference, fill in sha1 * - If refname is the name of a normal reference, fill in sha1
* (leaving referent unchanged). * (leaving referent unchanged).
@ -522,7 +524,8 @@ int do_for_each_ref_iterator(struct ref_iterator *iter,
* - in all other cases, referent will be untouched, and therefore * - in all other cases, referent will be untouched, and therefore
* refname will still be valid and unchanged. * refname will still be valid and unchanged.
*/ */
int read_raw_ref(const char *refname, unsigned char *sha1, int read_raw_ref(struct ref_store *ref_store,
const char *refname, unsigned char *sha1,
struct strbuf *referent, unsigned int *type); struct strbuf *referent, unsigned int *type);
/* refs backends */ /* refs backends */