user/sven/git.git, branch v1.8.3.3

Git 1.8.3.3

2013-07-15T17:39:43Z

Signed-off-by: Junio C Hamano

Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maint

2013-07-15T17:36:14Z

"git apply" parsed patches that add new files, generated by programs other than Git, incorrectly. This is an old breakage in v1.7.11. * tr/maint-apply-non-git-patch-parsefix: apply: carefully strdup a possibly-NULL name

Merge branch 'bc/http-keep-memory-given-to-curl' into maint

2013-07-15T17:36:01Z

Older cURL wanted piece of memory we call it with to be stable, but we updated the auth material after handing it to a call. * bc/http-keep-memory-given-to-curl: http.c: don't rewrite the user:passwd string multiple times

Merge branch 'jk/pull-into-dirty-unborn' into maint

2013-07-15T17:35:43Z

"git pull" into nothing trashed "local changes" that were in the index. * jk/pull-into-dirty-unborn: pull: merge into unborn by fast-forwarding from empty tree pull: update unborn branch tip after index

Merge branch 'fg/submodule-non-ascii-path' into maint

2013-07-15T17:35:17Z

Many "git submodule" operations did not work on a submodule at a path whose name is not in ASCII. * fg/submodule-non-ascii-path: t7400: test of UTF-8 submodule names pass under Mac OS handle multibyte characters in name

Merge branch 'fc/sequencer-plug-leak' into maint

2013-07-15T17:35:04Z

"cherry-pick" had a small leak in its error codepath. * fc/sequencer-plug-leak: sequencer: avoid leaking message buffer when refusing to create an empty commit sequencer: remove useless indentation

Merge branch 'mt/send-email-cc-match-fix' into maint

2013-07-15T17:34:36Z

Logic used by git-send-email to suppress cc mishandled names like "A U. Thor" , where the human readable part needs to be quoted (the user input may not have the double quotes around the name, and comparison was done between quoted and unquoted strings). It also mishandled names that need RFC2047 quoting. * mt/send-email-cc-match-fix: send-email: sanitize author when writing From line send-email: add test for duplicate utf8 name test-send-email: test for pre-sanitized self name t/send-email: test suppress-cc=self with non-ascii t/send-email: add test with quoted sender send-email: make --suppress-cc=self sanitize input t/send-email: test suppress-cc=self on cccmd send-email: fix suppress-cc=self on cccmd t/send-email.sh: add test for suppress-cc=self

fixup-builtins: retire an old transition helper script

2013-07-04T05:47:53Z

This script was added in 36e5e70 (Start deprecating "git-command" in favor of "git command", 2007-06-30) with the intent of aiding the transition away from dashed forms. It has already been used to help the transision and served its purpose, and is no longer very useful for follow-up work, because the majority of remaining matches it finds are false positives. Signed-off-by: Ramkumar Ramachandra Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

Update draft release notes to 1.8.3.3

2013-07-03T22:43:41Z

Signed-off-by: Junio C Hamano

Merge branch 'rr/diffcore-pickaxe-doc' into maint

2013-07-03T22:41:17Z

* rr/diffcore-pickaxe-doc: diffcore-pickaxe doc: document -S and -G properly diffcore-pickaxe: make error messages more consistent