[PATCH v6 1/4] config: add support for http..* settings

2013-07-19 Thread Kyle J. McKay
have useragent "path-agent" and sslVerify will be off. All three of the examples will have noEPSV enabled. Signed-off-by: Kyle J. McKay --- Documentation/config.txt | 15 + http.c | 169 ++- 2 files changed, 167 in

[PATCH v6 0/4] config: add support for http..* settings

2013-07-19 Thread Kyle J. McKay
tings support. A new test for it has also been included as a separate patch. I am unclear on the proper number for this test, but have gone ahead and put it with the other http tests since this patch series places the url_normalize function into http.c. Kyle J. McKay (4): config: add support

[PATCH v6 4/4] config: allow http..* any user matching

2013-07-19 Thread Kyle J. McKay
Previously the had to specify an exactly matching user name and password if those were present in the url being matched against. Now the password portion is always ignored and omitting the user name from allows it to match against any user name. Signed-off-by: Kyle J. McKay --- Documentation

[PATCH v6 3/4] tests: add new test for the url_normalize function

2013-07-19 Thread Kyle J. McKay
will be skipped if NO_CURL is defined since http.c is skipped in that case. Signed-off-by: Kyle J. McKay --- .gitignore | 1 + Makefile | 5 ++ t/t5200-url-normalize.sh | 161 +++ test-url-normalize.c | 61

[PATCH v6 2/4] config: improve support for http..* settings

2013-07-19 Thread Kyle J. McKay
h a "HTTPS://example.COM/p%61th" url which is equivalent. The normalization rules are based on RFC 3986 and should result in any two equivalent urls being a match. Signed-off-by: Kyle J. McKay --- Documentation/config.txt | 19 ++- http.c

Re: [PATCH v6 2/4] config: improve support for http..* settings

2013-07-19 Thread Kyle J. McKay
On Jul 19, 2013, at 12:59, Junio C Hamano wrote: "Kyle J. McKay" writes: +#define URL_ALPHA "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" +#define URL_DIGIT "0123456789" +#define URL_HEXDIGIT URL_DIGIT "ABCDEFabcdef" +#define URL

Re: [PATCH v6 1/4] config: add support for http..* settings

