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:06Z 2015-03-14T05:56:06Z Junio C Hamano gitster@pobox.com 2015-03-14T05:56:06Z urn:sha1:2408f3b74b26580b9f197e4edd96e73b0fba41c5 Description given by "grep -h" for its --exclude-standard option was phrased poorly. * nd/grep-exclude-standard-help-fix: grep: correct help string for --exclude-standard 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-06T22:57:57Z Junio C Hamano gitster@pobox.com 2015-03-06T22:57:57Z urn:sha1:f56a5f4fed296647ae8978645f9c627410717398 Code cleanups. * rs/simple-cleanups: sha1_name: use strlcpy() to copy strings pretty: use starts_with() to check for a prefix for-each-ref: use skip_prefix() to avoid duplicate string comparison connect: use strcmp() for string comparison 2015-03-05T21:13:12Z Junio C Hamano gitster@pobox.com 2015-03-05T21:13:12Z urn:sha1:007f7f6e544b89a7efc0dcb5f11a4d5bf5180c3f "git blame" died, trying to free an uninitialized piece of memory. * es/blame-commit-info-fix: builtin/blame: destroy initialized commit_info only 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:12:55Z Junio C Hamano gitster@pobox.com 2015-03-05T21:12:55Z urn:sha1:be2804c49eb19e11578d60218575aca07792bc94 Code clean-up. * dp/remove-duplicated-header-inclusion: do not include the same header twice 2015-02-27T20:22:41Z Nguyễn Thái Ngọc Duy pclouds@gmail.com 2015-02-27T14:01:58Z urn:sha1:77fdb8a82cc624bb3c720b87725abae4d0df5073 The current help string is about --no-exclude-standard. But "git grep -h" would show --exclude-standard instead. Flip the string. See 0a93fb8 (grep: teach --untracked and --exclude-standard options - 2011-09-27) for more info about these options. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-02-25T06:10:41Z Junio C Hamano gitster@pobox.com 2015-02-25T06:10:41Z urn:sha1:2764442ac9a66532789526a6e6aaf0f1254a3548 "git apply --whitespace=fix" used to under-allocate the memory when the fix resulted in a longer text than the original patch. * jc/apply-ws-fix-expands: apply: count the size of postimage correctly apply: make update_pre_post_images() sanity check the given postlen apply.c: typofix 2015-02-25T06:10:38Z Junio C Hamano gitster@pobox.com 2015-02-25T06:10:38Z urn:sha1:7070c03d514a5519a3a4c9dbb47932d522dcb4bd The error message from "git commit", when a non-existing author name was given as value to the "--author=" parameter, has been reworded to avoid misunderstanding. * mg/commit-author-no-match-malformed-message: commit: reword --author error message 2015-02-25T06:10:15Z Junio C Hamano gitster@pobox.com 2015-02-25T06:10:15Z urn:sha1:66061294915065375c7eaa4e3a72e4834590f32b Setting diff.submodule to 'log' made "git format-patch" produce broken patches. * dk/format-patch-ignore-diff-submodule: format-patch: ignore diff.submodule setting t4255: test am submodule with diff.submodule