git/builtin, branch v2.3.4

Merge branch 'rs/deflate-init-cleanup' into maint

2015-03-23T18:23:38Z

Code simplification. * rs/deflate-init-cleanup: zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}

Merge branch 'nd/grep-exclude-standard-help-fix' into maint

2015-03-14T05:56:06Z

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

Merge branch 'jc/apply-beyond-symlink' into maint

2015-03-14T05:56:02Z

"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

Merge branch 'rs/simple-cleanups' into maint

2015-03-06T22:57:57Z

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

zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}

2015-03-05T23:46:03Z

Clear the git_zstream variable at the start of git_deflate_init() etc. so that callers don't have to do that. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'es/blame-commit-info-fix' into maint

2015-03-05T21:13:12Z

"git blame" died, trying to free an uninitialized piece of memory. * es/blame-commit-info-fix: builtin/blame: destroy initialized commit_info only

Merge branch 'ab/merge-file-prefix' into maint

2015-03-05T21:13:11Z

"git merge-file" did not work correctly in a subdirectory. * ab/merge-file-prefix: merge-file: correctly open files when in a subdir

Merge branch 'dp/remove-duplicated-header-inclusion' into maint

2015-03-05T21:12:55Z

Code clean-up. * dp/remove-duplicated-header-inclusion: do not include the same header twice

grep: correct help string for --exclude-standard

2015-02-27T20:22:41Z

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 Signed-off-by: Junio C Hamano

Merge branch 'jc/apply-ws-fix-expands' into maint

2015-02-25T06:10:41Z

"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