diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-20 12:55:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-20 12:55:41 -0700 |
| commit | f9c33605700e37b75279ed6ce4bffaad3eb0cf10 (patch) | |
| tree | 7c6b37102801db71543fb228c129eb4ff9d5777c | |
| parent | builtin/checkout: Fix message when switching to an existing branch (diff) | |
| parent | Merge branch 'jc/maint-follow-rename-fix' into maint (diff) | |
| download | tgif-f9c33605700e37b75279ed6ce4bffaad3eb0cf10.tar.xz | |
Merge branch 'maint'
* maint:
xmalloc: include size in the failure message
| -rw-r--r-- | wrapper.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -40,7 +40,8 @@ void *xmalloc(size_t size) if (!ret && !size) ret = malloc(1); if (!ret) - die("Out of memory, malloc failed"); + die("Out of memory, malloc failed (tried to allocate %lu bytes)", + (unsigned long)size); } #ifdef XMALLOC_POISON memset(ret, 0xA5, size); |