undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs: factor delete_ref loose ref step into a helper

Browse Source 
Factor loose ref deletion into helper function delete_ref_loose to allow
later use elsewhere.

Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brad King 2013-09-04 11:22:41 -04:00 committed by Junio C Hamano
parent 4738a33338
commit 2ddb5d170a
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
refs.c
View File

@ -2450,24 +2450,31 @@ static int repack_without_ref(const char *refname)
return commit_packed_refs(); return commit_packed_refs();
} }
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) - 5; /* .lock */
lock->lk->filename[i] = 0;
err = unlink_or_warn(lock->lk->filename);
lock->lk->filename[i] = '.';
if (err && errno != ENOENT)
return 1;
}
return 0;
}
int delete_ref(const char *refname, const unsigned char *sha1, int delopt) int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
{ {
struct ref_lock *lock; struct ref_lock *lock;
int err, i = 0, ret = 0, flag = 0; int ret = 0, flag = 0;
lock = lock_ref_sha1_basic(refname, sha1, delopt, &flag); lock = lock_ref_sha1_basic(refname, sha1, delopt, &flag);
if (!lock) if (!lock)
return 1; return 1;
if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) { ret |= delete_ref_loose(lock, flag);
/* loose */
i = strlen(lock->lk->filename) - 5; /* .lock */
lock->lk->filename[i] = 0;
err = unlink_or_warn(lock->lk->filename);
if (err && errno != ENOENT)
ret = 1;
lock->lk->filename[i] = '.';
}
/* removing the loose one could have resurrected an earlier /* removing the loose one could have resurrected an earlier
* packed one. Also, if it was not loose we need to repack * packed one. Also, if it was not loose we need to repack
* without it. * without it.