diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2017-01-06 17:22:38 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-01-07 19:30:09 -0800 |
| commit | 0e81d016f11ce93494b73d68220f59cf4b5a1da2 (patch) | |
| tree | fdb4537c696c5b673717cee9b3960132c14e5695 /refs | |
| parent | log_ref_write_1(): inline function (diff) | |
| download | tgif-0e81d016f11ce93494b73d68220f59cf4b5a1da2.tar.xz | |
delete_ref_loose(): derive loose reference path from lock
It is simpler to derive the path to the file that must be deleted from
"lock->ref_name" than from the lock_file object.
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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index 39d6f5b782..4d5536458b 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -2430,10 +2430,7 @@ static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err) * loose. The loose file name is the same as the * lockfile name, minus ".lock": */ - char *loose_filename = get_locked_file_path(lock->lk); - int res = unlink_or_msg(loose_filename, err); - free(loose_filename); - if (res) + if (unlink_or_msg(git_path("%s", lock->ref_name), err)) return 1; } return 0; |