2.9.2 test failures on macOS

2016-08-03 Thread Jeremy Huddleston Sequoia
I have two test failures to report in git 2.9.2 on macOS: t3210-pack-refs.sh has not changed between 2.8.4 and 2.9.2. This test passed fine with 2.8.4, but it now fails with 2.9.2 at: not ok 26 - retry acquiring packed-refs.lock # # LOCK=.git/packed-refs.lock && #

Re: 2.9.2 test failures on macOS

2016-08-03 Thread Jeremy Huddleston Sequoia
> On Aug 3, 2016, at 07:35, Johannes Schindelin > wrote: > > Hi Jeremy, > > On Wed, 3 Aug 2016, Jeremy Huddleston Sequoia wrote: > >> I have two test failures to report in git 2.9.2 on macOS: >> >> >> t3210-pack-refs.sh has not changed betwee

git 2.10.1 test regression in t4014-format-patch.sh

2016-10-09 Thread Jeremy Huddleston Sequoia
Hey Josh, Hope you're doing well. I wanted to let you know that this patch of yours, which landed in git 2.10.1, introduced some test failures, seen on macOS. Let me know if you need any additional information to track these down. Thanks, Jeremy not ok 65 - format-patch default signature #

git 2.10.1 test regression in t3700-add.sh

2016-10-09 Thread Jeremy Huddleston Sequoia
Hi Thomas, I wanted to let you know that this patch of yours, which landed in git 2.10.1, introduced some test failures, seen on macOS. Let me know if you need any additional information to track these down. Thanks, Jeremy not ok 40 - git add --chmod=[+-]x changes index with already added file

Re: git 2.10.1 test regression in t3700-add.sh

2016-10-09 Thread Jeremy Huddleston Sequoia
> On Oct 9, 2016, at 17:15, Jeremy Huddleston Sequoia > wrote: > > Hi Thomas, > > I wanted to let you know that this patch of yours, which landed in git > 2.10.1, introduced some test failures, seen on macOS. > > Let me know if you need any additional info

Re: git 2.10.1 test regression in t4014-format-patch.sh

2016-10-09 Thread Jeremy Huddleston Sequoia
> On Oct 9, 2016, at 17:18, Josh Triplett wrote: > > On October 9, 2016 5:15:22 PM PDT, Jeremy Huddleston Sequoia > wrote: >> Hey Josh, >> >> Hope you're doing well. >> >> I wanted to let you know that this patch of yours, which landed in git

[PATCH] t4014-format-patch: Adjust git_version regex to better handle distro changes to DEF_VER

2016-10-09 Thread Jeremy Huddleston Sequoia
Regressed-in: 480871e09ed2e5275b4ba16b278681e5a8c122ae Signed-off-by: Jeremy Huddleston Sequoia CC: Josh Triplett CC: Junio C Hamano --- t/t4014-format-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 8d90a6e

Re: git 2.10.1 test regression in t3700-add.sh

2016-10-09 Thread Jeremy Huddleston Sequoia
The issue is that the whitespace before the filename in $(git ls-files -s "$2") is a tab, and test_mode_in_index only looks for a space. >< > On Oct 9, 2016, at 19:51, Jeremy Huddleston Sequoia > wrote: > > >> On Oct 9, 2016, at 17:15, Jeremy Huddleston Se

Re: git 2.10.1 test regression in t3700-add.sh

2016-10-09 Thread Jeremy Huddleston Sequoia
> On Oct 9, 2016, at 20:22, Jeremy Huddleston Sequoia > wrote: > > The issue is that the whitespace before the filename in $(git ls-files -s > "$2") is a tab, and test_mode_in_index only looks for a space. Actually, looks like that as just a rabbit hole. The real i

[PATCH] t3700-add.sh: Avoid filename collission between tests which could lead to test failure

2016-10-09 Thread Jeremy Huddleston Sequoia
Regressed-in: 610d55af0f082f6b866dc858e144c03d8ed4424c Signed-off-by: Jeremy Huddleston Sequoia CC: Thomas Gummerer CC: Junio C Hamano --- t/t3700-add.sh | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 924a266..3ccb19b 100755

Re: [PATCH] t4014-format-patch: Adjust git_version regex to better handle distro changes to DEF_VER

2016-10-09 Thread Jeremy Huddleston Sequoia
> On Oct 9, 2016, at 20:04, Josh Triplett wrote: > > On October 9, 2016 7:53:23 PM PDT, Jeremy Huddleston Sequoia > wrote: >> Regressed-in: 480871e09ed2e5275b4ba16b278681e5a8c122ae >> Signed-off-by: Jeremy Huddleston Sequoia >> CC: Josh Triplett >> CC: J

Re: [PATCH] t4014-format-patch: Adjust git_version regex to better handle distro changes to DEF_VER

2016-10-10 Thread Jeremy Huddleston Sequoia
> On Oct 10, 2016, at 06:10, Jeff King wrote: > > On Sun, Oct 09, 2016 at 07:53:23PM -0700, Jeremy Huddleston Sequoia wrote: > >> Subject: Re: [PATCH] t4014-format-patch: Adjust git_version regex to better >> handle distro changes to DEF

Re: [PATCH] t4014-format-patch: Adjust git_version regex to better handle distro changes to DEF_VER

2016-10-10 Thread Jeremy Huddleston Sequoia
> On Oct 10, 2016, at 09:42, Junio C Hamano wrote: > > Jeremy Huddleston Sequoia writes: > >> Regressed-in: 480871e09ed2e5275b4ba16b278681e5a8c122ae > > Please be considerate to future readers of "git log" to help them > avoid mistakes earlier commits mad

Re: [PATCH] t3700-add.sh: Avoid filename collission between tests which could lead to test failure

2016-10-10 Thread Jeremy Huddleston Sequoia
> On Oct 10, 2016, at 09:44, Junio C Hamano wrote: > > Jeremy Huddleston Sequoia writes: > >> Regressed-in: 610d55af0f082f6b866dc858e144c03d8ed4424c >> Signed-off-by: Jeremy Huddleston Sequoia >> CC: Thomas Gummerer >> CC: Junio C Hamano > > T

Re: git 2.10.1 test regression in t3700-add.sh

2016-10-11 Thread Jeremy Huddleston Sequoia
> On Oct 10, 2016, at 10:41, Junio C Hamano wrote: > > Jeremy Huddleston Sequoia writes: > >> Actually, looks like that as just a rabbit hole. The real issue >> looks to be because an earlier test drops down xfoo3 as a symlink, >> which causes this test to fa

[PATCH (Apple Git) 05/13] t5701: git --version can have SP in it

2019-01-29 Thread Jeremy Huddleston Sequoia
Signed-off-by: Jeremy Huddleston Sequoia --- t/t5701-git-serve.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh index ae79c6bbc0..7bc25700fa 100755 --- a/t/t5701-git-serve.sh +++ b/t/t5701-git-serve.sh @@ -7,7 +7,7

[PATCH (Apple Git) 08/13] git mergetool/difftool doesn't list 'opendiff' as an available tool on 10.8

2019-01-29 Thread Jeremy Huddleston Sequoia
See Signed-off-by: Jeremy Huddleston Sequoia --- git-mergetool--lib.sh | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 83bf52494c..f85be7406f 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -273,9

[PATCH (Apple Git) 00/13] Differences between git-2.20.1 and Apple Git-116

2019-01-29 Thread Jeremy Huddleston Sequoia
Xcode 10.2 Beta 1 contains Apple Git-116. A couple months ago, Peff encouraged me to re-send our changes in a patch series to the mailing list, so here they are! As reference, these (and past patch series for Apple Git) are availale at: https://github.com/jeremyhu/git Some of these patches a

[PATCH (Apple Git) 06/13] Set Apple Git version during build

2019-01-29 Thread Jeremy Huddleston Sequoia
Signed-off-by: Jeremy Huddleston Sequoia --- GIT-VERSION-GEN | 4 1 file changed, 4 insertions(+) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index d1a2814ec7..6fb90854b9 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -3,6 +3,10 @@ GVF=GIT-VERSION-FILE DEF_VER=v2.20.1 +if

[PATCH (Apple Git) 09/13] Use symbolic links rather than hard links for files in libexec

2019-01-29 Thread Jeremy Huddleston Sequoia
See Signed-off-by: Jeremy Huddleston Sequoia --- Makefile | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1a44c811aa..60711d6abe 100644 --- a/Makefile +++ b/Makefile @@ -2065,10 +2065,7 @@ version.sp version.s version.o: EXTRA_CPPFLAGS

[PATCH (Apple Git) 01/13] .gitignore: Remove *.s as it matches *.S on case insensitive filesystem

2019-01-29 Thread Jeremy Huddleston Sequoia
This was causing problems with ppc/sha1ppc.S Signed-off-by: Jeremy Huddleston Sequoia --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0d77ea5894..a5db584576 100644 --- a/.gitignore +++ b/.gitignore @@ -195,7 +195,7 @@ *.deb

[PATCH (Apple Git) 04/13] t4014: git --version can have SP in it

2019-01-29 Thread Jeremy Huddleston Sequoia
d Git with " (Apple Git-xx)" appended to its version number. Instead, come up with the version string by stripping the "git version " from the beginning. Regressed-in: 480871e09ed2e5275b4ba16b278681e5a8c122ae Signed-off-by: Jeremy Huddleston Sequoia Reviewed-by: Josh Trip

[PATCH (Apple Git) 10/13] Support for Xcode.app co-exestince and relocation

2019-01-29 Thread Jeremy Huddleston Sequoia
perl module (which relocates with it) and handle relocation of python scripts. Signed-off-by: Jeremy Huddleston Sequoia --- Makefile | 3 +++ .../runtime_prefix.template.pl| 25 +++ 2 files changed, 28 insertions(+) diff

[PATCH (Apple Git) 07/13] HTML documentation is not provided with Apple's git. Make the error message more on point.

2019-01-29 Thread Jeremy Huddleston Sequoia
Signed-off-by: Jeremy Huddleston Sequoia --- builtin/help.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/help.c b/builtin/help.c index 7739a5c155..e001b6157c 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -383,7 +383,7 @@ static void get_html_page_path(struct

[PATCH (Apple Git) 03/13] t0500: New regression test for git add of a path that contains a .git directory

2019-01-29 Thread Jeremy Huddleston Sequoia
Signed-off-by: Jeremy Huddleston Sequoia --- t/t0500-apple.sh | 40 1 file changed, 40 insertions(+) create mode 100755 t/t0500-apple.sh diff --git a/t/t0500-apple.sh b/t/t0500-apple.sh new file mode 100755 index 00..d5f79237a8 --- /dev/null

[PATCH (Apple Git) 12/13] Enable support for Xcode.app-bundled gitconfig

2019-01-29 Thread Jeremy Huddleston Sequoia
Useful for setting up osxkeychain in Xcode.app's gitconfig Signed-off-by: Jeremy Huddleston Sequoia --- config.c | 13 + config.h | 2 ++ 2 files changed, 15 insertions(+) diff --git a/config.c b/config.c index ff521eb27a..656bfef8ab 100644 --- a/config.c +++ b/config.c @@ -1

[PATCH (Apple Git) 13/13] Enable support for Xcode.app-bundled gitattributes

2019-01-29 Thread Jeremy Huddleston Sequoia
Signed-off-by: Jeremy Huddleston Sequoia --- attr.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/attr.c b/attr.c index eaece6658d..1b87905d4a 100644 --- a/attr.c +++ b/attr.c @@ -823,6 +823,14 @@ static const char *git_etc_gitattributes(void) return system_wide

[PATCH (Apple Git) 02/13] test-lib: Export PERL5LIB for testing git-svn

2019-01-29 Thread Jeremy Huddleston Sequoia
Signed-off-by: Jeremy Huddleston Sequoia --- t/test-lib.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/test-lib.sh b/t/test-lib.sh index 0f1faa24b2..4060a53f56 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1017,6 +1017,9 @@ fi GITPERLLIB="$GIT_BUILD_DIR"/perl

[PATCH (Apple Git) 11/13] Fix problem found from running the test suite.

2019-01-29 Thread Jeremy Huddleston Sequoia
From: Matt Wright Signed-off-by: Matt Wright --- git-svn.perl | 30 ++ 1 file changed, 30 insertions(+) diff --git a/git-svn.perl b/git-svn.perl index 050f2a36f4..d29730be3b 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1815,6 +1815,36 @@ sub complete_url_ls_init

Re: [PATCH (Apple Git) 02/13] test-lib: Export PERL5LIB for testing git-svn

2019-01-29 Thread Jeremy Huddleston Sequoia
> On Jan 29, 2019, at 2:47 PM, Junio C Hamano wrote: > > Jeremy Huddleston Sequoia writes: > >> Signed-off-by: Jeremy Huddleston Sequoia >> --- >> t/test-lib.sh | 3 +++ >> 1 file changed, 3 insertions(+) > > This obviously won't be ac

Re: [PATCH (Apple Git) 12/13] Enable support for Xcode.app-bundled gitconfig

2019-01-29 Thread Jeremy Huddleston Sequoia
> On Jan 29, 2019, at 3:10 PM, Junio C Hamano wrote: > > Jeremy Huddleston Sequoia writes: > >> Useful for setting up osxkeychain in Xcode.app's gitconfig >> >> Signed-off-by: Jeremy Huddleston Sequoia >> --- > > A concern shared with 13/13

Re: [PATCH (Apple Git) 01/13] .gitignore: Remove *.s as it matches *.S on case insensitive filesystem

2019-01-30 Thread Jeremy Huddleston Sequoia
> On Jan 30, 2019, at 03:33, Eric Sunshine wrote: > > On Tue, Jan 29, 2019 at 3:11 PM Jeremy Huddleston Sequoia > wrote: >> This was causing problems with ppc/sha1ppc.S > > What problems, exactly? The file is ignored, but it shouldn't be. > >> Si

Re: [PATCH (Apple Git) 09/13] Use symbolic links rather than hard links for files in libexec

2019-01-30 Thread Jeremy Huddleston Sequoia
> On Jan 30, 2019, at 01:50, brian m. carlson > wrote: > > On Tue, Jan 29, 2019 at 11:38:15AM -0800, Jeremy Huddleston Sequoia wrote: >> See > > It's my understanding that Radars aren't public. Could you summarize the > reasons behind this change in t

Re: [PATCH (Apple Git) 03/13] t0500: New regression test for git add of a path that contains a .git directory

2019-01-30 Thread Jeremy Huddleston Sequoia
> On Jan 30, 2019, at 05:12, Johannes Schindelin > wrote: > > Hi Jeremy, > > On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote: > >> Signed-off-by: Jeremy Huddleston Sequoia > > As Eric pointed out, commits with such a vanishing commit message

Re: [PATCH (Apple Git) 01/13] .gitignore: Remove *.s as it matches *.S on case insensitive filesystem

2019-01-30 Thread Jeremy Huddleston Sequoia
> On Jan 30, 2019, at 04:42, Johannes Schindelin > wrote: > > Hi Jeremy, > > On Wed, 30 Jan 2019, Jeremy Huddleston Sequoia wrote: > >>> On Jan 30, 2019, at 03:33, Eric Sunshine wrote: >>> >>> On Tue, Jan 29, 2019 at 3:11 PM Jeremy Hudd

Re: [PATCH (Apple Git) 05/13] t5701: git --version can have SP in it

2019-01-30 Thread Jeremy Huddleston Sequoia
> On Jan 30, 2019, at 05:36, Johannes Schindelin > wrote: > > Hi Jeremy, > > On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote: > >> Signed-off-by: Jeremy Huddleston Sequoia > > > That commit message is again very short. Only because I remember t

Re: [PATCH (Apple Git) 06/13] Set Apple Git version during build

2019-01-30 Thread Jeremy Huddleston Sequoia
> On Jan 30, 2019, at 05:43, Johannes Schindelin > wrote: > > Hi Jeremy, > > On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote: > >> Signed-off-by: Jeremy Huddleston Sequoia >> --- >> GIT-VERSION-GEN | 4 >> 1 file changed, 4 insertions

Re: [PATCH (Apple Git) 09/13] Use symbolic links rather than hard links for files in libexec

2019-01-30 Thread Jeremy Huddleston Sequoia
> On Jan 30, 2019, at 11:15, Johannes Schindelin > wrote: > > Hi Jeremy, > > On Wed, 30 Jan 2019, Jeremy Huddleston Sequoia wrote: > >>> On Jan 30, 2019, at 01:50, brian m. carlson >>> wrote: >>> >>> On Tue, Jan 29, 2019 at 11

Re: [PATCH (Apple Git) 10/13] Support for Xcode.app co-exestince and relocation

2019-01-30 Thread Jeremy Huddleston Sequoia
> On Jan 30, 2019, at 11:26, Johannes Schindelin > wrote: > > Hi Jeremy, > > On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote: > >> This patch has been trimmed down significantly from its original version >> when rebasing on top of git 2.18 beca

Re: [PATCH (Apple Git) 12/13] Enable support for Xcode.app-bundled gitconfig

2019-01-30 Thread Jeremy Huddleston Sequoia
> On Jan 30, 2019, at 11:32, Johannes Schindelin > wrote: > > Hi Jeremy, > > On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote: > >>> On Jan 29, 2019, at 3:10 PM, Junio C Hamano wrote: >>> >>> Jeremy Huddleston Sequoia writes

Re: [PATCH (Apple Git) 12/13] Enable support for Xcode.app-bundled gitconfig

2019-01-30 Thread Jeremy Huddleston Sequoia
> On Jan 30, 2019, at 13:09, Jeremy Huddleston Sequoia > wrote: > > > >> On Jan 30, 2019, at 11:32, Johannes Schindelin >> wrote: >> >> Hi Jeremy, >> >> On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote: >> >>>>

Re: [PATCH (Apple Git) 12/13] Enable support for Xcode.app-bundled gitconfig

2019-01-31 Thread Jeremy Huddleston Sequoia
> On Jan 30, 2019, at 16:01, Jonathan Nieder wrote: > > Hi, > > Jeremy Huddleston Sequoia wrote: > >> Unfortunately, I was quick to celebrate. This picks up the bundled >> file instead of a system-wide file. I'd love it if we could still >> honor

Re: Subscribing Apple people to git-secur...@googlegroups.com

2018-07-09 Thread Jeremy Huddleston Sequoia
+Akila Hi, Replies inline. > On Jul 2, 2018, at 12:50, Jeff King wrote: > > On Mon, Jul 02, 2018 at 09:29:41PM +0200, Christian Couder wrote: > >> When people complained a month ago about the MacOS package on >> https://git-scm.com/ not being up-to-date after the Git security >> release, I go

Re: Subscribing Apple people to git-secur...@googlegroups.com

2018-07-10 Thread Jeremy Huddleston Sequoia
> On Jul 10, 2018, at 5:27 AM, Ævar Arnfjörð Bjarmason wrote: > > On Tue, Jul 3, 2018 at 3:36 PM, Jeff King wrote: >> On Mon, Jul 02, 2018 at 01:15:19PM -0700, Jeremy Huddleston Sequoia wrote: >> >>>> I hope that maybe they're also interested in

Re: [PATCH] imap-send: use Apple's Security framework for base64 encoding

2013-07-27 Thread Jeremy Huddleston Sequoia
Hi David, Thanks for massaging it to apply to master and cleaning up the style conflicts. On Jul 27, 2013, at 13:31, David Aguilar wrote: > From: Jeremy Huddleston > > Use Apple's supported functions for base64 encoding instead > of the deprecated OpenSSL functions. > > Signed-off-by: Jeremy

Re: [PATCH 2/3] OS X: Fix redeclaration of die warning

2013-08-05 Thread Jeremy Huddleston Sequoia
Thanks Brian, Reviewed-by: Jeremy Huddleston Sequoia On Aug 5, 2013, at 8:59, Brian Gernhardt wrote: > compat/apple-common-crypto.h uses die() in one of its macros, but was > included in git-compat-util.h before the definition of die. > > Fix by simply moving the relevant block a

Re: [PATCH 1/3] Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1

2013-08-05 Thread Jeremy Huddleston Sequoia
Thanks Brian, Reviewed-by: Jeremy Huddleston Sequoia On Aug 5, 2013, at 8:59, Brian Gernhardt wrote: > It used to be that APPLE_COMMON_CRYPTO did nothing when BLK_SHA1 was > set. But APPLE_COMMON_CRYPTO is now used for more than just SHA1 (see > 3ef2bca) so make sure that the ap