Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.3.3 2015-03-14T05:56:11Z 2015-03-14T05:56:11Z Junio C Hamano gitster@pobox.com 2015-03-14T05:56:11Z urn:sha1:113bc160941c4bcc9211d32f17098ab5a2428fa4 * ak/t5516-typofix: t5516: correct misspelled pushInsteadOf 2015-03-14T05:56:10Z Junio C Hamano gitster@pobox.com 2015-03-14T05:56:09Z urn:sha1:bb8f6de064a2b92febe06c5cbfcf98c686dce8a4 Test clean-up. * jc/diff-test-updates: test_ln_s_add: refresh stat info of fake symbolic links t4008: modernise style t/diff-lib: check exact object names in compare_diff_raw tests: do not borrow from COPYING and README from the real source t4010: correct expected object names t9300: correct expected object names t4008: correct stale comments 2015-03-14T05:56:08Z Junio C Hamano gitster@pobox.com 2015-03-14T05:56:08Z urn:sha1:3aab60b3baefd79d113fdc83685ba38c71986538 A corrupt input to "git diff -M" can cause us to segfault. * jk/diffcore-rename-duplicate: diffcore-rename: avoid processing duplicate destinations diffcore-rename: split locate_rename_dst into two functions 2015-03-14T05:56:04Z Junio C Hamano gitster@pobox.com 2015-03-14T05:56:04Z urn:sha1:a4b4f9b8e317844ef64ec073241d38c9a656b2c8 "git diff --shortstat --dirstat=changes" showed a dirstat based on lines that was never asked by the end user in addition to the dirstat that the user asked for. * mk/diff-shortstat-dirstat-fix: diff --shortstat --dirstat: remove duplicate output 2015-03-14T05:56:02Z Junio C Hamano gitster@pobox.com 2015-03-14T05:56:02Z urn:sha1:5244a31039dbb3fe0d544fc56100d0ccbc653131 "git apply" was not very careful about reading from, removing, updating and creating paths outside the working tree (under --index/--cached) or the current directory (when used as a replacement for GNU patch). * jc/apply-beyond-symlink: apply: do not touch a file beyond a symbolic link apply: do not read from beyond a symbolic link apply: do not read from the filesystem under --index apply: reject input that touches outside the working area 2015-03-14T05:55:59Z Junio C Hamano gitster@pobox.com 2015-03-14T05:55:59Z urn:sha1:c722ba4814f34d02faed305e4cc6498c783543a9 The "interpolated-path" option of "git daemon" inserted any string client declared on the "host=" capability request without checking. Sanitize and limit %H and %CH to a saner and a valid DNS name. * jk/daemon-interpolate: daemon: sanitize incoming virtual hostname t5570: test git-daemon's --interpolated-path option git_connect: let user override virtual-host we send to daemon 2015-03-06T22:57:54Z Junio C Hamano gitster@pobox.com 2015-03-06T22:57:54Z urn:sha1:e1db59e179d7215476b7096f1fd74db43a4a2dae Even though we officially haven't dropped Perl 5.8 support, the Getopt::Long package that came with it does not support "--no-" prefix to negate a boolean option; manually add support to help people with older Getopt::Long package. * km/send-email-getopt-long-workarounds: git-send-email.perl: support no- prefix with older GetOptions 2015-03-05T21:13:11Z Junio C Hamano gitster@pobox.com 2015-03-05T21:13:10Z urn:sha1:33367575b85a115900deac600cc4f8f03ec4754b "git merge-file" did not work correctly in a subdirectory. * ab/merge-file-prefix: merge-file: correctly open files when in a subdir 2015-03-05T21:13:10Z Junio C Hamano gitster@pobox.com 2015-03-05T21:13:09Z urn:sha1:3630be2749819b79de917a77c6627e3f84c00a11 "git submodule add" failed to squash "path/to/././submodule" to "path/to/submodule". * ps/submodule-sanitize-path-upon-add: git-submodule.sh: fix '/././' path normalization 2015-03-05T21:13:08Z Junio C Hamano gitster@pobox.com 2015-03-05T21:13:08Z urn:sha1:cbc8d6d8f8e858072faa2f8fd03d0f255fe0c288 In v2.2.0, we broke "git prune" that runs in a repository that borrows from an alternate object store. * jk/prune-mtime: sha1_file: fix iterating loose alternate objects for_each_loose_file_in_objdir: take an optional strbuf path