summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-18 09:01:06 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-18 09:01:06 -0700
commit36587681b4743c980e4e74a342dc5ec105314d08 (patch)
tree35f0267f12def071aadef8de84e257f606794135 /sha1_file.c
parentf2a56171accb4fec03a30e513702283ab90088a1 (diff)
parentf6a5f1bb509a3af182fe568135398f1f2be15e5d (diff)
downloadgit-36587681b4743c980e4e74a342dc5ec105314d08.tar.gz
Merge branch 'ar/unlink-err'
* 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 'sha1_file.c')
-rw-r--r--sha1_file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 28bd9082fc..e5dec8d3c8 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2247,7 +2247,7 @@ int move_temp_to_file(const char *tmpfile, const char *filename)
goto out;
ret = errno;
}
- unlink(tmpfile);
+ unlink_or_warn(tmpfile);
if (ret) {
if (ret != EEXIST) {
return error("unable to write sha1 filename %s: %s\n", filename, strerror(ret));