git/builtin, branch v2.3.2

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

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

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

Merge branch 'mg/commit-author-no-match-malformed-message' into maint

2015-02-25T06:10:38Z

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

Merge branch 'dk/format-patch-ignore-diff-submodule' into maint

2015-02-25T06:10:15Z

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

Merge branch 'jk/blame-commit-label' into maint

2015-02-25T06:09:54Z

"git blame HEAD -- missing" failed to correctly say "HEAD" when it tried to say "No such path 'missing' in HEAD". * jk/blame-commit-label: blame.c: fix garbled error message use xstrdup_or_null to replace ternary conditionals builtin/commit.c: use xstrdup_or_null instead of envdup builtin/apply.c: use xstrdup_or_null instead of null_strdup git-compat-util: add xstrdup_or_null helper

for-each-ref: use skip_prefix() to avoid duplicate string comparison

2015-02-22T20:01:37Z

Use skip_prefix() to get the part after "color:" (if present) and only compare it with "reset" instead of comparing the whole string again. This gets rid of the duplicate "color:" part of the string constant. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

do not include the same header twice

2015-02-13T21:16:12Z

A few files include the same header file directly more than once. As all these headers protect themselves against repeated inclusion by the "#ifndef FOO_H / #define FOO_H / ... / #endif" idiom, leave only the first inclusion and remove the later inclusion as a no-op clean-up. Signed-off-by: Дилян Палаузов Signed-off-by: Junio C Hamano