[PATCH] gc: notice gc processes run by other users

2013-12-31 Thread Kyle J. McKay
Since 64a99eb4 git gc refuses to run without the --force option if another gc process on the same repository is already running. However, if the repository is shared and user A runs git gc on the repository and while that gc is still running user B runs git gc on the same repository the gc

Re: [PATCH] Fix typesetting in Bugs section of 'git-rebase' man page (web version)

2014-01-15 Thread Kyle J. McKay
On Jan 14, 2014, at 21:36, Jason St. John wrote: On Mon, Jan 13, 2014 at 12:55 PM, Junio C Hamano gits...@pobox.com wrote: Jason St. John jstj...@purdue.edu writes: What AsciiDoc formatter (and version) do you use? $ asciidoc --version asciidoc 8.6.8 Checking with

Re: [PATCH] send-email: If the ca path is not specified, use the defaults

2014-01-16 Thread Kyle J. McKay
On Jan 16, 2014, at 15:19, Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: FWIW this should help on Mac OS X, too. Folks using git on mac at $DAYJOB have been using the workaround described at http://mercurial.selenic.com/wiki/CACertificates#Mac_OS_X_10.6_and_higher so I

Re: [PATCH 2/3] setup_pager: set MORE=R

2014-01-16 Thread Kyle J. McKay
On Jan 16, 2014, at 20:21, Jeff King wrote: When we run the pager, we always set LESS=R to tell the pager to pass through ANSI colors. On modern versions of FreeBSD, the system more can do the same trick. [snip] diff --git a/pager.c b/pager.c index 90d237e..2303164 100644 --- a/pager.c +++

Re: [PATCH] send-email: If the ca path is not specified, use the defaults

2014-01-17 Thread Kyle J. McKay
On Jan 17, 2014, at 10:14, Junio C Hamano wrote: If I am reading the code correctly, if /etc/ssl/certs does not exist on the filesystem at all, it wouldn't even attempt verification, so I take your the verification will fail to mean that you forgot to also mention And on OS X, /etc/ssl/certs

Re: [PATCH 2/3] setup_pager: set MORE=R

2014-01-21 Thread Kyle J. McKay
On Jan 20, 2014, at 21:30, Jeff King wrote: Ugh. Having just read the LESS discussion, it makes me wonder if the strchr(getenv(LESS), 'R') check I add elsewhere in the series is sufficient. I suspect in practice it is good enough, but I would not be surprised if there is a way to fool it

Re: [PATCH] Added get sendmail from .mailrc

