Re: [PATCH] http.c: fix parsing of http.sslCertPasswordProtected variable

2013-07-14 Thread Junio C Hamano
Mark Lodato writes: > On Fri, Jul 12, 2013 at 3:52 PM, Junio C Hamano wrote: >> >> Jonathan Nieder writes: >> >> > FWIW the GIT_SSL_CERT_PASSWORD_PROTECTED envvar has a similar "can >> > only enable" behavior, but since it's documented, that's not as big >> > of a problem. Do you remember why

Re: [PATCH v2 1/2] send-email: squelch warning from Net::SMTP::SSL

2013-07-14 Thread Junio C Hamano
Torsten Bögershausen writes: >> I didn't stick the require in the eval because git-send-email will fail >> in this case anyway if you don't have it, since Net::SMTP::SSL requires >> it. Let me know if you want a patch for this on top of the existing two >> in this series and I'll provide one. >>

Re: [PATCH 1/7] cat-file: disable object/refname ambiguity check for batch mode

2013-07-14 Thread Jeff King
On Sun, Jul 14, 2013 at 08:45:37PM -0700, Junio C Hamano wrote: > >> To cat-file we could add an option like "--sha1-only" or "--literal" or > >> "--no-dwim" (... better names are failing me) which would skip *all* > >> dwimming of 40-character strings. It would also assume that any shorter > >>

Re: [PATCH] fixup! pull: require choice between rebase/merge on non-fast-forward pull

2013-07-14 Thread Junio C Hamano
John Keeping writes: > Here is that patch. The test changes here are all reverting changes in > ae2dab2 (pull: require choice between rebase/merge on non-fast-forward > pull, 2013-06-27) - with this change to git-pull.sh the only change > needed in the tests is in t5524-pull-msg: > > $ git d

Re: [PATCH 1/7] cat-file: disable object/refname ambiguity check for batch mode

2013-07-14 Thread Jeff King
On Fri, Jul 12, 2013 at 12:30:07PM +0200, Michael Haggerty wrote: > But with particular respect to "git cat-file", I see problems: > > 1. get_ref_snapshot() would have to read all loose and packed refs > within the specified subtree, because loose refs have to be read before > packed refs. So th

Re: [PATCH v3] config: add support for http..* settings

2013-07-14 Thread Jeff King
On Fri, Jul 12, 2013 at 06:07:35AM -0700, Kyle J. McKay wrote: > >It looks like you're matching the URLs as raw strings, and I don't see > >any canonicalization going on. What happens if I have > >"https://example.com/foo+bar"; in my config, but then I visit > >"https://example.comfoo%20bar";? >

Re: [PATCH 7/7] push: document --lockref

2013-07-14 Thread Jonathan Nieder
Junio C Hamano wrote: > Jonathan Nieder writes: >> Then I will use >> >> (5c) git push --force >> >> which means not to use this new lockref trick that looks at my >> remote-tracking branch and instead to just force the ref update. > > I am not sure I follow. Do other contributors update th

Re: [PATCH v3] config: add support for http..* settings

2013-07-14 Thread Jeff King
On Sat, Jul 13, 2013 at 12:46:17PM -0700, Kyle J. McKay wrote: > I expect it will be easier just to normalize the URL without > splitting. That is, lowercase the parts that are case-insensitive > (scheme and host name) and adjust the URL-escaping to remove URL > escaping (%xx) from characters tha

Re: [PATCH v3] config: add support for http..* settings

2013-07-14 Thread Jeff King
On Sun, Jul 14, 2013 at 09:02:19PM -0700, Junio C Hamano wrote: > > Or proceed with what's there right now (there are a few pending > > updates from reviewers) and then, as Junio says above, adjust it later > > if needed? > > I have been assuming that "strictly textual match" will be a subset > o

Re: [PATCH v4 1/2] git-multimail: an improved replacement for post-receive-email

2013-07-14 Thread Jonathan Nieder
Michael Haggerty wrote: > Add git-multimail, a tool for generating notification emails for > pushes to a Git repository. It is largely plug-in compatible with > post-receive-email, and is proposed to eventually replace that script. > The advantages of git-multimail relative to post-receive-email

Re: [PATCH v4 2/2] post-receive-email: deprecate script in favor of git-multimail

2013-07-14 Thread Jonathan Nieder
Michael Haggerty wrote: > Add a notice to the top of post-receive-email explaining that the > script is no longer under active development and pointing the user to > git-multimail. I think the spirit of this patch is sane. Some thoughts on wording: [...] > --- a/contrib/hooks/post-receive-email

Re: [PATCH] .mailmap: Combine more (email, name) to individual persons

2013-07-14 Thread Jonathan Nieder
Stefan Beller wrote: > Signed-off-by: Stefan Beller Markup and methodology look correct. Fwiw, Reviewed-by: Jonathan Nieder Is this meant to be squashed with 94b410bb (.mailmap: Map email addresses to names, 2013-07-12)? Ciao, Jonathan -- To unsubscribe from this list: send the line "unsubsc

