From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 May 2017 02:51:49 +0000 (+0900)
Subject: Merge branch 'dt/raise-core-packed-git-limit'
X-Git-Tag: v2.14.0-rc0~198
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d97141b0b94ae0206ac25ed6334709b18f98f186?ds=inline;hp=-c

Merge branch 'dt/raise-core-packed-git-limit'

The default packed-git limit value has been raised on larger
platforms to save "git fetch" from a (recoverable) failure while
"gc" is running in parallel.

* dt/raise-core-packed-git-limit:
Increase core.packedGitLimit
---

d97141b0b94ae0206ac25ed6334709b18f98f186
diff --combined git-compat-util.h
index bd04564a69,1c5de153a5..bb4537c0ba
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -616,7 -616,7 +616,7 @@@ extern int git_lstat(const char *, stru
  #endif
  
  #define DEFAULT_PACKED_GIT_LIMIT \
- 	((1024L * 1024L) * (size_t)(sizeof(void*) >= 8 ? 8192 : 256))
+ 	((1024L * 1024L) * (size_t)(sizeof(void*) >= 8 ? (32 * 1024L * 1024L) : 256))
  
  #ifdef NO_PREAD
  #define pread git_pread
@@@ -884,12 -884,6 +884,12 @@@ static inline size_t xsize_t(off_t len
  __attribute__((format (printf, 3, 4)))
  extern int xsnprintf(char *dst, size_t max, const char *fmt, ...);
  
 +#ifndef HOST_NAME_MAX
 +#define HOST_NAME_MAX 256
 +#endif
 +
 +extern int xgethostname(char *buf, size_t len);
 +
  /* in ctype.c, for kwset users */
  extern const unsigned char tolower_trans_tbl[256];