kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

delete_ref_loose(): don't muck around in the lock_file's filename 

It's bad manners. Especially since there could be a signal during the
call to unlink_or_warn(), in which case the signal handler will see
the wrong filename and delete the reference file, leaving the lockfile
behind.

So make our own copy to work with.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 2014-10-01 12:28:16 +02:00 committed by Junio C Hamano
parent 7108ad232f
commit 91f1f19184
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
refs.c
View File

@ -2602,12 +2602,15 @@ int repack_without_refs(const char **refnames, int n, struct strbuf *err)
static int delete_ref_loose(struct ref_lock *lock, int flag) static int delete_ref_loose(struct ref_lock *lock, int flag)
{ {
if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) { if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) {
/* loose */ /*
int err, i = strlen(lock->lk->filename) - LOCK_SUFFIX_LEN; * loose. The loose file name is the same as the

* lockfile name, minus ".lock":
lock->lk->filename[i] = 0; */
err = unlink_or_warn(lock->lk->filename); char *loose_filename = xmemdupz(
lock->lk->filename[i] = LOCK_SUFFIX[0]; lock->lk->filename,
strlen(lock->lk->filename) - LOCK_SUFFIX_LEN);
int err = unlink_or_warn(loose_filename);
free(loose_filename);
if (err && errno != ENOENT) if (err && errno != ENOENT)
return 1; return 1;
} }