[PATCH] send-email: Much readable error output

2014-12-26 Thread Alexander Kuleshov
Signed-off-by: 0xAX kuleshovm...@gmail.com --- git-send-email.perl | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 82c6fea..6a995c4 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1274,11 +1274,11 @@

Re: [PATCH 0/5] Fix the Visual Studio 2008 .sln generator

2014-12-26 Thread Philip Oakley
From: Philip Oakley philipoak...@iee.org Potential Windows developers are likely to be using Visual Studio as their IDE. The tool stack required for Windows can be tortuous as it crosses the boundaries between platforms and philosophies. This patch series seeks to maintain the tools that could

Re: [PATCH 1/5] engine.pl: Fix i18n -o option in msvc buildsystem generator

2014-12-26 Thread Philip Oakley
From: Philip Oakley philipoak...@iee.org The i18n 5e9637c (i18n: add infrastructure for translating Git with gettext, 2011-11-18) introduced an extra '-o' option into the make file, which broke engine.pl code for extracting the git.sln for msvc gui-IDE. Add tests to remove these non linker

[PATCH 0/2] Fix issue with format-patch and diff.submodule

2014-12-26 Thread Doug Kelly
A colleague found an issue that when using diff.submodule=log in his .gitconfig, format-patch would use the log format for submodule changes, which would be ignored or error out when processed by git-am. format-patch now ignores the diff.submodule option and a testcase for this specific issue now

[PATCH 2/2] format-patch: ignore diff.submodule setting

2014-12-26 Thread Doug Kelly
diff.submodule when set to log produces output which git-am cannot handle. Ignore this setting when generating patch output. Signed-off-by: Doug Kelly dougk@gmail.com --- builtin/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/log.c b/builtin/log.c index

[PATCH 1/2] t4255: test am submodule with diff.submodule

2014-12-26 Thread Doug Kelly
git am will break when using diff.submodule=log; add some test cases to illustrate this breakage as simply as possible. There are currently two ways this can fail: * With errors (unrecognized input), if only change * Silently (no submodule change), if other files change Test for both conditions

Re: [PATCH] send-email: Much readable error output

2014-12-26 Thread Thomas Gummerer
Hi, Alexander Kuleshov kuleshovm...@gmail.com writes: Signed-off-by: 0xAX kuleshovm...@gmail.com Please use your full name for the sign-off. --- git-send-email.perl | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl

[PATCH] remote-curl: fall back to Basic auth if Negotiate fails.

2014-12-26 Thread brian m. carlson
Apache servers using mod_auth_kerb can be configured to allow the user to authenticate either using Negotiate (using the Kerberos ticket) or Basic authentication (using the Kerberos password). Often, one will want to use Negotiate authentication if it is available, but fall back to Basic