summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/bug-to-abort'Junio C Hamano2017-05-295-1/+51
|\
| * usage: add NORETURN to BUG() function definitionsjk/bug-to-abortRamsay Jones2017-05-221-2/+2
| * config: complain about --local outside of a git repoJeff King2017-05-152-1/+4
| * setup_git_env: convert die("BUG") to BUG()Jeff King2017-05-152-1/+7
| * usage.c: add BUG() functionJeff King2017-05-152-0/+41
* | Merge branch 'js/eol-on-ourselves'Junio C Hamano2017-05-2911-26/+55
|\ \
| * | t4051: mark supporting files as requiring LF-only line endingsjs/eol-on-ourselvesJohannes Schindelin2017-05-101-0/+1
| * | Fix the remaining tests that failed with core.autocrlf=trueJohannes Schindelin2017-05-101-1/+20
| * | t3901: move supporting files into t/t3901/Johannes Schindelin2017-05-106-24/+24
| * | completion: mark bash script as LF-onlyJohannes Schindelin2017-05-101-0/+1
| * | git-new-workdir: mark script as LF-onlyJohannes Schindelin2017-05-101-0/+1
| * | Fix build with core.autocrlf=trueJohannes Schindelin2017-05-102-1/+8
* | | Merge branch 'jc/read-tree-empty-with-m'Junio C Hamano2017-05-291-1/+1
|\ \ \
| * | | read-tree: "read-tree -m --empty" does not make sensejc/read-tree-empty-with-mJunio C Hamano2017-05-101-1/+1
* | | | Merge branch 'js/plug-leaks'Junio C Hamano2017-05-2923-64/+149
|\ \ \ \
| * | | | checkout: fix memory leakjs/plug-leaksJunio C Hamano2017-05-091-0/+1
| * | | | submodule_uses_worktrees(): plug memory leakJohannes Schindelin2017-05-081-1/+1
| * | | | show_worktree(): plug memory leakJohannes Schindelin2017-05-081-3/+5
| * | | | name-rev: avoid leaking memory in the `deref` caseJohannes Schindelin2017-05-081-2/+5
| * | | | remote: plug memory leak in match_explicit()Johannes Schindelin2017-05-081-2/+3
| * | | | add_reflog_for_walk: avoid memory leakJohannes Schindelin2017-05-081-3/+17
| * | | | shallow: avoid memory leakJohannes Schindelin2017-05-081-2/+6
| * | | | line-log: avoid memory leakJohannes Schindelin2017-05-081-0/+1
| * | | | receive-pack: plug memory leak in update()Johannes Schindelin2017-05-081-1/+3
| * | | | fast-export: avoid leaking memory in handle_tag()Johannes Schindelin2017-05-081-0/+2
| * | | | mktree: plug memory leaks reported by CoverityJohannes Schindelin2017-05-081-2/+3
| * | | | pack-redundant: plug memory leakJohannes Schindelin2017-05-081-0/+1
| * | | | setup_discovered_git_dir(): plug memory leakJohannes Schindelin2017-05-081-2/+7
| * | | | setup_bare_git_dir(): help static analysisJohannes Schindelin2017-05-081-1/+1
| * | | | split_commit_in_progress(): simplify & fix memory leakJohannes Schindelin2017-05-081-14/+14
| * | | | checkout: fix memory leakJohannes Schindelin2017-05-081-8/+9
| * | | | cat-file: fix memory leakJohannes Schindelin2017-05-081-0/+1
| * | | | mailinfo & mailsplit: check for EOF while parsingJohannes Schindelin2017-05-082-1/+18
| * | | | status: close file descriptor after reading git-rebase-todoJohannes Schindelin2017-05-081-0/+1
| * | | | difftool: address a couple of resource/memory leaksJohannes Schindelin2017-05-081-10/+23
| * | | | get_mail_commit_oid(): avoid resource leakJohannes Schindelin2017-05-081-9/+6
| * | | | git_config_rename_section_in_file(): avoid resource leakJohannes Schindelin2017-05-081-1/+4
| * | | | add_commit_patch_id(): avoid allocating memory unnecessarilyJohannes Schindelin2017-05-081-1/+2
| * | | | winansi: avoid buffer overrunJohannes Schindelin2017-05-081-0/+5
| * | | | winansi: avoid use of uninitialized valueJohannes Schindelin2017-05-081-0/+7
| * | | | mingw: avoid memory leak when splitting PATHJohannes Schindelin2017-05-081-1/+3
* | | | | Merge branch 'jk/disable-pack-reuse-when-broken'Junio C Hamano2017-05-292-4/+50
|\ \ \ \ \
| * | | | | t5310: fix "; do" stylejk/disable-pack-reuse-when-brokenJeff King2017-05-091-4/+8
| * | | | | pack-objects: disable pack reuse for object-selection optionsJeff King2017-05-092-1/+43
* | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-05-29106-1134/+1173
|\ \ \ \ \ \
| * | | | | | object: convert parse_object* to take struct object_idbrian m. carlson2017-05-0838-108/+107
| * | | | | | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-0816-28/+28
| * | | | | | sequencer: convert do_recursive_merge to struct object_idbrian m. carlson2017-05-081-3/+3
| * | | | | | diff-lib: convert do_diff_cache to struct object_idbrian m. carlson2017-05-085-12/+12
| * | | | | | builtin/ls-tree: convert to struct object_idbrian m. carlson2017-05-081-3/+3