[PATCH] mailinfo.c: move side-effects outside of assert

2016-12-17 Thread Kyle J. McKay
. Signed-off-by: Kyle J. McKay --- Notes: Please include this PATCH in 2.11.x maint mailinfo.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mailinfo.c b/mailinfo.c index 2fb3877e..47442fb5 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -708,9 +708,12 @@ static int

Re: [PATCH] mailinfo.c: move side-effects outside of assert

2016-12-19 Thread Kyle J. McKay
On Dec 19, 2016, at 12:03, Jeff King wrote: On Sat, Dec 17, 2016 at 11:54:18AM -0800, Kyle J. McKay wrote: Since 6b4b013f18 (mailinfo: handle in-body header continuations, 2016-09-20, v2.11.0) mailinfo.c has contained new code with an assert of the form: assert(call_a_function

[PATCH v2] mailinfo.c: move side-effects outside of assert

2016-12-19 Thread Kyle J. McKay
esult of the function call instead so that the code still works properly in a release build and passes the tests. Since the only time that mi->inbody_header_accum is appended to is in check_inbody_header, and appending onto a blank mi->inbody_header_accum always happens when is_inbody_heade

[PATCH v3] mailinfo.c: move side-effects outside of assert

2016-12-19 Thread Kyle J. McKay
On Dec 19, 2016, at 15:26, Junio C Hamano wrote: > "Kyle J. McKay" writes: > >>> OK. So we do not expect it to fail, but we still do want the side >>> effect of that function (i.e. accmulation into the field). >>> >>> Somebody care to send

Re: [PATCH] mailinfo.c: move side-effects outside of assert

2016-12-20 Thread Kyle J. McKay
On Dec 20, 2016, at 08:45, Jeff King wrote: On Tue, Dec 20, 2016 at 03:12:35PM +0100, Johannes Schindelin wrote: On Dec 19, 2016, at 09:45, Johannes Schindelin wrote: ACK. I noticed this problem (and fixed it independently as a part of a huge patch series I did not get around to submit yet)

Re: [PATCH] mailinfo.c: move side-effects outside of assert

2016-12-21 Thread Kyle J. McKay
On Dec 21, 2016, at 07:55, Jeff King wrote: On Tue, Dec 20, 2016 at 09:54:15PM -0800, Kyle J. McKay wrote: I wasn't aware anybody actually built with NDEBUG at all. You'd have to explicitly ask for it via CFLAGS, so I assume most people don't. Not a good assumption. You kn

Re: [PATCH] mailinfo.c: move side-effects outside of assert

2016-12-21 Thread Kyle J. McKay
On Dec 21, 2016, at 18:21, Kyle J. McKay wrote: On Dec 21, 2016, at 07:55, Jeff King wrote: On Tue, Dec 20, 2016 at 09:54:15PM -0800, Kyle J. McKay wrote: I wasn't aware anybody actually built with NDEBUG at all. You'd have to explicitly ask for it via CFLAGS, so I assume m

[ANNOUNCE] git-log-compact v1.0

2016-10-19 Thread Kyle J. McKay
> NOTE: If you read the excellent Git Rev News [1], then you > already know all about git-log-compact :) The git-log-compact script provides a compact alternative to the `git log --oneline` output that includes dates, times and author and/or committer initials in a space efficient output format.

Git v2.11.0 breaks max depth nested alternates

2016-12-03 Thread Kyle J. McKay
aking the incoming push fail. To prevent the failure we simply increase the allowed alternates nesting depth by one whenever a quarantine operation is in effect. Signed-off-by: Kyle J. McKay --- Notes: Some alternates nesting depth background: If base/fork0/fork1/fork2/fork3/fork4/fo

Re: Git v2.11.0 breaks max depth nested alternates

2016-12-04 Thread Kyle J. McKay
On Dec 3, 2016, at 20:55, Jeff King wrote: So I do think this is worth dealing with, but I'm also curious why you're hitting the depth-5 limit. I'm guessing it has to do with hosting a hierarchy of related repos. But is your system then always in danger of busting the 5-limit if people create

[PATCH/RFC] git log --oneline alternative with dates, times and initials

2016-09-28 Thread Kyle J. McKay
hey are the first option argument(s) on the command line may be set by assigning them to the 'log-times.defaults' config value as space-separated options each including its leading '-' or '--'. Signed-off-by: Kyle J. McKay --- contrib/git-log-times/README

