This version includes Junio's fixup to René's patch, and then my patch rebased on top of René's. I thought it was easier to just send both in one series, than to have Junio do a bunch of conflict resolution. I think this still needs Junio's signoff on the first patch, since I've added his code. David Turner (1): xgethostname: handle long hostnames René Scharfe (1): use HOST_NAME_MAX to size buffers for gethostname(2) builtin/gc.c | 12 ++++++++---- builtin/receive-pack.c | 4 ++-- daemon.c | 4 ---- fetch-pack.c | 4 ++-- git-compat-util.h | 6 ++++++ ident.c | 4 ++-- wrapper.c | 13 +++++++++++++ 7 files changed, 33 insertions(+), 14 deletions(-) -- 2.11.GIT