mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get_locked_file_path(): new function

Browse Source 
Add a function to return the path of the file that is locked by a
lock_file object. This reduces the knowledge that callers have to have
about the lock_file layout.

Suggested-by: Ronnie Sahlberg <sahlberg@google.com>
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
2014-10-01 12:28:39 +02:00
committed by Junio C Hamano
parent 316683bd37
commit ec38b4e482
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
refs.c
View File

@ -2606,9 +2606,7 @@ static int delete_ref_loose(struct ref_lock *lock, int flag)
* loose. The loose file name is the same as the
* lockfile name, minus ".lock":
*/
char *loose_filename = xmemdupz(
lock->lk->filename.buf,
lock->lk->filename.len - LOCK_SUFFIX_LEN);
char *loose_filename = get_locked_file_path(lock->lk);
int err = unlink_or_warn(loose_filename);
free(loose_filename);
if (err && errno != ENOENT)