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

add_packed_ref(): add a files_ref_store argument

Browse Source 
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:12 +02:00 committed by Junio C Hamano
parent 00eebe351c
commit d99825ab73
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
refs/files-backend.c
View File

@ -1192,10 +1192,9 @@ static struct ref_dir *get_packed_refs(struct files_ref_store *refs)
* lock_packed_refs()). To actually write the packed-refs file, call * lock_packed_refs()). To actually write the packed-refs file, call
* commit_packed_refs(). * commit_packed_refs().
*/ */
static void add_packed_ref(const char *refname, const unsigned char *sha1) static void add_packed_ref(struct files_ref_store *refs,
const char *refname, const unsigned char *sha1)
{ {
struct files_ref_store *refs =
get_files_ref_store(NULL, "add_packed_ref");
struct packed_ref_cache *packed_ref_cache = get_packed_ref_cache(refs); struct packed_ref_cache *packed_ref_cache = get_packed_ref_cache(refs);
if (!packed_ref_cache->lock) if (!packed_ref_cache->lock)
@ -3869,6 +3868,8 @@ static int ref_present(const char *refname,
int initial_ref_transaction_commit(struct ref_transaction *transaction, int initial_ref_transaction_commit(struct ref_transaction *transaction,
struct strbuf *err) struct strbuf *err)
{ {
struct files_ref_store *refs =
get_files_ref_store(NULL, "initial_ref_transaction_commit");
int ret = 0, i; int ret = 0, i;
struct string_list affected_refnames = STRING_LIST_INIT_NODUP; struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
@ -3928,7 +3929,7 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
if ((update->flags & REF_HAVE_NEW) && if ((update->flags & REF_HAVE_NEW) &&
!is_null_sha1(update->new_sha1)) !is_null_sha1(update->new_sha1))
add_packed_ref(update->refname, update->new_sha1); add_packed_ref(refs, update->refname, update->new_sha1);
} }
if (commit_packed_refs()) { if (commit_packed_refs()) {