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

2014-12-27 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- git-send-email.perl | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 82c6fea..eb02ef9 100755 --- a/git-send-email.perl +++

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

2014-12-27 Thread Jeff King
On Sat, Dec 27, 2014 at 04:01:33AM +, brian m. carlson wrote: 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

Missing inversion in Makefile (ee9be06)

2014-12-27 Thread Philip Oakley
Hi, In ee9be06 (perl: detect new files in MakeMaker builds, 2012-07-27) there is a step to detect if there has been an update to the PM.* files, however it appears that the logic is inverted in the comparison. I need some extra eye's on this to be sure I have it right (I'm trying to debug

Re: [msysGit] Missing inversion in Makefile (ee9be06)

2014-12-27 Thread Johannes Sixt
Am 27.12.2014 um 19:49 schrieb Philip Oakley: Hi, In ee9be06 (perl: detect new files in MakeMaker builds, 2012-07-27) there is a step to detect if there has been an update to the PM.* files, however it appears that the logic is inverted in the comparison. I need some extra eye's on this

Re: [msysGit] Missing inversion in Makefile (ee9be06)

2014-12-27 Thread Philip Oakley
From: Johannes Sixt j...@kdbg.org Am 27.12.2014 um 19:49 schrieb Philip Oakley: Hi, In ee9be06 (perl: detect new files in MakeMaker builds, 2012-07-27) there is a step to detect if there has been an update to the PM.* files, however it appears that the logic is inverted in the comparison. I

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

2014-12-27 Thread brian m. carlson
On Sat, Dec 27, 2014 at 12:56:04PM -0500, Jeff King wrote: On Sat, Dec 27, 2014 at 04:01:33AM +, brian m. carlson wrote: 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

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

2014-12-27 Thread Jeff King
On Sat, Dec 27, 2014 at 09:09:36PM +, brian m. carlson wrote: I'm not familiar enough with Negotiate auth to do give a thorough review on the logic above. But FWIW, it makes sense to me, and the code looks correct. libcurl will try very hard to use something other than Basic auth,

[PATCH v2 0/3] some attr optimizations

2014-12-27 Thread Nguyễn Thái Ngọc Duy
v2 updates 01/03 (rename the local var to avoid shadowing instead) and merges 02/04 and 04/04 to 03/03. Nguyễn Thái Ngọc Duy (3): attr.c: rename arg name attr_nr to avoid shadowing the global one attr: do not attempt to expand when we know it's not a macro attr: avoid heavy work when we

[PATCH v2 3/3] attr: avoid heavy work when we know the specified attr is not defined

2014-12-27 Thread Nguyễn Thái Ngọc Duy
If we have never seen attr 'X' in any .gitattributes file we have examined so far, we can be sure that 'X' is not defined. So no need to go over all the attr stack to look for attr 'X'. This is the purpose behind this new field maybe_real. This optimization breaks down if macros are involved

[PATCH v2 2/3] attr: do not attempt to expand when we know it's not a macro

2014-12-27 Thread Nguyễn Thái Ngọc Duy
Keep track of all recognized macros in the new maybe_macro field. If this field is true, it _may_ be a macro (depending on what's in the current attr stack). But if the field is false, it's definitely not a macro, no need to go through the whole attr stack in macroexpand_one() to search for one.

[PATCH v2 1/3] attr.c: rename arg name attr_nr to avoid shadowing the global one

2014-12-27 Thread Nguyễn Thái Ngọc Duy
Helped-by: Junio C Hamano gits...@pobox.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- attr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/attr.c b/attr.c index cd54697..a1758bf 100644 --- a/attr.c +++ b/attr.c @@ -681,13 +681,13 @@ static int

Re: [PATCH v2 2/3] attr: do not attempt to expand when we know it's not a macro

2014-12-27 Thread Eric Sunshine
On Sat, Dec 27, 2014 at 6:39 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Keep track of all recognized macros in the new maybe_macro field. If this field is true, it _may_ be a macro (depending on what's in the current attr stack). But if the field is false, it's definitely not a macro,

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

2014-12-27 Thread brian m. carlson
On Sat, Dec 27, 2014 at 04:29:49PM -0500, Jeff King wrote: since if they failed the first time, they will never succeed Are there other GSSAPI methods where this is not the case? I don't know of any, and AFAICT git's support is used only for Kerberos, so this is probably safe for now. If

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

2014-12-27 Thread Eric Sunshine
On Fri, Dec 26, 2014 at 6:11 PM, Doug Kelly dougk@gmail.com wrote: 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 *

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

2014-12-27 Thread Doug Kelly
On Sat, Dec 27, 2014 at 6:37 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Fri, Dec 26, 2014 at 6:11 PM, Doug Kelly dougk@gmail.com wrote: git am will break when using diff.submodule=log; add some test cases to illustrate this breakage as simply as possible. There are currently

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

2014-12-27 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

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

2014-12-27 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 +- t/t4255-am-submodule.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff

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

2014-12-27 Thread Eric Sunshine
On Sat, Dec 27, 2014 at 07:04:23PM -0600, Doug Kelly wrote: 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

Re: [PATCH 5/5] checkout-index: fix --temp relative path mangling

2014-12-27 Thread Eric Sunshine
On Wed, Dec 24, 2014 at 4:43 AM, Eric Sunshine sunsh...@sunshineco.com wrote: checkout-index --temp only properly prints relative paths which are descendants of the current directory. Paths in ancestor or sibling directories (or their children) are often printed in mangled form. For example: