From: Michael Haggerty Date: Fri, 03 Jun 2016 21:04:04 GMT Subject: [PATCH 29/38] split_symref_update(): add a files_ref_store argument Message-ID: <68c836148e4c8655161fba54cd1fd56a0e48dbbb.1464983301.git.mhagger@alum.mit.edu> In-Reply-To: Signed-off-by: Michael Haggerty --- refs/files-backend.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index 24b7c60..8d3cf96 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -3405,7 +3405,8 @@ static int split_head_update(struct ref_update *update, * Note that the new update will itself be subject to splitting when * the iteration gets to it. */ -static int split_symref_update(struct ref_update *update, +static int split_symref_update(struct files_ref_store *refs, + struct ref_update *update, const char *referent, struct ref_transaction *transaction, struct string_list *affected_refnames, @@ -3556,7 +3557,6 @@ static int lock_ref_for_update(struct files_ref_store *refs, sha1_to_hex(update->old_sha1)); return TRANSACTION_GENERIC_ERROR; } - } else { /* * Create a new update for the reference this @@ -3565,7 +3565,8 @@ static int lock_ref_for_update(struct files_ref_store *refs, * of processing the split-off update, so we * don't have to do it here. */ - ret = split_symref_update(update, referent.buf, transaction, + ret = split_symref_update(refs, update, + referent.buf, transaction, affected_refnames, err); if (ret) return ret; -- 2.8.1