Merge branch 'jk/common-main-2.8' into jk/common-main

diff --git a/upload-pack.c b/upload-pack.c
index f0a0fdaf71f69043323b237ae6acc9be87cb7fdf..b97a7659d1f2ffeb8e63fa46a17ca1501db983ab 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -174,8 +174,7 @@ static void create_pack_file(void)
 
                if (ret < 0) {
                        if (errno != EINTR) {
-                               error("poll failed, resuming: %s",
-                                     strerror(errno));
+                               error_errno("poll failed, resuming");
                                sleep(1);
                        }
                        continue;