Re: [PATCH/RFC] git log --oneline alternative with dates, times and initials

2016-09-29 Thread Kyle J. McKay
On Sep 29, 2016, at 01:33, Jeff King wrote: On Wed, Sep 28, 2016 at 10:34:51PM -0700, Kyle J. McKay wrote: git log-times --graph --date-order --decorate --no-merges -n 5 v2.5.3 === 2015-09-17 === * ee6ad5f4 12:16 jch (tag: v2.5.3) Git 2.5.3 === 2015-09-09 === * b9d66899 14:22 js am

Re: [PATCH 10/10] get_short_sha1: list ambiguous objects on error

2016-09-29 Thread Kyle J. McKay
On Sep 26, 2016, at 05:00, Jeff King wrote: $ git rev-parse b2e1 error: short SHA1 b2e1 is ambiguous hint: The candidates are: hint: b2e1196 tag v2.8.0-rc1 hint: b2e11d1 tree hint: b2e1632 commit 2007-11-14 - Merge branch 'bs/maint-commit- options' hint: b2e1759 blob hint: b2

Re: [PATCH 10/10] get_short_sha1: list ambiguous objects on error

2016-09-29 Thread Kyle J. McKay
On Sep 26, 2016, at 09:36, Linus Torvalds wrote: On Mon, Sep 26, 2016 at 5:00 AM, Jeff King wrote: This patch teaches get_short_sha1() to list the sha1s of the objects it found, along with a few bits of information that may help the user decide which one they meant. This looks very good to

Re: Changing the default for "core.abbrev"?

2016-09-29 Thread Kyle J. McKay
On Sep 25, 2016, at 18:39, Linus Torvalds wrote: The kernel, these days, is at roughly 5 million objects, and while the seven hex digits are still often enough for uniqueness (and git will always add digits *until* it is unique), it's long been at the point where I tell people to do git conf

Re: [PATCH 10/10] get_short_sha1: list ambiguous objects on error

2016-09-29 Thread Kyle J. McKay
On Sep 29, 2016, at 06:24, Jeff King wrote: If you are doing "git show 235234" it should pick the tag (if it peels to a committish) because Git has already set a precedent of preferring tags over commits when it disambiguates ref names and otherwise pick the commit. I'm not convinced that

[PATCH] [BUG] test_expect_failure mailinfo -b fatals

2017-05-31 Thread Kyle J. McKay
far after the end of the buffer Mark those as 'test_expect_failure'. Signed-off-by: Kyle J. McKay --- Notes: checking known breakage: subj="$(echo "Subject: [other] [PATCH] message" | git mailinfo -b /dev/null /dev/null)" &&

Re: [PATCH] urlmatch: use hex2chr() in append_normalized_escapes()

2017-07-08 Thread Kyle J. McKay
mplies with the applicable standards. And in that sense it is not a simplification at all. But that's all really just nit picking since hex2chr is a simple inlined function that's relatively easy to find (and understand). Therefore I don't have any objections to this change. Acke

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.googl

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 microproject:

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

2014-04-11 Thread Kyle J. McKay
ivalent of -a is -R -P -p. 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 --- t/t7001-mv.sh | 4 ++-- 1 file c

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

2014-04-11 Thread Kyle J. McKay
a simple change that works everywhere (using [?] instead 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"

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

2014-04-11 Thread Kyle J. McKay
by not using "return" 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 --- git-rebase.sh | 11 +-- 1 file changed, 1 inser

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

2014-04-11 Thread Kyle J. McKay
r fashion by moving the top-level code that contains "return" statements into its own function and then calling that as the last line in the script. The changes introduced by this commit are best viewed with the --ignore-all-space (-w) diff option. Signed-off-by: Kyle J. McKay --- git

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

2014-04-11 Thread Kyle J. McKay
of \? to [?] in order to be compatible with the FreeBSD /bin/sh which allows t/t5560-http-backend-noserver.sh to pass on FreeBSD again. Signed-off-by: Kyle J. McKay --- t/t5560-http-backend-noserver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t5560-http-backend-noserve

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. >

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" 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 shou

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" 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

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" writes: > >> On Apr 11, 2014, at 10:30, Matthieu Moy wrote: >>> "Kyle J. McKay" writes: >>> >>>> There are already nested functions with file inclusion between bot

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

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 writes: "Kyle J. McKay" 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-around already t

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

2014-04-17 Thread Kyle J. McKay
s it clearer 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" Date: Fri, 11 Apr 2014 01:28:17 -0700 Subject: [PATCH] rebase: avoid non-function use of "return" on FreeBSD

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
is not a sufficient check, 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 Signed-off-by: Eric

Re: [ANNOUNCE] Git v2.0.0-rc0

2014-04-22 Thread Kyle J. McKay
use --prefix "" instead of --prefix="" Versions of Perl's Getopt::Long module before 2.37 do not contain this fix that first appeared in Getopt::Long version 2.37: * Bugfix: With gnu_compat, --foo= will no longer trigger "Option requires an argument" but return th

[PATCH] pack-bitmap: do not core dump

2014-04-22 Thread Kyle J. McKay
atforms. Fix this by dividing by the sizeof(eword_t) instead which will always be correct for all platforms. Signed-off-by: Kyle J. McKay --- 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 1006

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 ali

Re: [PATCH 2/9] strbuf: add strbuf_tolower function

2014-05-21 Thread Kyle J. McKay
On May 21, 2014, at 03:27, Jeff King wrote: This makes config's lowercase() function public. Note that we could continue to offer a pure-string lowercase, but there would be no callers (in most pure-string cases, we actually duplicate and lowercase the duplicate). Signed-off-by: Jeff King ---

Re: [PATCH 7/9] remote-curl: recognize text/plain with a charset parameter

2014-05-21 Thread Kyle J. McKay
On May 21, 2014, at 03:33, Jeff King wrote: Commit 426e70d (remote-curl: show server content on http errors, 2013-04-05) tried to recognize text/plain content types, but fails to do so if they have any parameters. This patches makes our parsing more liberal, though we still do not do anything u

Re: [PATCH 9/9] remote-curl: reencode http error messages

2014-05-21 Thread Kyle J. McKay
On May 21, 2014, at 03:33, Jeff King wrote: As of the last commit, we now recognize an error message with a content-type "text/plain; charset=utf-16" as text, but we ignore the charset parameter entirely. Let's encode it to log_output_encoding, which is presumably something the user's terminal c

Re: [PATCH 7/9] remote-curl: recognize text/plain with a charset parameter

2014-05-22 Thread Kyle J. McKay
On May 21, 2014, at 23:05, Jeff King wrote: On Wed, May 21, 2014 at 05:07:38PM -0700, Kyle J. McKay wrote: + p = skip_prefix(type->buf, "text/plain"); + if (!p || (*p && *p != ';')) + return 0; + + return 1; +} + I think th

Re: [PATCH 2/9] strbuf: add strbuf_tolower function

2014-05-22 Thread Kyle J. McKay
On May 22, 2014, at 11:41, Jeff King wrote: On Thu, May 22, 2014 at 11:36:37AM -0700, Junio C Hamano wrote: Yes, and that would be fine with me (I actually wrote strbuf_tolower for my own use, and _then_ realized that we already had such a thing that could be replaced). Do we forbid that

Re: [PATCH v2 4/8] http: extract type/subtype portion of content-type

2014-05-22 Thread Kyle J. McKay
On May 22, 2014, at 02:29, Jeff King wrote: When we get a content-type from curl, we get the whole header line, including any parameters, and without any normalization (like downcasing or whitespace) applied. If we later try to match it with strcmp() or even strcasecmp(), we may get false negat

Re: [PATCH 2/2] strbuf: add strbuf_tolower function

2014-05-22 Thread Kyle J. McKay
2014, at 15:52, Kyle J. McKay wrote: The only reason I brought up the code difference in the first place was that the comment was "This makes config's lowercase() function public" which made me expect to see basically the equivalent of replacing a "static" with an &qu

Re: [PATCH v2 4/8] http: extract type/subtype portion of content-type

