summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-2691-482/+441
|\
| * ewah: convert to REALLOC_ARRAY, etcJeff King2016-02-223-19/+8
| * convert ewah/bitmap code to use xmallocJeff King2016-02-224-30/+11
| * diff_populate_gitlink: use a strbufJeff King2016-02-221-8/+8
| * transport_anonymize_url: use xstrfmtJeff King2016-02-221-5/+3
| * git-compat-util: drop mempcpy compat codeJeff King2016-02-221-9/+0
| * sequencer: simplify memory allocation of get_messageJeff King2016-02-221-19/+10
| * test-path-utils: fix normalize_path_copy output buffer sizeJeff King2016-02-221-11/+4
| * fetch-pack: simplify add_sought_entryJeff King2016-02-221-18/+9
| * fast-import: simplify allocation in start_packfileJeff King2016-02-221-4/+1
| * write_untracked_extension: use FLEX_ALLOC helperJeff King2016-02-221-5/+4
| * prepare_{git,shell}_cmd: use argv_arrayJeff King2016-02-223-53/+39
| * use st_add and st_mult for allocation size computationJeff King2016-02-2225-53/+56
| * convert trivial cases to FLEX_ARRAY macrosJeff King2016-02-2217-82/+35
| * use xmallocz to avoid size arithmeticJeff King2016-02-2215-25/+17
| * convert trivial cases to ALLOC_ARRAYJeff King2016-02-2234-64/+75
| * convert manual allocations to argv_arrayJeff King2016-02-227-76/+43
| * argv-array: add detach functionJeff King2016-02-223-0/+19
| * add helpers for allocating flex-array structsJeff King2016-02-221-0/+62
| * harden REALLOC_ARRAY and xcalloc against size_t overflowJeff King2016-02-222-1/+5
| * tree-diff: catch integer overflow in combine_diff_path allocationJeff King2016-02-192-4/+4
| * add helpers for detecting size_t overflowJeff King2016-02-191-0/+34
| * reflog_expire_cfg: NUL-terminate pattern fieldJeff King2016-02-191-5/+3
* | Merge branch 'jk/more-comments-on-textconv'Junio C Hamano2016-02-263-1/+24
|\ \
| * | diff: clarify textconv interfacejk/more-comments-on-textconvJeff King2016-02-223-1/+24
* | | Merge branch 'jk/no-diff-emit-common'Junio C Hamano2016-02-264-57/+3
|\ \ \
| * | | xdiff: drop XDL_EMIT_COMMONjk/no-diff-emit-commonJeff King2016-02-222-19/+0
| * | | merge-tree: drop generate_common strategyJeff King2016-02-221-36/+2
| * | | merge-one-file: use empty blob for add/add baseJeff King2016-02-221-2/+1
| |/ /
* | | Merge branch 'ak/git-strip-extension-from-dashed-command'Junio C Hamano2016-02-262-15/+15
|\ \ \
| * | | git.c: simplify stripping extension of a file in handle_builtin()ak/git-strip-extension-from-dashed-commandAlexander Kuleshov2016-02-212-15/+15
* | | | Merge branch 'ak/extract-argv0-last-dir-sep'Junio C Hamano2016-02-261-4/+2
|\ \ \ \
| * | | | exec_cmd.c: use find_last_dir_sep() for code simplificationak/extract-argv0-last-dir-sepAlexander Kuleshov2016-02-191-4/+2
| | |/ / | |/| |
* | | | Merge branch 'kn/ref-filter-atom-parsing'Junio C Hamano2016-02-263-192/+304
|\ \ \ \
| * | | | ref-filter: introduce objectname_atom_parser()kn/ref-filter-atom-parsingKarthik Nayak2016-02-171-11/+24
| * | | | ref-filter: introduce contents_atom_parser()Karthik Nayak2016-02-171-29/+50
| * | | | ref-filter: introduce remote_ref_atom_parser()Karthik Nayak2016-02-171-42/+61
| * | | | ref-filter: align: introduce long-form syntaxKarthik Nayak2016-02-173-9/+63
| * | | | ref-filter: introduce align_atom_parser()Karthik Nayak2016-02-171-51/+40
| * | | | ref-filter: introduce parse_align_position()Karthik Nayak2016-02-171-6/+15
| * | | | ref-filter: introduce color_atom_parser()Karthik Nayak2016-02-171-9/+16
| * | | | ref-filter: introduce parsing functions for each valid atomKarthik Nayak2016-02-171-4/+10
| * | | | ref-filter: introduce struct used_atomKarthik Nayak2016-02-171-17/+18
| * | | | ref-filter: bump 'used_atom' and related code to the topKarthik Nayak2016-02-171-15/+15
| * | | | ref-filter: use string_list_split over strbuf_splitJeff King2016-02-171-18/+11
* | | | | Merge branch 'tg/git-remote'Junio C Hamano2016-02-265-65/+81
|\ \ \ \ \
| * | | | | remote: use remote_is_configured() for add and renametg/git-remoteThomas Gummerer2016-02-162-5/+17
| * | | | | remote: actually check if remote exitsThomas Gummerer2016-02-162-2/+20
| * | | | | remote: simplify remote_is_configured()Thomas Gummerer2016-02-164-21/+12
| * | | | | remote: use parse_config_keyThomas Gummerer2016-02-161-37/+32