Re: [PATCH] git-clone.txt: remove the restriction on pushing from a shallow clone

2013-07-14 Thread Duy Nguyen
On Mon, Jul 15, 2013 at 8:01 AM, Duy Nguyen wrote: >> Also, the sender may have cloned from the receiver (fully) and then >> fetched a different history shallowly from elsewhere. The receiver >> may have no commit on that history, including the shallow-bottom. >> > > Hmm.. right. And the receiver

Re: [PATCH] http.c: fix parsing of http.sslCertPasswordProtected variable

2013-07-14 Thread Kyle J. McKay
On Jul 14, 2013, at 21:13, Junio C Hamano wrote: Mark Lodato writes: On Fri, Jul 12, 2013 at 3:52 PM, Junio C Hamano wrote: Jonathan Nieder writes: FWIW the GIT_SSL_CERT_PASSWORD_PROTECTED envvar has a similar "can only enable" behavior, but since it's documented, that's not as big of a

[PATCH v2 1/9] t4203: demonstrate loss of single-character name in mailmap entry

2013-07-14 Thread Eric Sunshine
A bug in mailmap.c:parse_name_and_email() causes it to overlook the single-character name in "A " and parse it only as "". Demonstrate this problem. Signed-off-by: Eric Sunshine --- t/t4203-mailmap.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/t/t4203-mailmap.sh b/t/t4203-mailm

[PATCH v2 0/9] mailmap fixes

2013-07-14 Thread Eric Sunshine
This is a re-roll of jc/mailmap-case-insensitivity [1] in 'pu', which fixes an off-by-one parsing bug and a case-losing bug in mailmap. Changes since v1: * Replace v1 [4/4] with new [1/9] and [3/9] which explicitly demonstrate each bug being fixed. * Fix several crashes and issues in mailmap d

[PATCH v2 7/9] mailmap: debug: eliminate -Wformat field precision type warning

2013-07-14 Thread Eric Sunshine
The compiler complains that '*' in fprintf() format directive "%.*s" should have type int, but we pass size_t. Fix this. Signed-off-by: Eric Sunshine --- mailmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mailmap.c b/mailmap.c index 62d998a..4cc6e81 100644 --- a/

[PATCH v2 9/9] mailmap: style fixes

2013-07-14 Thread Eric Sunshine
From: Junio C Hamano Wrap overlong lines and format the multi-line comments to match our coding style. Signed-off-by: Junio C Hamano Signed-off-by: Eric Sunshine --- mailmap.c | 42 +++--- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/mail

[PATCH v2 6/9] mailmap: debug: fix malformed fprintf() format directive

2013-07-14 Thread Eric Sunshine
Resolve segmentation fault due to size_t variable being consumed by '%s'. Signed-off-by: Eric Sunshine --- mailmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mailmap.c b/mailmap.c index 0516354..62d998a 100644 --- a/mailmap.c +++ b/mailmap.c @@ -337,7 +337,7 @@ int map

[PATCH v2 8/9] mailmap: debug: avoid passing NULL to fprintf() '%s' directive

2013-07-14 Thread Eric Sunshine
POSIX does not state the behavior of format directive '%s' when passed a NULL pointer. Some implementations interpolate literal "(null)"; others may crash. Callers of debug_mm() often pass NULL as indication of either a missing name or email address. Instead, let's always supply a proper string po

[PATCH v2 2/9] mailmap: do not lose single-letter names

2013-07-14 Thread Eric Sunshine
From: Junio C Hamano In parse_name_and_email() function, there is this line: *name = (nstart < nend ? nstart : NULL); When the function is given a buffer "A ", nstart scans from the beginning of the buffer, skipping whitespaces (there isn't any, so nstart points at the buffer), while n

[PATCH v2 4/9] mailmap: do not downcase mailmap entries

2013-07-14 Thread Eric Sunshine
From: Junio C Hamano The email addresses in the records read from the .mailmap file are downcased very early, and then used to match against e-mail addresses in the input. Because we do use case insensitive version of string list to manage these entries, there is no need to do this, and worse ye

[PATCH v2 3/9] t4203: demonstrate loss of uppercase characters in canonical email

2013-07-14 Thread Eric Sunshine
The email addresses read from .mailmap are downcased before being inserted into the mailmap data structure, which undesirably loses information. It is impossible, for instance, to map to . Demonstrate this problem. Signed-off-by: Eric Sunshine --- t/t4203-mailmap.sh | 9 + 1 file chang

[PATCH v2 5/9] mailmap: debug: fix out-of-order fprintf() arguments

2013-07-14 Thread Eric Sunshine
Resolve segmentation fault due to arguments passed in wrong order. Signed-off-by: Eric Sunshine --- mailmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mailmap.c b/mailmap.c index a7e92db..0516354 100644 --- a/mailmap.c +++ b/mailmap.c @@ -309,7 +309,7 @@ int map_user(s

<    1   2