summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-09 00:19:50 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-09 00:19:50 -0700
commitbb293b831b9d0aade79c0acf5bf6091106e7d19b (patch)
tree6549f6423c83a66b04bf51daedcb5fa592170c27 /refs.c
parentfd11ae0b52b6d059056a32851a916c152befae1a (diff)
parente09c4e753c337d914f4eb7a05cb5e8bbfc362489 (diff)
downloadgit-bb293b831b9d0aade79c0acf5bf6091106e7d19b.tar.gz
Merge branch 'maint'
* maint: Start preparing release notes for 1.5.6.3 git-submodule - Fix bugs in adding an existing repo as a module bash: offer only paths after '--' Remove unnecessary pack-*.keep file after successful git-clone make deleting a missing ref more quiet
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/refs.c b/refs.c
index 6c6e9e5e19..39a3b23804 100644
--- a/refs.c
+++ b/refs.c
@@ -925,7 +925,7 @@ int delete_ref(const char *refname, const unsigned char *sha1)
i = strlen(lock->lk->filename) - 5; /* .lock */
lock->lk->filename[i] = 0;
err = unlink(lock->lk->filename);
- if (err) {
+ if (err && errno != ENOENT) {
ret = 1;
error("unlink(%s) failed: %s",
lock->lk->filename, strerror(errno));