diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2017-01-06 17:22:39 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-01-07 19:30:09 -0800 |
| commit | ce0af24de01114552e37ec87dbb948013454f3e1 (patch) | |
| tree | 21eecd28b202bdd0828150ba84942e40ea9fdae4 /refs | |
| parent | delete_ref_loose(): derive loose reference path from lock (diff) | |
| download | tgif-ce0af24de01114552e37ec87dbb948013454f3e1.tar.xz | |
delete_ref_loose(): inline function
It was hardly doing anything anymore, and had only one caller.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs')
| -rw-r--r-- | refs/files-backend.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index 4d5536458b..9abd7c39cd 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -2421,21 +2421,6 @@ static int repack_without_refs(struct files_ref_store *refs, return ret; } -static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err) -{ - assert(err); - - if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) { - /* - * loose. The loose file name is the same as the - * lockfile name, minus ".lock": - */ - if (unlink_or_msg(git_path("%s", lock->ref_name), err)) - return 1; - } - return 0; -} - static int files_delete_refs(struct ref_store *ref_store, struct string_list *refnames, unsigned int flags) { @@ -3788,9 +3773,13 @@ static int files_transaction_commit(struct ref_store *ref_store, if (update->flags & REF_DELETING && !(update->flags & REF_LOG_ONLY)) { - if (delete_ref_loose(lock, update->type, err)) { - ret = TRANSACTION_GENERIC_ERROR; - goto cleanup; + if (!(update->type & REF_ISPACKED) || + update->type & REF_ISSYMREF) { + /* It is a loose reference. */ + if (unlink_or_msg(git_path("%s", lock->ref_name), err)) { + ret = TRANSACTION_GENERIC_ERROR; + goto cleanup; + } } if (!(update->flags & REF_ISPRUNING)) |