diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:01:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:01:50 -0700 |
| commit | 2c5942dbae01e5c23d2b68aced019702eb256ad9 (patch) | |
| tree | 38b103a22d51dc22835a06d375bab806c513acdb /sha1_file.c | |
| parent | 43f8f560c03f6942cad1f12dd8ae5cfa045c8e84 (diff) | |
| parent | f6a5f1bb509a3af182fe568135398f1f2be15e5d (diff) | |
| download | git-2c5942dbae01e5c23d2b68aced019702eb256ad9.tar.gz git-2c5942dbae01e5c23d2b68aced019702eb256ad9.tar.xz | |
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 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index bd5edd8e6..e73cd4fc0 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2251,7 +2251,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)); |