2013-07-19 Thread Kyle J. McKay
On Jul 19, 2013, at 13:08, Junio C Hamano wrote: "Kyle J. McKay" writes: @@ -337,7 +472,7 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) http_is_verbose = 0; - git_config(http_options, NULL); + git_config(http_options, (void *)u

[PATCH v7 0/4] config: add support for http..* settings

2013-07-21 Thread Kyle J. McKay
settings support. A new test for it has also been included as a separate patch. I am unclear on the proper number for this test, but have gone ahead and put it with the other http tests since this patch series places the url_normalize function into http.c. Kyle J. McKay (4): config: add sup

[PATCH v7 1/4] config: add support for http..* settings

2013-07-21 Thread Kyle J. McKay
have useragent "path-agent" and sslVerify will be off. All three of the examples will have noEPSV enabled. Signed-off-by: Kyle J. McKay --- Documentation/config.txt | 15 + http.c | 170 ++- 2 files changed, 168 in

[PATCH v7 3/4] tests: add new test for the url_normalize function

2013-07-21 Thread Kyle J. McKay
will be skipped if NO_CURL is defined since http.c is skipped in that case. Signed-off-by: Kyle J. McKay --- .gitignore | 1 + Makefile | 5 ++ t/t5200-url-normalize.sh | 182 +++ t/t5200/README | 9 +++ t

[PATCH v7 4/4] config: allow http..* any user matching

2013-07-21 Thread Kyle J. McKay
Previously the had to specify an exactly matching user name and password if those were present in the url being matched against. Now the password portion is always ignored and omitting the user name from allows it to match against any user name. Signed-off-by: Kyle J. McKay --- Documentation

[PATCH v7 2/4] config: improve support for http..* settings

2013-07-21 Thread Kyle J. McKay
h a "HTTPS://example.COM/p%61th" url which is equivalent. The normalization rules are based on RFC 3986 and should result in any two equivalent urls being a match. Signed-off-by: Kyle J. McKay --- Documentation/config.txt | 19 ++- http.c

Re: [PATCH v7 3/4] tests: add new test for the url_normalize function

2013-07-22 Thread Kyle J. McKay
On Jul 21, 2013, at 22:15, Junio C Hamano wrote: "Kyle J. McKay" writes: +test_expect_success 'url general escapes' ' + ! test-url-normalize "http://x.y?%fg"; && + test "$(test-url-normalize -p "X://W/%7e%41^%3a")"

Re: [PATCH v7 3/4] tests: add new test for the url_normalize function

2013-07-22 Thread Kyle J. McKay
I was able to apply the patch I got back. It was marked as charset=ISO-8859-1 so it should be fine. I wasn't sure how best to handle those though, so I will send a new version with the suggested .gitattributes patch included as well. On Jul 21, 2013, at 23:45, Junio C Hamano wrote: I susp

Re: [PATCH v7 4/4] config: allow http..* any user matching

2013-07-22 Thread Kyle J. McKay
On Jul 21, 2013, at 22:28, Junio C Hamano wrote: "Kyle J. McKay" writes: diff --git a/test-url-normalize.c b/test-url-normalize.c index d68312d..f325571 100644 --- a/test-url-normalize.c +++ b/test-url-normalize.c @@ -9,7 +9,7 @@ int main() It looks like that this program could

[PATCH v8 0/4] config: add support for http..* settings

2013-07-22 Thread Kyle J. McKay
patch on top of the basic http..* settings support. A new test for it has also been included as a separate patch. I am unclear on the proper number for this test, but have gone ahead and put it with the other http tests since this patch series places the url_normalize function into http.c. Ky

[PATCH v8 1/4] config: add support for http..* settings

2013-07-22 Thread Kyle J. McKay
have useragent "path-agent" and sslVerify will be off. All three of the examples will have noEPSV enabled. Signed-off-by: Kyle J. McKay --- Documentation/config.txt | 15 + http.c | 170 ++- 2 files changed, 168 in

[PATCH v8 3/4] tests: add new test for the url_normalize function

2013-07-22 Thread Kyle J. McKay
will be skipped if NO_CURL is defined since http.c is skipped in that case. Signed-off-by: Kyle J. McKay --- .gitignore | 1 + Makefile | 5 ++ t/.gitattributes | 1 + t/t5200-url-normalize.sh | 198 +++ t

[PATCH v8 4/4] config: allow http..* any user matching

2013-07-22 Thread Kyle J. McKay
Previously the had to specify an exactly matching user name and password if those were present in the url being matched against. Now the password portion is always ignored and omitting the user name from allows it to match against any user name. Signed-off-by: Kyle J. McKay --- Documentation

[PATCH v8 2/4] config: improve support for http..* settings

2013-07-22 Thread Kyle J. McKay
h a "HTTPS://example.COM/p%61th" url which is equivalent. The normalization rules are based on RFC 3986 and should result in any two equivalent urls being a match. Signed-off-by: Kyle J. McKay --- Documentation/config.txt | 19 ++- http.c

Re: [PATCH v8 4/4] config: allow http..* any user matching

2013-07-22 Thread Kyle J. McKay
On Jul 22, 2013, at 11:00, Junio C Hamano wrote: "Kyle J. McKay" writes: diff --git a/Documentation/config.txt b/Documentation/config.txt index e461f32..c418adf 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1517,15 +1517,26 @@ http..*:: Any of the http

Re: [PATCH v8 4/4] config: allow http..* any user matching

2013-07-22 Thread Kyle J. McKay
On Jul 22, 2013, at 14:51, Junio C Hamano wrote: "Kyle J. McKay" writes: A solid wall of text is somewhat hard to read, so I'd queue the equivalent of the following "git diff -w" output on top. Can I send out the change as a 'fixup!' patch? Or do I ne

Re: [PATCH v8 3/4] tests: add new test for the url_normalize function

2013-07-24 Thread Kyle J. McKay
On Jul 24, 2013, at 10:14, Junio C Hamano wrote: Jeff King writes: How hard would it be to convert the "-c" option of test-url-normalize into something like: git config --file=foo --url http noepsv $URL which would look for http.$URL.noepsv matches. Lovely. [snip] Another thing we may

Re: [PATCH v8 3/4] tests: add new test for the url_normalize function

2013-07-24 Thread Kyle J. McKay
On Jul 23, 2013, at 23:59, Jeff King wrote: diff --git a/test-url-normalize.c b/test-url-normalize.c new file mode 100644 index 000..f18bd88 --- /dev/null +++ b/test-url-normalize.c [...] + if (!strcmp("sslverify", opt_lc.buf)) + printf("%s\n", curl_ssl_verify ? "true" :

Re: [PATCH] test-url-normalize.c: Fix gcc errors and sparse warnings

2013-07-24 Thread Kyle J. McKay
On Jul 24, 2013, at 12:07, Ramsay Jones wrote: Sparse issues an "non-ANSI function declaration of function 'main'" warning when NO_CURL is set. In order to suppress the warning, we simply add the function prototype. When NO_CURL and USE_CURL_MULTI are not defined, then gcc issues the following

[REQUEST 1/1] docs: update http..* options documentation

2013-07-25 Thread Kyle J. McKay
Overhaul the text of the http..* options documentation providing a hopefully easier to understand itemized list of matching behavior as suggested by and including text from Jeff King. --- Documentation/config.txt | 60 +--- 1 file changed, 37 insertions(

[REQUEST 0/1] Requesting your signed-off-by

2013-07-25 Thread Kyle J. McKay
message that includes the full patch text with a 'Signed-off-by' line added from you before I include it in any patch series (after which I will add my own 'Signed-off-by' for the other changes I made). If you would prefer to simply submit your own patch with the changes, I h

Re: [REQUEST 1/1] docs: update http..* options documentation

2013-07-25 Thread Kyle J. McKay
On Jul 25, 2013, at 21:37, Jeff King wrote: On Thu, Jul 25, 2013 at 03:39:13PM -0700, Kyle J. McKay wrote: Overhaul the text of the http..* options documentation providing a hopefully easier to understand itemized list of matching behavior as suggested by and including text from Jeff King

Re: [REQUEST 1/1] docs: update http..* options documentation

2013-07-25 Thread Kyle J. McKay
On Jul 25, 2013, at 23:23, Kyle J. McKay wrote: On Jul 25, 2013, at 21:37, Jeff King wrote: You should add your S-O-B, too, for your bits. Yes. I wanted to make certain it didn't get applied just yet. :) Looks like it got patch snarfed anyway. ;-) On Jul 25, 2013, at 23:07, Junio C H

Re: [REQUEST 1/1] docs: update http..* options documentation

2013-07-26 Thread Kyle J. McKay
On Jul 26, 2013, at 15:27, Jeff King wrote: On Thu, Jul 25, 2013 at 11:23:23PM -0700, Kyle J. McKay wrote: IMHO, this would be more clear as a single item, like: . User name (e.g., `user` in `https://u...@example.com/repo.git`). If the config key has a user name it must match the user

Re: [REQUEST 1/1] docs: update http..* options documentation

2013-07-26 Thread Kyle J. McKay
On Jul 26, 2013, at 19:43, Jeff King wrote: On Fri, Jul 26, 2013 at 07:15:07PM -0700, Kyle J. McKay wrote: So there's a version of this in next as cea9928 and I think that version is fine. If the documentation gets updated in the future, or perhaps moved to a separate urls-matching.tx

Re: [PATCH 5/3] revert most of the http_options() change

2013-07-30 Thread Kyle J. McKay
On Jul 29, 2013, at 19:13, Junio C Hamano wrote: With the previous preparation step, the earlier 1bb6 (config: add support for http..* settings, 2013-07-21) that introduced many repeated changes: -if (!strcmp("http.key", var)) { +if (!strcmp("key", key)) { + if (m

Re: [PATCH 3/3] config: --get-urlmatch

2013-07-30 Thread Kyle J. McKay
On Jul 29, 2013, at 15:49, Junio C Hamano wrote: "git config --get-urlmatch $section[.$variable] $url" is a way to learn what the configured value for $section.$variable is for the given URL, using the logic introduced by the http..config topic. In addition to $section.$variable, entries in the

Re: [PATCH 5/3] revert most of the http_options() change

2013-07-30 Thread Kyle J. McKay
On Jul 30, 2013, at 12:14, Kyle J. McKay wrote: On Jul 29, 2013, at 19:13, Junio C Hamano wrote: With the previous preparation step, the earlier 1bb6 (config: add support for http..* settings, 2013-07-21) that introduced many repeated changes: -if (!strcmp("http.key&

Re: [PATCH v6 2/6] config: add helper to normalize and match URLs

2013-07-31 Thread Kyle J. McKay
On Jul 31, 2013, at 12:26, Junio C Hamano wrote: From: "Kyle J. McKay" Some http.* configuration variables need to take values customized for the URL we are talking to. We may want to set http.sslVerify to true in general but to false only for a certain site, for examp

Re: [PATCH v6 4/6] config: parse http.. using urlmatch

2013-07-31 Thread Kyle J. McKay
On Jul 31, 2013, at 12:26, Junio C Hamano wrote: From: "Kyle J. McKay" Use the urlmatch_config_entry() to wrap the underlying http_options() two-level variable parser in order to set http. to the value with the most specific URL in the configuration. Signed-off-by: Kyle J. McKay

[PATCH ALTERNATIVE v6 0/2] http.. and friends

2013-07-31 Thread Kyle J. McKay
This patch simply provides two alternative versions of the 2/6 and 4/6 patches previously sent as part of the: [PATCH v6 0/6] http.. and friends series. They are intended simply as complete alternatives to parts 2 and 4 that include the following changes: 2/4 - Include 1-line documentation up

[PATCH ALTERNATIVE v6 2/4] config: add helper to normalize and match URLs

2013-07-31 Thread Kyle J. McKay
The normalization rules are based on RFC 3986 and should result in any two equivalent urls being a match. Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano --- urlmatch.c | 468 + urlmatch.h | 36 + 2 files change

[PATCH ALTERNATIVE v6 4/4] config: parse http.. using urlmatch

2013-07-31 Thread Kyle J. McKay
Use the urlmatch_config_entry() to wrap the underlying http_options() two-level variable parser in order to set http. to the value with the most specific URL in the configuration. Signed-off-by: Jeff King Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano --- .gitignore

[PATCH ALTERNATIVE v6.v2 4/6] config: parse http.. using urlmatch

2013-07-31 Thread Kyle J. McKay
Use the urlmatch_config_entry() to wrap the underlying http_options() two-level variable parser in order to set http. to the value with the most specific URL in the configuration. Signed-off-by: Jeff King Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano --- Somehow I managed to

Re: [PATCH v6 6/6] config: "git config --get-urlmatch" parses section..key

2013-07-31 Thread Kyle J. McKay
On Jul 31, 2013, at 15:45, Jeff King wrote: On Wed, Jul 31, 2013 at 12:26:08PM -0700, Junio C Hamano wrote: Using the same urlmatch_config_entry() infrastructure, add a new mode "--get-urlmatch" to the "git config" command, to learn values for the "virtual" two-level variables customized for t

[PATCH ALTERNATIVE v6.v3 4/6] config: parse http.. using urlmatch

2013-08-05 Thread Kyle J. McKay
Use the urlmatch_config_entry() to wrap the underlying http_options() two-level variable parser in order to set http. to the value with the most specific URL in the configuration. Signed-off-by: Jeff King Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano --- This version of 4/6 moves

Re: [PATCH ALTERNATIVE v6.v3 4/6] config: parse http.. using urlmatch

2013-08-05 Thread Kyle J. McKay
On Aug 5, 2013, at 15:56, Junio C Hamano wrote: "Kyle J. McKay" writes: Use the urlmatch_config_entry() to wrap the underlying http_options() two-level variable parser in order to set http. to the value with the most specific URL in the configuration. Signed-off-by: Jeff King Sig

Re: Remove old forgotten command: whatchanged

2013-08-07 Thread Kyle J. McKay
On Aug 7, 2013, at 09:00, Ramkumar Ramachandra wrote: Hi, This is the difference between whatchanged and log: diff --git a/whatchanged b/log index fa1b223..004d9aa 100644 --- a/tmp/whatchanged +++ b/tmp/log @@ -1,4 +1,4 @@ -int cmd_whatchanged(int argc, const char **argv, const char *prefix) +i

Re: Remove old forgotten command: whatchanged

2013-08-07 Thread Kyle J. McKay
On Aug 7, 2013, at 11:31, John Keeping wrote: On Wed, Aug 07, 2013 at 11:01:57AM -0700, Kyle J. McKay wrote: On Aug 7, 2013, at 09:00, Ramkumar Ramachandra wrote: Hi, This is the difference between whatchanged and log: diff --git a/whatchanged b/log index fa1b223..004d9aa 100644 --- a/tmp

Re: git status resets permissions on index file -- Ubuntu 12.04 64b

2013-08-08 Thread Kyle J. McKay
On Aug 8, 2013, at 15:18, Andrew Ruder wrote: On Thu, Aug 08, 2013 at 11:35:35PM +0200, Stefan Beller wrote: On 08/08/2013 10:27 PM, Justin Collum wrote: [...] -rwxrwxrwx 1 dev dev 17K Aug 8 13:12 index [...] -rw-rw-r-- 1 dev dev 17K Aug 8 13:16 index # <--- The permissi

Re: [PATCH] builtin/config.c: compilation fix

2013-08-08 Thread Kyle J. McKay
On Aug 8, 2013, at 21:41, Junio C Hamano wrote: Do not feed a random string as the first parameter to die(); use "%s" as the format string instead. Do the same for test-urlmatch-normalization.c while saving a single pointer variable by turning a "const char *" constant string into "const char []

Re: [RFC PATCHv2] repack: rewrite the shell script in C.

2013-08-17 Thread Kyle J. McKay
On Aug 17, 2013, at 06:34, René Scharfe wrote: On Aug 15, 2013, at 17:12, Stefan Beller wrote: + if (sha_begin >= e->d_name && !strncmp(sha_begin, sha1, 40)) { + char *fname; + fname = xmalloc(strlen(path) + 1 + strlen(e->d_name)); This

Re: [PATCH] xread(): Fix read error when filtering >= 2GB on Mac OS X

2013-08-17 Thread Kyle J. McKay
On Aug 17, 2013, at 05:40, Steffen Prohaska wrote: Previously, filtering more than 2GB through an external filter (see test) failed on Mac OS X 10.8.4 (12E55) with: error: read from external filter cat failed error: cannot feed the input to external filter cat error: cat died of signal

Re: [RFC PATCHv3] repack: rewrite the shell script in C.

2013-08-18 Thread Kyle J. McKay
On Aug 18, 2013, at 07:36, Stefan Beller wrote: + fprintf(stderr, + "WARNING: Some packs in use have been renamed by\n" + "WARNING: prefixing old- to their name, in order to\n" + "WA

Re: [ANNOUNCE] Git v1.8.4-rc4

2013-08-19 Thread Kyle J. McKay
On Aug 19, 2013, at 12:59, Junio C Hamano wrote: Performance, Internal Implementation, etc. * On Cygwin, we used to use our own lstat(2) emulation that is allegedly faster than the platform one in codepaths where some of the information it returns did not matter, but it started to bite us

Re: [PATCH v4] compat: Fix read() of 2GB and more on Mac OS X

2013-08-19 Thread Kyle J. McKay
On Aug 19, 2013, at 10:16, Junio C Hamano wrote: Linus Torvalds writes: So why isn't the patch much more straightforward? Like the attached totally untested one that just limits the read/write size to 8MB (which is totally arbitrary, but small enough to not have any latency issues even on slo

<    1   2   3