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

Merge branch 'rs/lock-correct-ref-during-delete' into maint

Browse Source 
* rs/lock-correct-ref-during-delete:
  refs: lock symref that is to be deleted, not its target
This commit is contained in:
Junio C Hamano 2012-11-20 10:14:41 -08:00
commit c5afc5b73e
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
refs.c
View File

@ -1753,26 +1753,18 @@ 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 err, i = 0, ret = 0, flag = 0;
lock = lock_ref_sha1_basic(refname, sha1, 0, &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) { if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) {
/* loose */ /* loose */
const char *path; i = strlen(lock->lk->filename) - 5; /* .lock */
lock->lk->filename[i] = 0;
if (!(delopt & REF_NODEREF)) { err = unlink_or_warn(lock->lk->filename);
i = strlen(lock->lk->filename) - 5; /* .lock */
lock->lk->filename[i] = 0;
path = lock->lk->filename;
} else {
path = git_path("%s", refname);
}
err = unlink_or_warn(path);
if (err && errno != ENOENT) if (err && errno != ENOENT)
ret = 1; ret = 1;
if (!(delopt & REF_NODEREF)) lock->lk->filename[i] = '.';
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