Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rm: reuse strbuf for all remove_dir_recursively() callsrs/rm-strbuf-optim | René Scharfe | 2016-07-12 | 1 | -2/+3 |
* | Merge branch 'jk/war-on-sprintf' into maint-2.7 | Junio C Hamano | 2016-05-26 | 1 | -1/+1 |
|\ | |||||
| * | archive-tar: convert snprintf to xsnprintfjk/war-on-sprintf | Jeff King | 2016-05-26 | 1 | -1/+1 |
* | | Merge branch 'mm/doc-hooks-linkgit-fix' into maint | Junio C Hamano | 2016-03-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | Documentation: fix broken linkgit to git-configmm/doc-hooks-linkgit-fix | Matthieu Moy | 2016-03-21 | 1 | -1/+1 |
* | | | Merge branch 'es/st-add4-gcc-4.2-workaround' into maint | Junio C Hamano | 2016-03-21 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | git-compat-util: st_add4: work around gcc 4.2.x compiler crashes/st-add4-gcc-4.2-workaround | Eric Sunshine | 2016-03-21 | 1 | -2/+2 |
* | | | | Git 2.7.4v2.7.4 | Junio C Hamano | 2016-03-17 | 3 | -2/+13 |
* | | | | Sync with Git 2.6.6 | Junio C Hamano | 2016-03-17 | 4 | -3/+39 |
|\ \ \ \ | |||||
| * | | | | Git 2.6.6v2.6.6 | Junio C Hamano | 2016-03-17 | 4 | -3/+15 |
| * | | | | Merge branch 'maint-2.5' into maint-2.6 | Junio C Hamano | 2016-03-17 | 16 | -148/+110 |
| |\ \ \ \ | |||||
| | * | | | | Git 2.5.5v2.5.5 | Junio C Hamano | 2016-03-17 | 4 | -3/+15 |
| | * | | | | Merge branch 'maint-2.4' into maint-2.5 | Junio C Hamano | 2016-03-17 | 15 | -147/+97 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Git 2.4.11v2.4.11 | Junio C Hamano | 2016-03-17 | 4 | -3/+15 |
| | | * | | | Merge branch 'jk/path-name-safety-2.4' into maint-2.4 | Junio C Hamano | 2016-03-17 | 13 | -146/+84 |
| | | |\ \ \ | |||||
* | | | \ \ \ | Merge branch 'jk/path-name-safety-2.7' into maint | Junio C Hamano | 2016-03-16 | 10 | -142/+46 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7jk/path-name-safety-2.7 | Junio C Hamano | 2016-03-16 | 10 | -142/+46 |
| |\ \ \ \ \ \ \ |/ / / / / / / / | |||||
| * | | | | | | | Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6jk/path-name-safety-2.6 | Junio C Hamano | 2016-03-16 | 13 | -146/+84 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5jk/path-name-safety-2.5 | Junio C Hamano | 2016-03-16 | 13 | -146/+84 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | list-objects: pass full pathname to callbacksjk/path-name-safety-2.4 | Jeff King | 2016-03-16 | 9 | -58/+26 |
| | | * | | | | list-objects: drop name_path entirely | Jeff King | 2016-03-16 | 9 | -25/+19 |
| | | * | | | | list-objects: convert name_path to a strbuf | Jeff King | 2016-03-16 | 3 | -36/+15 |
| | | * | | | | show_object_with_name: simplify by using path_name() | Jeff King | 2016-03-16 | 1 | -34/+6 |
| | | * | | | | http-push: stop using name_path | Jeff King | 2016-03-16 | 1 | -16/+7 |
| | | * | | | | tree-diff: catch integer overflow in combine_diff_path allocation | Jeff King | 2016-03-16 | 2 | -4/+4 |
| | | | |/ / | | | |/| | | |||||
| | | * | | | add helpers for detecting size_t overflow | Jeff King | 2016-03-16 | 1 | -0/+34 |
| | | |/ / | |||||
* | | | | | Git 2.7.3v2.7.3 | Junio C Hamano | 2016-03-10 | 4 | -3/+66 |
* | | | | | Merge branch 'ma/update-hooks-sample-typofix' into maint | Junio C Hamano | 2016-03-10 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | templates/hooks: fix minor typo in the sample update-hookma/update-hooks-sample-typofix | Martin Amdisen | 2016-02-25 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'dt/initial-ref-xn-commit-doc' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | refs: document transaction semanticsdt/initial-ref-xn-commit-doc | David Turner | 2016-02-25 | 1 | -0/+12 |
* | | | | | | Merge branch 'ps/plug-xdl-merge-leak' into maint | Junio C Hamano | 2016-03-10 | 1 | -2/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | xdiff/xmerge: fix memory leak in xdl_mergeps/plug-xdl-merge-leak | Patrick Steinhardt | 2016-02-23 | 1 | -2/+7 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'ak/git-strip-extension-from-dashed-command' into maint | Junio C Hamano | 2016-03-10 | 2 | -15/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git.c: simplify stripping extension of a file in handle_builtin()ak/git-strip-extension-from-dashed-command | Alexander Kuleshov | 2016-02-21 | 2 | -15/+15 |
* | | | | | | | Merge branch 'ak/extract-argv0-last-dir-sep' into maint | Junio C Hamano | 2016-03-10 | 1 | -4/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | exec_cmd.c: use find_last_dir_sep() for code simplificationak/extract-argv0-last-dir-sep | Alexander Kuleshov | 2016-02-19 | 1 | -4/+2 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/pack-idx-corruption-safety' into maint | Junio C Hamano | 2016-03-10 | 4 | -0/+207 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sha1_file.c: mark strings for translation | Nguyễn Thái Ngọc Duy | 2016-02-27 | 1 | -3/+3 |
| * | | | | | | | use_pack: handle signed off_t overflow | Jeff King | 2016-02-25 | 2 | -1/+3 |
| * | | | | | | | nth_packed_object_offset: bounds-check extended offset | Jeff King | 2016-02-25 | 4 | -1/+27 |
| * | | | | | | | t5313: test bounds-checks of corrupted/malicious pack/idx files | Jeff King | 2016-02-25 | 1 | -0/+179 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'js/config-set-in-non-repository' into maint | Junio C Hamano | 2016-03-10 | 2 | -0/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git config: report when trying to modify a non-existing repo configjs/config-set-in-non-repository | Johannes Schindelin | 2016-02-25 | 2 | -0/+14 |
* | | | | | | | | Merge branch 'sb/submodule-module-list-fix' into maint | Junio C Hamano | 2016-03-10 | 2 | -8/+27 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | submodule helper list: respect correct path prefixsb/submodule-module-list-fix | Stefan Beller | 2016-02-24 | 2 | -8/+27 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/grep-binary-workaround-in-test' into maint | Junio C Hamano | 2016-03-10 | 2 | -13/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t9200: avoid grep on non-ASCII datajk/grep-binary-workaround-in-test | John Keeping | 2016-02-23 | 1 | -1/+1 |
| * | | | | | | | | t8005: avoid grep on non-ASCII data | John Keeping | 2016-02-23 | 1 | -12/+16 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'mm/push-simple-doc' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ |