summaryrefslogtreecommitdiff
path: root/builtin-fetch-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-26 02:01:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-26 02:01:50 (GMT)
commit2c5942dbae01e5c23d2b68aced019702eb256ad9 (patch)
tree38b103a22d51dc22835a06d375bab806c513acdb /builtin-fetch-pack.c
parent43f8f560c03f6942cad1f12dd8ae5cfa045c8e84 (diff)
parentf6a5f1bb509a3af182fe568135398f1f2be15e5d (diff)
downloadgit-2c5942dbae01e5c23d2b68aced019702eb256ad9.zip
git-2c5942dbae01e5c23d2b68aced019702eb256ad9.tar.gz
git-2c5942dbae01e5c23d2b68aced019702eb256ad9.tar.bz2
Merge branch 'ar/unlink-err' into maint
* ar/unlink-err: print unlink(2) errno in copy_or_link_directory replace direct calls to unlink(2) with unlink_or_warn Introduce an unlink(2) wrapper which gives warning if unlink failed
Diffstat (limited to 'builtin-fetch-pack.c')
-rw-r--r--builtin-fetch-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c
index 87f46c6..6202462 100644
--- a/builtin-fetch-pack.c
+++ b/builtin-fetch-pack.c
@@ -825,7 +825,7 @@ struct ref *fetch_pack(struct fetch_pack_args *my_args,
fd = hold_lock_file_for_update(&lock, shallow,
LOCK_DIE_ON_ERROR);
if (!write_shallow_commits(fd, 0)) {
- unlink(shallow);
+ unlink_or_warn(shallow);
rollback_lock_file(&lock);
} else {
commit_lock_file(&lock);