git, branch v2.7.4 Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.7.4 2016-03-17T18:32:13Z Git 2.7.4 2016-03-17T18:32:13Z Junio C Hamano gitster@pobox.com 2016-03-17T18:32:13Z urn:sha1:937978e0f3e750d917768c77665d5f8cfbd802b6 Signed-off-by: Junio C Hamano <gitster@pobox.com> Sync with Git 2.6.6 2016-03-17T18:28:52Z Junio C Hamano gitster@pobox.com 2016-03-17T18:28:52Z urn:sha1:8e9cc5f3e2899fc4cfaf0c1ee039fb2c6683c0a9 * maint-2.6: Git 2.6.6 Git 2.5.5 Git 2.4.11 Git 2.6.6 2016-03-17T18:26:41Z Junio C Hamano gitster@pobox.com 2016-03-17T17:56:06Z urn:sha1:e46579643d56162299b1756b70d418005351b256 Signed-off-by: Junio C Hamano <gitster@pobox.com> Merge branch 'maint-2.5' into maint-2.6 2016-03-17T18:26:18Z Junio C Hamano gitster@pobox.com 2016-03-17T18:26:18Z urn:sha1:ce4d4e763c054788550625502553ced8810a7bce * maint-2.5: Git 2.5.5 Git 2.4.11 list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow Git 2.5.5 2016-03-17T18:24:59Z Junio C Hamano gitster@pobox.com 2016-03-17T17:28:50Z urn:sha1:e568e563ade00bbb0937162f405fc160f253e224 Signed-off-by: Junio C Hamano <gitster@pobox.com> Merge branch 'maint-2.4' into maint-2.5 2016-03-17T18:24:14Z Junio C Hamano gitster@pobox.com 2016-03-17T18:24:14Z urn:sha1:c638f3e4d585008f630d7dd8bb902f44217455b3 * maint-2.4: Git 2.4.11 list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow Git 2.4.11 2016-03-17T18:23:05Z Junio C Hamano gitster@pobox.com 2016-03-17T17:00:44Z urn:sha1:765428699a5381f113d19974720bc91b5bfeaf1d Signed-off-by: Junio C Hamano <gitster@pobox.com> Merge branch 'jk/path-name-safety-2.4' into maint-2.4 2016-03-17T18:22:24Z Junio C Hamano gitster@pobox.com 2016-03-17T16:55:54Z urn:sha1:32c6dca8c428672c11a2a0ddf3cb2f7476caff86 Bugfix patches were backported from the 'master' front to plug heap corruption holes, to catch integer overflow in the computation of pathname lengths, and to get rid of the name_path API. Both of these would have resulted in writing over an under-allocated buffer when formulating pathnames while tree traversal. * jk/path-name-safety-2.4: list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow Merge branch 'jk/path-name-safety-2.7' into maint 2016-03-16T20:15:04Z Junio C Hamano gitster@pobox.com 2016-03-16T20:15:04Z urn:sha1:d79db92483f78f0a750b6093432374fa1069b2ba * jk/path-name-safety-2.7: list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7 2016-03-16T17:42:32Z Junio C Hamano gitster@pobox.com 2016-03-16T17:42:32Z urn:sha1:55c45a732582ca74d9f8a73c8f176d3dadd5b819 * jk/path-name-safety-2.6: list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow