git-am: Add am.keepcr and --no-keep-cr to override it

diff --git a/server-info.c b/server-info.c
index 906ce5b27242ca1e415a5410135d58f1c000e8b0..4098ca2b5c166c32cfe4aea9d1bff2e6593e9a60 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -246,7 +246,7 @@ int update_server_info(int force)
        errs = errs | update_info_packs(force);
 
        /* remove leftover rev-cache file if there is any */
-       unlink(git_path("info/rev-cache"));
+       unlink_or_warn(git_path("info/rev-cache"));
 
        return errs;
 }