| commit | 3b8e8af187cb86ed030432f1a067121fdd4b1c3b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Jul 2014 18:34:05 +0000 (9 11:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Jul 2014 18:34:05 +0000 (9 11:34 -0700) | ||
| tree | dd8cdaa18cfd70d6cfe6b0a3120fccb5f0a971cd | treesnapshot (tar.gz zip) |
| parent | e91ae32a01ffe294b8510c1d8cd7138493a0712f | commitdiff |
| parent | cb6c38d5cce7d8d48a57346b332a68cea1489df1 | commitdiff |
Merge branch 'jk/xstrfmt'
* jk/xstrfmt:
setup_git_env(): introduce git_path_from_env() helper
unique_path: fix unlikely heap overflow
walker_fetch: fix minor memory leak
merge: use argv_array when spawning merge strategy
sequencer: use argv_array_pushf
setup_git_env: use git_pathdup instead of xmalloc + sprintf
use xstrfmt to replace xmalloc + strcpy/strcat
use xstrfmt to replace xmalloc + sprintf
use xstrdup instead of xmalloc + strcpy
use xstrfmt in favor of manual size calculations
strbuf: add xstrfmt helper
* jk/xstrfmt:
setup_git_env(): introduce git_path_from_env() helper
unique_path: fix unlikely heap overflow
walker_fetch: fix minor memory leak
merge: use argv_array when spawning merge strategy
sequencer: use argv_array_pushf
setup_git_env: use git_pathdup instead of xmalloc + sprintf
use xstrfmt to replace xmalloc + strcpy/strcat
use xstrfmt to replace xmalloc + sprintf
use xstrdup instead of xmalloc + strcpy
use xstrfmt in favor of manual size calculations
strbuf: add xstrfmt helper