2014-01-27 Thread Kyle J. McKay
On Jan 27, 2014, at 17:15, Jeff King wrote: On Sat, Jan 25, 2014 at 01:46:50PM +0400, Brilliantov Kirill Vladimirovich wrote: + if (!defined $smtp_server) { + my $mailrc = File::HomeDir-my_home . /.mailrc; Actually, based on the output of man mail, this should probably

Re: [PATCH 2/3] setup_pager: set MORE=R

2014-02-04 Thread Kyle J. McKay
On Feb 4, 2014, at 14:12, Jeff King wrote: On Tue, Jan 21, 2014 at 11:23:30AM -0800, Junio C Hamano wrote: does complicate the point of my series, which was to add more intimate logic about how we handle LESS. ... return !x || strchr(x, 'R'); [...] I am not sure if it is

Re: git-note -C changes commit type?

2014-02-11 Thread Kyle J. McKay
On Feb 11, 2014, at 16:06, Junio C Hamano wrote: Johan Herland jo...@herland.net writes: There is currently no way the git notes commands will allow you to store the 3d7de37 commit object directly as a note. There is also (AFAICS) no easy workaround (git fast-import could've been a workaround

Re: [BUG?] git http connection reuse

2014-02-15 Thread Kyle J. McKay
On Feb 15, 2014, at 20:05, Jeff King wrote: I've noticed that git does not reuse http connections when fetching, and I'm trying to figure out why. It seems related to our use of two curl features: 1. If we use the curl_multi interface (even though we are doing the requests sequentially),

Re: [BUG] Halt during fetch on MacOS

2014-03-01 Thread Kyle J. McKay
On Feb 28, 2014, at 22:15, Jeff King wrote: On Fri, Feb 28, 2014 at 03:26:28PM -0800, Conley Owens wrote: test.sh #!/bin/bash rungit() { mkdir $1 GIT_DIR=$1 git init --bare echo '[remote aosp]' $1/config echo 'url = https://android.googlesource.com/platform/external/tinyxml2'

Potential GSOC microproject idea

2014-03-08 Thread Kyle J. McKay
On Mar 3, 2014, at 23:58, Michael Haggerty wrote: list regulars should FEEL ENCOURAGED to submit microprojects to add to the list. (Either submit them as a pull request to the GitHub repository that contains the text [1] or to the mailing list with CC to me.) Potential idea for a

[PATCH] test: fix t7001 cp to use POSIX options

2014-04-11 Thread Kyle J. McKay
. Change cp -a to cp -R -P -p so that the t7001-mv test works on systems with a cp utility that only implements the POSIX required set of options and not the -a option. Signed-off-by: Kyle J. McKay mack...@gmail.com --- t/t7001-mv.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

[PATCH 0/3] Fix support for FreeBSD's /bin/sh

2014-04-11 Thread Kyle J. McKay
of \?). There are more details in the individual patches. This patch series is based on maint since these are bug fixes and that's what SubmittingPatches says to do... Kyle J. McKay (3): rebase: avoid non-function use of return on FreeBSD Revert rebase: fix run_specific_rebase's use of return

[PATCH 2/3] Revert rebase: fix run_specific_rebase's use of return on FreeBSD

2014-04-11 Thread Kyle J. McKay
statements in this way in the git-rebase--*.sh scripts. This workaround is therefore no longer necessary, so clean up the code by reverting it. Conflicts: git-rebase.sh Signed-off-by: Kyle J. McKay mack...@gmail.com --- git-rebase.sh | 11 +-- 1 file changed, 1 insertion(+), 10 deletions

[PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-11 Thread Kyle J. McKay
with the --ignore-all-space (-w) diff option. Signed-off-by: Kyle J. McKay mack...@gmail.com --- git-rebase--am.sh | 117 git-rebase--interactive.sh | 335 +++-- git-rebase--merge.sh | 87 ++-- 3 files changed, 274

[PATCH 3/3] test: fix t5560 on FreeBSD

2014-04-11 Thread Kyle J. McKay
-noserver.sh to pass on FreeBSD again. Signed-off-by: Kyle J. McKay mack...@gmail.com --- t/t5560-http-backend-noserver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh index 9be9ae34..5abd11a5 100755 --- a/t

Re: [PATCH] test: fix t7001 cp to use POSIX options

2014-04-11 Thread Kyle J. McKay
On Apr 11, 2014, at 04:43, Jeff King wrote: On Fri, Apr 11, 2014 at 01:24:02AM -0700, Kyle J. McKay wrote: Since 11502468 and 04c1ee57 (both first appearing in v1.8.5), the t7001-mv test has used cp -a to perform a copy in several of the tests. However, the -a option is not required

Re: [PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-11 Thread Kyle J. McKay
On Apr 11, 2014, at 01:48, Matthieu Moy wrote: Kyle J. McKay mack...@gmail.com writes: If script2.sh is changed to this: # script2.sh fixed main() { if [ 5 -gt 3 ]; then return 5 fi case bad in *) echo always shows esac echo

Re: [PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-11 Thread Kyle J. McKay
On Apr 11, 2014, at 10:30, Matthieu Moy wrote: Kyle J. McKay mack...@gmail.com writes: There are already nested functions with file inclusion between both levels of nesting in git-rebase--interactive.sh and git-rebase-- merge.sh now, so it's not introducing anything new. OK, so it's less

Re: [PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-12 Thread Kyle J. McKay
On Apr 12, 2014, at 10:07, Matthieu Moy wrote: Kyle J. McKay mack...@gmail.com writes: On Apr 11, 2014, at 10:30, Matthieu Moy wrote: Kyle J. McKay mack...@gmail.com writes: There are already nested functions with file inclusion between both levels of nesting in git-rebase--interactive.sh

Re: [PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-15 Thread Kyle J. McKay
On Apr 14, 2014, at 15:51, Junio C Hamano wrote: I think we would want to see the actual change formatted this way (without needing to pass -w to git show), as it will make it clear that this artificial extra level of define the whole thing inside a function and then make a single call to it is

Re: [PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-16 Thread Kyle J. McKay
On Apr 16, 2014, at 11:11, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Kyle J. McKay mack...@gmail.com writes: If I'm the only one getting a wrong meaning from the comments, then no reason to change them. I agree that the description does not read well with the work

Re: [PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-17 Thread Kyle J. McKay
to say that we take return stopping the dot-sourced file as a given and FreeBSD does not behave that way. -- 8 -- From: Kyle J. McKay mack...@gmail.com Date: Fri, 11 Apr 2014 01:28:17 -0700 Subject: [PATCH] rebase: avoid non-function use of return on FreeBSD [...] The new version of the patch looks

Re: [ANNOUNCE] Git v2.0.0-rc0

2014-04-22 Thread Kyle J. McKay
when testing an explictly empty prefix string in order to work with older versions of Perl's Getopt::Long module. Signed-off-by: Kyle J. McKay mack...@gmail.com --- t/t9117-git-svn-init-clone.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t9117-git-svn-init-clone.sh

[PATCH] pack-bitmap: do not core dump

2014-04-22 Thread Kyle J. McKay
this by dividing by the sizeof(eword_t) instead which will always be correct for all platforms. Signed-off-by: Kyle J. McKay mack...@gmail.com --- ewah/ewah_bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c index 9ced2dad..fccb42b5

Re: [PATCH] pack-bitmap: do not core dump

2014-04-22 Thread Kyle J. McKay
On Apr 22, 2014, at 16:17, Jeff King wrote: but I do not think that is necessarily any more readable, especially because we probably need to cast it like: self-rlw = (eword_t *)((uint8_t *)self-buffer + rlw_offset); I suspect that will produce a warning about a cast increasing pointer

Re: Git on Mac OS X 10.4.10

2014-08-15 Thread Kyle J. McKay
a single line need be added. --Kyle 8 Subject: [PATCH] config.mak.uname: set NO_APPLE_COMMON_CRYPTO on older systems Older MacOS systems prior to 10.5 do not have the CommonCrypto support Git uses so set NO_APPLE_COMMON_CRYPTO on those systems. Signed-off-by: Kyle J. McKay mack...@gmail.com

Re: Git on Mac OS X 10.4.10

2014-08-15 Thread Kyle J. McKay
On Aug 15, 2014, at 10:02, Junio C Hamano wrote: By the way, can we document this uname_R on MacOS X business nearby, perhaps like this? -- 8 -- Subject: config.mak.uname: add hint on uname_R for MacOS X I always have to scratch my head every time I see this cryptic pattern [15678]\.; leave a

Re: Git on Mac OS X 10.4.10

2014-08-15 Thread Kyle J. McKay
On Aug 15, 2014, at 11:04, Junio C Hamano wrote: The 10.1.0 anomaly actually was bothering me, too. How about doing it this way? -- 8 -- Subject: [PATCH v2] config.mak.uname: add hint on uname_R for MacOS X I always have to scratch my head every time I see this cryptic pattern [15678]\.;

Re: [PATCH 18/18] signed push: final protocol update

2014-08-21 Thread Kyle J. McKay
On Aug 21, 2014, at 16:40, Junio C Hamano wrote: * The receiving end will issue push-cert=nonce in its initial capability advertisement, and this nonce will be given on the PUSH_CERT_NONCE environment to the pre/post-receive hooks, to allow the nonce nonce header in the signed certificate

Re: Bug/request: the empty string should be a valid git note

2014-09-21 Thread Kyle J. McKay
On Sep 20, 2014, at 18:44, Johan Herland wrote: At least, we should fix git notes add -C e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 Whether we should also change git notes add -m '' to create an empty note, or leave it as-is, (i.e. similar in spirit to git commit -m ''), I'll leave up

Re: [RFC] Git.pm: stat the FD to ensure the file is really open

2014-10-30 Thread Kyle J. McKay
, as the underlying file descriptor is closed without the PerlIO layer knowing about it. This is likely a bug inside libsvn (1.6.17), as none of the Git.pm or Git::SVN modules close IOs without the knowledge of the PerlIO layer. Cc: Kyle J. McKay mack...@gmail.com Signed-off-by: Eric Wong normalper

[PATCH v2] config: add support for http.url.* settings

2013-07-11 Thread Kyle J. McKay
From: Kyle J. McKay mack...@gmail.com The url value is considered a match to a url if the url value is either an exact match or a prefix of the url which ends on a path component boundary ('/'). So https://example.com/test; will match https://example.com/test; and https://example.com/test/too

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

2013-07-11 Thread Kyle J. McKay
On Jul 11, 2013, at 12:26, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: +static int http_option_maxlen[opt_max]; I understand that this is to keep track of the length of the longest one that has matched (hence the current candidate). The name maxlen captures the longest

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

2013-07-11 Thread Kyle J. McKay
useragent path-agent and sslVerify will be off. All three of the examples will have noEPSV enabled. Signed-off-by: Kyle J. McKay mack...@gmail.com --- The credentials configuration values already support url-specific configuration items in the form credential.url.*. This patch adds similar support

[PATCH v4] config: add support for http.url.* settings

2013-07-12 Thread Kyle J. McKay
useragent path-agent and sslVerify will be off. All three of the examples will have noEPSV enabled. Signed-off-by: Kyle J. McKay mack...@gmail.com Reviewed-by: Junio C Hamano gits...@pobox.com --- The credentials configuration values already support url-specific configuration items in the form

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

2013-07-12 Thread Kyle J. McKay
On Jul 12, 2013, at 02:59, Jeff King wrote: On Thu, Jul 11, 2013 at 02:50:03PM -0700, Kyle J. McKay wrote: A few comments on the implementation: +enum http_option_type { + opt_post_buffer = 0, + opt_min_sessions, We usually put enum fields in ALL_CAPS to mark them as constants

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

2013-07-13 Thread Kyle J. McKay
On Jul 12, 2013, at 12:05, Jonathan Nieder wrote: Junio C Hamano wrote: The existing code triggers only when the configuration variable is set to true. Once the variable is set to true in a more generic configuration file (e.g. ~/.gitconfig), it cannot be overriden to false in the

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

2013-07-13 Thread Kyle J. McKay
On Jul 12, 2013, at 13:58, Aaron Schrab wrote: At 06:07 -0700 12 Jul 2013, Kyle J. McKay mack...@gmail.com wrote: I don't think it's necessary to split the URL apart though. Whatever URL the user gave to git on the command line (at some point even if it's now stored as a remote setting

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

2013-07-15 Thread Kyle J. McKay
matches, the last one encountered wins except that exact user matches are preferred over matches where the url contains a user but the config url does not. On Jul 14, 2013, at 21:02, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: On Jul 12, 2013, at 13:58, Aaron Schrab wrote

[PATCH v5 0/5] config: add support for http.url.* settings

2013-07-15 Thread Kyle J. McKay
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. Junio C Hamano (1): http.c: fix parsing of http.sslCertPasswordProtected variable Kyle J. McKay (4): http.c

[PATCH v5 1/5] http.c: fix parsing of http.sslCertPasswordProtected variable

2013-07-15 Thread Kyle J. McKay
From: Junio C Hamano gits...@pobox.com The existing code triggers only when the configuration variable is set to true. Once the variable is set to true in a more generic configuration file (e.g. ~/.gitconfig), it cannot be overriden to false in the repository specific one (e.g. .git/config).

[PATCH v5 2/5] http.c: fix parsing of GIT_SSL_CERT_PASSWORD_PROTECTED variable

2013-07-15 Thread Kyle J. McKay
The existing code triggers whenever GIT_SSL_CERT_PASSWORD_PROTECTED is defined. Setting GIT_SSL_CERT_PASSWORD_PROTECTED to a false value could not be used to override the http.sslCertPasswordProtected setting once it had been turned on. Signed-off-by: Kyle J. McKay mack...@gmail.com --- http.c

[PATCH v5 3/5] config: add support for http.url.* settings

2013-07-15 Thread Kyle J. McKay
-agent and sslVerify will be on. The https://example.com/; url will have useragent example-agent and sslVerify will be off. The https://example.com/path/sub; url will have useragent path-agent and sslVerify will be off. All three of the examples will have noEPSV enabled. Signed-off-by: Kyle J

[PATCH v5 4/5] config: improve support for http.url.* settings

2013-07-15 Thread Kyle J. McKay
://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 mack...@gmail.com --- Documentation/config.txt | 19 ++-- http.c | 222

[PATCH v5 5/5] tests: add new test for the url_normalize function

2013-07-15 Thread Kyle J. McKay
this test will be skipped if NO_CURL is defined since http.c is skipped in that case. Signed-off-by: Kyle J. McKay mack...@gmail.com --- .gitignore | 1 + Makefile | 5 +++ t/t5200-url-normalize.sh | 109 +++ test-url

Re: [PATCH v5 4/5] config: improve support for http.url.* settings

2013-07-16 Thread Kyle J. McKay
On Jul 15, 2013, at 16:12, Eric Sunshine wrote: On Mon, Jul 15, 2013 at 5:51 AM, Kyle J. McKay mack...@gmail.com wrote: +static int append_normalized_escapes(struct strbuf *buf, +const char *from, +size_t from_len

maintainer question: config http.url.* patch administrivia

2013-07-17 Thread Kyle J. McKay
I have pondered these items: On Jul 12, 2013, at 11:48, Junio C Hamano wrote: Perhaps we should fix it as a preparatory patch (1/2) before the main feature addition patch. On Jul 12, 2013, at 11:52, Junio C Hamano wrote: Subject: [PATCH] http.c: fix parsing of http.sslCertPasswordProtected

Re: maintainer question: config http.url.* patch administrivia

2013-07-17 Thread Kyle J. McKay
On Jul 17, 2013, at 10:35, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: perhaps it would be more convenient for you if I re-released the following patch series: If These build on top of each other in this order, then it is easier for me to manage if they were in a single

Re: [PATCH v3 1/2] Git.pm: add new temp_is_locked function

2013-07-18 Thread Kyle J. McKay
On Jul 18, 2013, at 11:34, David Rothenberger wrote: Kyle J. McKay mackyle at gmail.com writes: +sub temp_is_locked { + my ($self, $name) = _maybe_self( at _); + my $temp_fd = \$TEMP_FILEMAP{$name}; + + defined $$temp_fd $$temp_fd-opened $TEMP_FILES{$$temp_fd} {locked

[PATCH v4 1/2] Git.pm: add new temp_is_locked function

2013-07-18 Thread Kyle J. McKay
The temp_is_locked function can be used to determine whether or not a given name previously passed to temp_acquire is currently locked. Signed-off-by: Kyle J. McKay mack...@gmail.com --- perl/Git.pm | 31 ++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git

[PATCH v4 2/2] git-svn: allow git-svn fetching to work using serf

2013-07-18 Thread Kyle J. McKay
access method, git-svn can end up needing to create several temp files before the first one is closed. This change causes a new temp file moniker to be generated if the one that would otherwise have been used is currently locked. Signed-off-by: Kyle J. McKay mack...@gmail.com --- perl/Git/SVN

[PATCH v4 0/2] allow git-svn fetching to work using serf

2013-07-18 Thread Kyle J. McKay
is identical to v3, and in particular the 0002 perl/Git/SVN/Fetcher.pm change is identical to that of v3. Kyle J. McKay (2): Git.pm: add new temp_is_locked function git-svn: allow git-svn fetching to work using serf perl/Git.pm | 31 ++- perl/Git/SVN

Re: [PATCH v4 2/2] git-svn: allow git-svn fetching to work using serf

2013-07-18 Thread Kyle J. McKay
On Jul 18, 2013, at 12:29, Jonathan Nieder wrote: (cc-ing Eric Wong, who maintains git-svn and knows both it and the libsvn perl bindings much better than I do) Kyle J. McKay wrote: David Rothenberger daver...@acm.org has determined the cause to be that ra_serf does not drive the delta editor

[PATCH 0/1] incremental update against 'next' branch

2013-07-18 Thread Kyle J. McKay
at the suggestion of a reviewer. This patch reverts that change as the logic in _temp_cache isn't really conducive to using temp_is_locked because its tests are not exactly the same as the ones in temp_is_locked. Kyle J. McKay (1): Git.pm: revert _temp_cache use of temp_is_locked perl/Git.pm | 2

[PATCH 1/1] Git.pm: revert _temp_cache use of temp_is_locked

2013-07-18 Thread Kyle J. McKay
than is provided by the temp_is_locked function. This change reverts use of temp_is_locked in the _temp_cache function and restores the original code that existed there before the temp_is_locked function was added. Signed-off-by: Kyle J. McKay mack...@gmail.com --- perl/Git.pm | 2 +- 1 file changed

Re: [PATCH v4 0/2] allow git-svn fetching to work using serf

2013-07-18 Thread Kyle J. McKay
On Jul 18, 2013, at 16:34, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: This patch allows git-svn to fetch successfully using the serf library when given an https?: url to fetch from. ... Versions v2-v3 of the patch introduced a bug when attempting to change the _temp_cache

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

2013-07-19 Thread Kyle J. McKay
-agent and sslVerify will be on. The https://example.com/; url will have useragent example-agent and sslVerify will be off. The https://example.com/path/sub; url will have useragent path-agent and sslVerify will be off. All three of the examples will have noEPSV enabled. Signed-off-by: Kyle J

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

2013-07-19 Thread Kyle J. McKay
on top of the basic http.url.* 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

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

2013-07-19 Thread Kyle J. McKay
Previously the url 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 url allows it to match against any user name. Signed-off-by: Kyle J. McKay mack

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

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

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

2013-07-19 Thread Kyle J. McKay
://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 mack...@gmail.com --- Documentation/config.txt | 19 ++- http.c | 322

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

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

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

2013-07-19 Thread Kyle J. McKay
On Jul 19, 2013, at 13:08, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com 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

[PATCH v7 0/4] config: add support for http.url.* 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 support

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

2013-07-21 Thread Kyle J. McKay
-agent and sslVerify will be on. The https://example.com/; url will have useragent example-agent and sslVerify will be off. The https://example.com/path/sub; url will have useragent path-agent and sslVerify will be off. All three of the examples will have noEPSV enabled. Signed-off-by: Kyle J

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

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

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

2013-07-21 Thread Kyle J. McKay
Previously the url 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 url allows it to match against any user name. Signed-off-by: Kyle J. McKay mack

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

2013-07-21 Thread Kyle J. McKay
://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 mack...@gmail.com --- Documentation/config.txt | 19 ++- http.c | 311

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 mack...@gmail.com writes: +test_expect_success 'url general escapes' ' + ! test-url-normalize http://x.y?%fg; + test $(test-url-normalize -p X://W/%7e%41^%3a) = x://w/~A%5E %3A + test $(test-url-normalize -p X://W

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

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

2013-07-22 Thread Kyle J. McKay
On Jul 21, 2013, at 22:28, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com 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

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

2013-07-22 Thread Kyle J. McKay
J. McKay (4): config: add support for http.url.* settings config: improve support for http.url.* settings tests: add new test for the url_normalize function config: allow http.url.* any user matching .gitignore | 1 + Documentation/config.txt | 25 ++ Makefile

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

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

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

2013-07-22 Thread Kyle J. McKay
Previously the url 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 url allows it to match against any user name. Signed-off-by: Kyle J. McKay mack

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

2013-07-22 Thread Kyle J. McKay
://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 mack...@gmail.com --- Documentation/config.txt | 19 ++- http.c | 311

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

2013-07-22 Thread Kyle J. McKay
On Jul 22, 2013, at 11:00, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com 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.url.*:: Any

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

2013-07-22 Thread Kyle J. McKay
On Jul 22, 2013, at 14:51, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com 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 need to send a new v9

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 p...@peff.net 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

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.url.* options documentation

2013-07-25 Thread Kyle J. McKay
Overhaul the text of the http.url.* 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

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

2013-07-25 Thread Kyle J. McKay
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 have no objection and will simply refer to that as a required patch instead. Thanks, Kyle Kyle J. McKay (1): docs: update http.url.* options

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

2013-07-26 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.url.* 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.url.* options documentation

2013-07-26 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 Hamano

Re: [REQUEST 1/1] docs: update http.url.* 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.url.* 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.txt

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.url.* settings, 2013-07-21) that introduced many repeated changes: -if (!strcmp(http.key, var)) { +if (!strcmp(key, key)) { + if

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.url.config topic. In addition to $section.$variable, entries in

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.url.* settings, 2013-07-21) that introduced many repeated changes: -if (!strcmp(http.key, var

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 mack...@gmail.com 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 example

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

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

[PATCH ALTERNATIVE v6 0/2] http.url.key 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.url.key 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

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

2013-07-31 Thread Kyle J. McKay
and should result in any two equivalent urls being a match. Signed-off-by: Kyle J. McKay mack...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- urlmatch.c | 468 + urlmatch.h | 36 + 2 files changed, 504 insertions

[PATCH ALTERNATIVE v6 4/4] config: parse http.url.variable 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.variable to the value with the most specific URL in the configuration. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Kyle J. McKay mack...@gmail.com Signed-off-by: Junio C

[PATCH ALTERNATIVE v6.v2 4/6] config: parse http.url.variable 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.variable to the value with the most specific URL in the configuration. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Kyle J. McKay mack...@gmail.com Signed-off-by: Junio C

Re: [PATCH v6 6/6] config: git config --get-urlmatch parses section.url.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 the

[PATCH ALTERNATIVE v6.v3 4/6] config: parse http.url.variable 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.variable to the value with the most specific URL in the configuration. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Kyle J. McKay mack...@gmail.com Signed-off-by: Junio C

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

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

  1   2   3   >