Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2014 19:35:39 +0000 (12:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2014 19:35:39 +0000 (12:35 -0700)
* maint:
use xmemdupz() to allocate copies of strings given by start and length
use xcalloc() to allocate zero-initialized memory

1  2 
builtin/apply.c
builtin/blame.c
builtin/index-pack.c
compat/mingw.c
connect.c
http-backend.c
path.c
pathspec.c
diff --cc builtin/apply.c
Simple merge
diff --cc builtin/blame.c
Simple merge
Simple merge
diff --cc compat/mingw.c
Simple merge
diff --cc connect.c
Simple merge
diff --cc http-backend.c
Simple merge
diff --cc path.c
Simple merge
diff --cc pathspec.c
Simple merge