зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
7108ad232f
Коммит
91f1f19184
15
refs.c
15
refs.c
|
@ -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)
|
||||
{
|
||||
if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) {
|
||||
/* loose */
|
||||
int err, i = strlen(lock->lk->filename) - LOCK_SUFFIX_LEN;
|
||||
|
||||
lock->lk->filename[i] = 0;
|
||||
err = unlink_or_warn(lock->lk->filename);
|
||||
lock->lk->filename[i] = LOCK_SUFFIX[0];
|
||||
/*
|
||||
* loose. The loose file name is the same as the
|
||||
* lockfile name, minus ".lock":
|
||||
*/
|
||||
char *loose_filename = xmemdupz(
|
||||
lock->lk->filename,
|
||||
strlen(lock->lk->filename) - LOCK_SUFFIX_LEN);
|
||||
int err = unlink_or_warn(loose_filename);
|
||||
free(loose_filename);
|
||||
if (err && errno != ENOENT)
|
||||
return 1;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче