X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pack-refs.c;h=301fc60eae1ad53721851a272a0fbd0192881801;hb=d1f6c18bd6ea5fd373f9f6356e02854678ffa0fd;hp=848d311c2b2c651dbb14893c260584f00c639357;hpb=2b603260f325b895baa20867bd45c8e251f19b78;p=git.git diff --git a/pack-refs.c b/pack-refs.c index 848d311c2..301fc60ea 100644 --- a/pack-refs.c +++ b/pack-refs.c @@ -66,7 +66,7 @@ static void prune_ref(struct ref_to_prune *r) struct ref_lock *lock = lock_ref_sha1(r->name + 5, r->sha1); if (lock) { - unlink(git_path("%s", r->name)); + unlink_or_warn(git_path("%s", r->name)); unlock_ref(lock); } } @@ -89,7 +89,8 @@ int pack_refs(unsigned int flags) memset(&cbdata, 0, sizeof(cbdata)); cbdata.flags = flags; - fd = hold_lock_file_for_update(&packed, git_path("packed-refs"), 1); + fd = hold_lock_file_for_update(&packed, git_path("packed-refs"), + LOCK_DIE_ON_ERROR); cbdata.refs_file = fdopen(fd, "w"); if (!cbdata.refs_file) die("unable to create ref-pack file structure (%s)",