tempfile: do not delete tempfile on failed close

[git/git.git] / lockfile.h

diff --git a/lockfile.h b/lockfile.h
index 5720649..dd4259b 100644 (file)
--- a/lockfile.h
+++ b/lockfile.h
@@ -246,7 +246,13 @@ extern char *get_locked_file_path(struct lock_file *lk);
  */
 static inline int close_lock_file(struct lock_file *lk)
 {
-       return close_tempfile(&lk->tempfile);
+       int ret = close_tempfile_gently(&lk->tempfile);
+       if (ret) {
+               int saved_errno = errno;
+               delete_tempfile(&lk->tempfile);
+               errno = saved_errno;
+       }
+       return ret;
 }
 
 /*