2014-05-23 Thread Kyle J. McKay
On May 23, 2014, at 13:12, Jeff King wrote: On Thu, May 22, 2014 at 03:52:21PM -0700, Kyle J. McKay wrote: +static void extract_content_type(struct strbuf *raw, struct strbuf *type) +{ + const char *p; + + strbuf_reset(type); + strbuf_grow(type, raw->len); + for

Re: [PATCH 2/9] strbuf: add strbuf_tolower function

2014-05-23 Thread Kyle J. McKay
On May 23, 2014, at 13:05, Jeff King wrote: On Thu, May 22, 2014 at 03:52:08PM -0700, Kyle J. McKay wrote: Christian brought this up elsewhere, and I agree it's probably better to work over the whole buffer, NULs included. I'm happy to re-roll (or you can just pick up the vers

[PATCH] hooks/post-receive-email: do not truncate messages at a '.' line

2014-07-17 Thread Kyle J. McKay
l to avoid prematurely terminating the input message at the occurence of a dot ('.') on a line by itself. Signed-off-by: Kyle J. McKay --- BTW, what is the status of post-receive-email? I find it quite useful for a minimal server that only needs Git binaries and a POSIX shell. The onl

git_inetd_server: run git-http-backend using inetd

2014-07-17 Thread Kyle J. McKay
=== What is it? === I have created a script (POSIX sh compatible) that allows running git- http-backend via inetd or similar service (it makes it like git-http- backend had a --inet option just like git-daemon does). This allows the Git smart HTTP protocol to be served without

Re: git_inetd_server: run git-http-backend using inetd

2014-07-17 Thread Kyle J. McKay
On Jul 17, 2014, at 15:10, Jonathan Nieder wrote: Hi, Kyle J. McKay wrote: When I then try to fetch using a "git://host/..." URL where "host" is an mDNS host name, the 0010 patch causes git to attempt to lookup a DNS SRV record on the non-mDNS regular DNS service (a viol

Re: git_inetd_server: run git-http-backend using inetd

2014-07-17 Thread Kyle J. McKay
On Jul 17, 2014, at 19:22, Jonathan Nieder wrote: Thanks for these details. I'll file a bug and mull it over some more. RFC 6762 makes it clear that what the package is currently doing is wrong. Given that Debian's libc knows nothing about mdns on its own, I think I'll need to parse resolv.co

Re: git_inetd_server: run git-http-backend using inetd

2014-07-18 Thread Kyle J. McKay
On Jul 18, 2014, at 10:16, Jonathan Nieder wrote: Kyle J. McKay wrote: You might also want to take a look at [1] which suggests that when doing SRV lookups for URLs they should be done regardless of whether or not a port number is present (which then eliminates the RFC 3986 issue the current

Re: git_inetd_server: run git-http-backend using inetd

2014-07-18 Thread Kyle J. McKay
On Jul 18, 2014, at 17:19, Jonathan Nieder wrote: Kyle J. McKay wrote: On Jul 18, 2014, at 10:16, Jonathan Nieder wrote: "Git URLs" as described e.g. in git-clone(1) weren't intended to be actual URIs. According to RFC 3968 section 1.1.3: "A URI can be further classi

Re: Git on Mac OS X 10.4.10

2014-08-15 Thread Kyle J. McKay
and earlier so only 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.

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]\."; lea

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]\."; l

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=" in its initial capability advertisement, and this will be given on the PUSH_CERT_NONCE environment to the pre/post-receive hooks, to allow the "nonce " header in the signed certificate to be che

Re: Git merge: conflict is expected, but not detected

2013-11-29 Thread Kyle J. McKay
On Nov 29, 2013, at 06:26, Evgeniy Ivanov wrote: Let's say I have two identical branches: master and topic. In master I remove some code, i.e. function bar(). In topic I do the same (commit) and after some time I realize I need bar() and revert previous commit with removal. So I end with master w

[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 process

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 wrote: "Jason St. John" writes: What AsciiDoc formatter (and version) do you use? $ asciidoc --version asciidoc 8.6.8 Checking with www.methods.co.nz/asciidoc, I am behind by about 2 m

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 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 forgot to report it. :/

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 d

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 proba

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 even

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 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 if it did not al

Re: [PATCH] notes: accept any ref for merge

2014-11-22 Thread Kyle J. McKay
succeeds. This has a follow-on effect which makes the next two tests fail as well. The refs/heads/master ref could just be replaced with another ref name that does not exist such as refs/heads/xmaster, but there are already several tests using non-existant refs so instead just remove the refs/head

Re: OpenSSL deprecation warnings under Xcode

2014-12-01 Thread Kyle J. McKay
On Nov 30, 2014, at 21:31, Torsten Bögershausen wrote: On 12/01/2014 04:02 AM, Michael Blume wrote: I have no idea whether this should concern anyone, but my mac build of git shows CC imap-send.o imap-send.c:183:36: warning: 'ERR_error_string' is deprecated: first deprecated in OS X 10.7

Re: [RFC][PATCH] send-email: add --[no-]xmailer option

2014-12-02 Thread Kyle J. McKay
On Dec 2, 2014, at 18:34, Eric Wong wrote: Luis Henriques wrote: On Mon, Mar 24, 2014 at 09:38:27PM +, Luis Henriques wrote: Add --[no-]xmailer that allows a user to disable adding the 'X- Mailer:' header to the email being sent. Ping It's been a while since I sent this patch. Is th

[PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Kyle J. McKay
laced with another ref name that does not exist such as refs/heads/xmaster, but there are already several tests using non-existant refs so instead just remove the refs/heads/master line. Suggested-by: Johan Herland Signed-off-by: Kyle J. McKay --- t/t3308-notes-merge.sh | 1 - 1 file changed,

[PATCH v2 1/2] notes: accept any ref

2015-01-06 Thread Kyle J. McKay
From: Scott Chacon Currently if you try to merge notes, the notes code ensures that the reference is under the 'refs/notes' namespace. In order to do any sort of collaborative workflow, this doesn't work well as you can't easily have local notes refs seperate from remote notes refs. This patch c

[PATCH v2 0/2] Accept any notes ref

2015-01-06 Thread Kyle J. McKay
efs outside of refs/notes/ with the notes machinery I conclude by including Peff's final reply to the original thread which I think contains the most compelling aregument for inclusion: On Dec 4, 2014, at 02:26, Jeff King wrote: > On Sat, Nov 22, 2014 at 10:04:57AM -0800, Kyle J. McKay wro

[PATCH 1/2] log.c: fix translation markings

2015-01-06 Thread Kyle J. McKay
plied by the parse_options API. Signed-off-by: Kyle J. McKay --- builtin/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index f2a9f015..923ffe72 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -38,8 +38,8 @@ static const char *fmt_patch_sub

[PATCH 2/2] gettext.h: add parentheses around N_ expansion

2015-01-06 Thread Kyle J. McKay
two adjacent strings that are then combined by the preprocessor, two adjacent strings surrounded by parentheses result instead which causes a compile error so the mistake can be quickly found and corrected. Signed-off-by: Kyle J. McKay --- This patch is optional, but prevents the problem fixed by 1

[PATCH] git-gui.sh: support Tcl 8.4

2015-01-06 Thread Kyle J. McKay
really want is just a basic version compare, so use vcompare instead to restore compatibility with Tcl 8.4. Signed-off-by: Kyle J. McKay --- git-gui/git-gui.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index b186329d..a1a23b56

[PATCH] imap-send.c: support GIT_CURL_VERBOSE

2015-01-06 Thread Kyle J. McKay
value at all. For consistency, enable CURLOPT_VERBOSE when GIT_CURL_VERBOSE is set by using the exact same test that http.c does. Signed-off-by: Kyle J. McKay --- *** PATCH IS AGAINST NEXT *** In particular, this patch requires br/imap-send-via-libcurl imap-send.c | 2 +- 1 file chang

[PATCH] imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY

2015-01-06 Thread Kyle J. McKay
behavior of the non-cURL code path. Signed-off-by: Kyle J. McKay --- *** PATCH IS AGAINST NEXT *** In particular, this patch requires br/imap-send-via-libcurl imap-send.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imap-send.c b/imap-send.c index 4dfe4c25..5251b750

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Kyle J. McKay
On Jan 6, 2015, at 02:20, Junio C Hamano wrote: "Kyle J. McKay" writes: Now, however, since refs/heads/master exists and the new, more relaxed notes refs rules leave it unchanged, the merge succeeds. ... ... diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh inde

Re: [PATCH 2/2] gettext.h: add parentheses around N_ expansion

2015-01-06 Thread Kyle J. McKay
On Jan 6, 2015, at 05:24, Ramsay Jones wrote: On 06/01/15 10:34, Kyle J. McKay wrote: Avoid this by adding parentheses around the expansion of the N_ macro so that instead of ending up with two adjacent strings that are then combined by the preprocessor, two adjacent strings surrounded by

[ANNOUNCE] Git Universal OS X Installer

2015-01-06 Thread Kyle J. McKay
What is it? --- A universal installer for Git on OS X supporting Mac OS X 10.4.8 or later including PowerPC/Intel and both 32 and 64 bit. Isn't there one already? Yes, there is another OS X installer for Git available. That one, however, did not meet my n

Re: [PATCH] git-gui.sh: support Tcl 8.4

2015-01-06 Thread Kyle J. McKay
On Jan 6, 2015, at 11:42, Junio C Hamano wrote: "Kyle J. McKay" writes: Tcl 8.5 introduced an extended vsatisfies syntax that is not supported by Tcl 8.4. Interesting. We discussed this exact thing just before 2.0 in http://thread.gmane.org/gmane.comp.version-control.git/24

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Kyle J. McKay
On Jan 6, 2015, at 10:25, Junio C Hamano wrote: "Kyle J. McKay" writes: So despite the name of the test, the actual tree contents do not seem to be examined. Yes, but the thing is, thanks to refs/notes restriction, there is no need to do such examination [*1*]. Note that it is a

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Kyle J. McKay
On Jan 6, 2015, at 15:54, Junio C Hamano wrote: "Kyle J. McKay" writes: A whitelist solves issue (1) but is no help for issue (2) unless some additional additional part of the refs namespace were to be also whitelisted. Perhaps something like refs/x-/... in the same vein as t

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Kyle J. McKay
On Jan 6, 2015, at 16:28, Johan Herland wrote: On Wed, Jan 7, 2015 at 12:29 AM, Kyle J. McKay wrote: Perhaps that is the crux of the issue. There is no git notes- plumbing command where the git notes command continues to apply restrictions but the vaporware notes-plumbing command allows

[PATCH v2] gettext.h: add parentheses around N_ expansion if supported

2015-01-08 Thread Kyle J. McKay
makes the header less elegant, the benefit of avoiding propagation of a translation-marking error to all the translation teams thus creating extra work for them when the error is eventually detected and fixed would seem to outweigh the minor inelegance the #ifdef introduces. Signed-off-by: Kyle J

Re: [PATCH v2] gettext.h: add parentheses around N_ expansion if supported

2015-01-08 Thread Kyle J. McKay
On Jan 8, 2015, at 11:10, Junio C Hamano wrote: "Kyle J. McKay" writes: For now only __GNUC__ is tested which covers both gcc and clang which should result in early detection of any adjacent N_ macros. I didn't check the list of -W options, but if there were a way to tell

[PATCH v3] gettext.h: add parentheses around N_ expansion if supported

2015-01-11 Thread Kyle J. McKay
error is eventually detected and fixed would seem to outweigh the minor inelegance the additional configuration tests introduce. Helped-by: Junio C Hamano Signed-off-by: Kyle J. McKay --- The "yes", "no", "auto" settings for the new Makefile configuration variable &qu

Re: [PATCH] http-push: trim trailing newline from remote symref

2015-01-13 Thread Kyle J. McKay
On Jan 12, 2015, at 18:28, Jeff King wrote: When we fetch a symbolic ref file from the remote, we get the whole string "ref: refs/heads/master\n", recognize it by skipping past the "ref: ", and store the rest. We should chomp the trailing newline. [..] This is a regression in v2.1.0. It was cau

Re: [PATCH] http-push: trim trailing newline from remote symref

2015-01-13 Thread Kyle J. McKay
On Jan 13, 2015, at 11:58, Jeff King wrote: On Tue, Jan 13, 2015 at 08:26:31AM -0800, Kyle J. McKay wrote: I have this line in my 2.1.4 test output log: t5540-http-push-webdav.sh .. ok [...] I do not build with NO_EXPAT. This is running the tests on OS X without

Re: t5539 broken under Mac OS X

2015-01-14 Thread Kyle J. McKay
On Jan 14, 2015, at 13:17, Jeff King wrote: On Wed, Jan 14, 2015 at 08:50:47PM +0100, Torsten Bögershausen wrote: But, why does e.g. t0004 behave more gracefully (and skips) and t5539 just dies ? ./t0004-unwritable.sh ok 1 - setup ok 2 # skip write-tree should notice unwritable repository (

Re: Segmentation fault in git apply

2015-01-15 Thread Kyle J. McKay
On Jan 14, 2015, at 11:09, Michael Blume wrote: On Wed, Jan 14, 2015 at 10:58 AM, Michael Blume wrote: On Wed, Jan 14, 2015 at 10:48 AM, Michael Blume wrote: On Wed, Jan 14, 2015 at 10:44 AM, Michael Blume > wrote: On Wed, Jan 14, 2015 at 10:40 AM, Michael Blume > wrote: On Wed, Jan 14, 2015

Re: Segmentation fault in git apply

2015-01-15 Thread Kyle J. McKay
On Jan 15, 2015, at 00:26, Kyle J. McKay wrote: On Jan 14, 2015, at 11:09, Michael Blume wrote: On Wed, Jan 14, 2015 at 10:58 AM, Michael Blume wrote: On Wed, Jan 14, 2015 at 10:48 AM, Michael Blume > wrote: On Wed, Jan 14, 2015 at 10:44 AM, Michael Blume > wrote: On Wed, Jan 14, 2015

Re: [PATCH] t/lib-httpd: switch SANITY check for NOT_ROOT

2015-01-15 Thread Kyle J. McKay
On Jan 15, 2015, at 17:32, Jeff King wrote: On Thu, Jan 15, 2015 at 04:04:24PM -0800, Junio C Hamano wrote: I wondered what 'perl -e 'print $>' would say in mingw, and if that is portable enough, though. Good thinking. I guess the best way to find out is to convince somebody from msysgit

Re: [PATCH] t/lib-httpd: switch SANITY check for NOT_ROOT

2015-01-16 Thread Kyle J. McKay
On Jan 15, 2015, at 19:34, Jeff King wrote: On Thu, Jan 15, 2015 at 07:27:34PM -0800, Kyle J. McKay wrote: "id -u" works for me in MSYS and cygwin (each appears to have it's own id.exe). That's comforting. MSYS was the one I was most worried about. What UID do they r

Re: [PATCH] t/lib-httpd: switch SANITY check for NOT_ROOT

2015-01-16 Thread Kyle J. McKay
On Jan 16, 2015, at 01:16, Jeff King wrote: Subject: [PATCH] t/lib-httpd: switch SANITY check for NOT_ROOT [...] We implement NOT_ROOT by checking `id -u`, which is in POSIX and seems to be available even on MSYS. Note that we cannot just call this "ROOT" and ask for "!ROOT". The possible out

[PATCH] test: add git apply whitespace expansion tests

2015-01-18 Thread Kyle J. McKay
the correct final length in such a case. These tests all stress the whitespace-expansion-during-apply condition and can result in core dump failures when the final length is not computed correctly. Signed-off-by: Kyle J. McKay --- * Here's some tests. With "apply: make update_pre_p

Re: [PATCH] test: add git apply whitespace expansion tests

2015-01-18 Thread Kyle J. McKay
On Jan 18, 2015, at 14:11, Junio C Hamano wrote: On Sun, Jan 18, 2015 at 2:49 AM, Kyle J. McKay wrote: * Here's some tests. With "apply: make update_pre_post_images() sanity check the given postlen" but not "apply: count the size of postimage correctly" test 1/4

Re: [PATCH] test: add git apply whitespace expansion tests

2015-01-21 Thread Kyle J. McKay
On Jan 21, 2015, at 14:33, Junio C Hamano wrote: "Kyle J. McKay" writes: So since I've not been able to get test 2 or 3 to core dump (even before 250b3c6c) I tend to believe you are correct in that the code thinks (incorrectly) that the result should fit within the buffer.

Re: [PATCH] test: add git apply whitespace expansion tests

2015-01-22 Thread Kyle J. McKay
On Jan 22, 2015, at 11:23, Junio C Hamano wrote: "Kyle J. McKay" writes: On Jan 21, 2015, at 14:33, Junio C Hamano wrote: "Kyle J. McKay" writes: So since I've not been able to get test 2 or 3 to core dump (even before 250b3c6c) I tend to believe you are correc

  1   2   3   >