diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2017-03-26 09:42:34 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-14 03:53:25 -0700 |
| commit | 7d2df051d05bc65a0a540ba080f07b421b4d99d7 (patch) | |
| tree | a6624b0c18dabb0c59446e5a54f5cab553081be9 /refs/files-backend.c | |
| parent | 18d0002d6ddc191454b6b4a99cdac65fc7ff9ece (diff) | |
| download | git-7d2df051d05bc65a0a540ba080f07b421b4d99d7.tar.gz | |
refs: add new ref-store api
This is not meant to cover all existing API. It adds enough to test ref
stores with the new test program test-ref-store, coming soon and to be
used by files-backend.c.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs/files-backend.c')
| -rw-r--r-- | refs/files-backend.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index c90b47232e..f3ebdb279d 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1313,7 +1313,7 @@ static void read_loose_refs(const char *dirname, struct ref_dir *dir) create_dir_entry(refs, refname.buf, refname.len, 1)); } else { - if (!resolve_ref_recursively(&refs->base, + if (!refs_resolve_ref_unsafe(&refs->base, refname.buf, RESOLVE_REF_READING, sha1, &flag)) { @@ -1622,7 +1622,8 @@ retry: * another reference such as "refs/foo". There is no * reason to expect this error to be transitory. */ - if (verify_refname_available(refname, extras, skip, err)) { + if (refs_verify_refname_available(&refs->base, refname, + extras, skip, err)) { if (mustexist) { /* * To the user the relevant error is @@ -2670,7 +2671,7 @@ static int files_rename_ref(struct ref_store *ref_store, oldrefname); goto out; } - if (!rename_ref_available(oldrefname, newrefname)) { + if (!refs_rename_ref_available(&refs->base, oldrefname, newrefname)) { ret = 1; goto out; } @@ -4054,9 +4055,9 @@ static int files_initial_transaction_commit(struct ref_store *ref_store, if ((update->flags & REF_HAVE_OLD) && !is_null_sha1(update->old_sha1)) die("BUG: initial ref transaction with old_sha1 set"); - if (verify_refname_available(update->refname, - &affected_refnames, NULL, - err)) { + if (refs_verify_refname_available(&refs->base, update->refname, + &affected_refnames, NULL, + err)) { ret = TRANSACTION_NAME_CONFLICT; goto cleanup; } |