Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-15 Thread Johannes Sixt
Am 14.11.2014 um 22:04 schrieb Andreas Schwab: Johannes Sixt j...@kdbg.org writes: diff --git a/compat/mingw.c b/compat/mingw.c index 2ee3fe3..fc64b73 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -312,7 +312,7 @@ int mingw_open (const char *filename, int oflags, ...)

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-14 Thread Johannes Sixt
(+cc msysgit) Am 13.11.2014 um 10:08 schrieb Jeff King: On Thu, Nov 13, 2014 at 09:50:24AM +0100, Johannes Sixt wrote: That looks more like it is failing the actual test (i.e., the creation of branch one when there is cruft in the reflog). My guess is that calling open() on a directory is

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-14 Thread Jeff King
On Fri, Nov 14, 2014 at 08:11:18PM +0100, Johannes Sixt wrote: Not a comment, on this paragraph of yours, but while I was walking through the code with gdb, I was wondering why the reflog directory is being touched at all when core.logallrefupdates is off (in log_ref_setup via log_ref_write).

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-14 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: Not a comment, on this paragraph of yours, but while I was walking through the code with gdb, I was wondering why the reflog directory is being touched at all when core.logallrefupdates is off (in log_ref_setup via log_ref_write). With the patch below I now

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-14 Thread Andreas Schwab
Johannes Sixt j...@kdbg.org writes: diff --git a/compat/mingw.c b/compat/mingw.c index 2ee3fe3..fc64b73 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -312,7 +312,7 @@ int mingw_open (const char *filename, int oflags, ...) return -1; fd = _wopen(wfilename, oflags,

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-13 Thread Johannes Sixt
Am 12.11.2014 22:59, schrieb Jeff King: On Wed, Nov 12, 2014 at 09:20:22PM +0100, Johannes Sixt wrote: Am 09.11.2014 um 02:59 schrieb Jeff King: test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' ' - test_when_finished git branch -d a || git branch -d a/b +

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-13 Thread Jeff King
On Thu, Nov 13, 2014 at 09:50:24AM +0100, Johannes Sixt wrote: That looks more like it is failing the actual test (i.e., the creation of branch one when there is cruft in the reflog). My guess is that calling open() on a directory is giving us EACCES instead of EISDIR. Can you verify that?

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-13 Thread Junio C Hamano
Jeff King p...@peff.net writes: The patch you are responding to is a fix-up for 9233887, which tweaked the code and added those tests in the first place (I doubt it would work for you, though, as it has a problem on case-insensitive filesystems). But the sequence works as expected with a

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-12 Thread Johannes Sixt
Am 09.11.2014 um 02:59 schrieb Jeff King: test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' ' - test_when_finished git branch -d a || git branch -d a/b + test_when_finished git branch -d one || git branch -d one/two - git branch a/b master - echo

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-12 Thread Jeff King
On Wed, Nov 12, 2014 at 09:20:22PM +0100, Johannes Sixt wrote: Am 09.11.2014 um 02:59 schrieb Jeff King: test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' ' - test_when_finished git branch -d a || git branch -d a/b + test_when_finished git branch -d one || git

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Michael Blume
Works for me, thanks =) I'm curious now, is there an automated build of git running on a mac anywhere? There's a mac mini running jenkins in my office and it's possible I could convince someone to let me set up a git build that'll e-mail me if there's a test failure. On Sat, Nov 8, 2014 at 5:59

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Junio C Hamano
Michael Blume blume.m...@gmail.com writes: Works for me, thanks =) I'm curious now, is there an automated build of git running on a mac anywhere? There's a mac mini running jenkins in my office and it's possible I could convince someone to let me set up a git build that'll e-mail me if

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Torsten Bögershausen
On 09.11.14 18:34, Michael Blume wrote: Works for me, thanks =) I'm curious now, is there an automated build of git running on a mac anywhere? There's a mac mini running jenkins in my office and it's possible I could convince someone to let me set up a git build that'll e-mail me if there's

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Michael Blume
Actually I have a build break in pu on my mac right now. Seems to build fine in ubuntu, but: progress.c:66:15: error: use of undeclared identifier 'CLOCK_MONOTONIC' timer_create(CLOCK_MONOTONIC, sev, progress_timer); ^ ./git-compat-util.h:233:54: note: expanded from

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Torsten Bögershausen
On 2014-11-09 22.36, Michael Blume wrote: Actually I have a build break in pu on my mac right now. Seems to build fine in ubuntu, but: progress.c:66:15: error: use of undeclared identifier 'CLOCK_MONOTONIC' timer_create(CLOCK_MONOTONIC, sev, progress_timer); That is not an unkown

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Michael Blume
Ok, with that I have a different test failure on the pu branch -- please tell me if I'm spamming the list or if there's some other protocol I should be using to report issues on pu. $ ./t4213-log-remerge-diff.sh -v Initialized empty Git repository in /Users/michael.blume/workspace/git/t/trash

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Junio C Hamano
On Sat, Nov 8, 2014 at 5:59 PM, Jeff King p...@peff.net wrote: Two tests recently added to t1410 create branches a and a/b to test d/f conflicts on reflogs. Earlier, unrelated tests in that script create the path A/B in the working tree. There's no conflict on a case-sensitive filesystem,

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Jeff King
On Sun, Nov 09, 2014 at 06:56:45PM -0800, Junio C Hamano wrote: We could fix this by using a -- to disambiguate, but we are probably better off using names that are less confusing to make it more clear that they are unrelated to the working tree files. This patch turns a/b into one/two.

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Jeff King
On Sun, Nov 09, 2014 at 09:48:29AM -0800, Junio C Hamano wrote: Michael Blume blume.m...@gmail.com writes: Works for me, thanks =) I'm curious now, is there an automated build of git running on a mac anywhere? There's a mac mini running jenkins in my office and it's possible I could

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Junio C Hamano
On Sun, Nov 9, 2014 at 10:30 PM, Jeff King p...@peff.net wrote: I know you make test before pushing out the results of any integration you do. And I recall that for a while (and maybe still?) you even did so on VMs of a few common platforms. OS X is notoriously irritating to run in a VM, but

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Jeff King
On Sun, Nov 09, 2014 at 10:47:52PM -0800, Junio C Hamano wrote: On Sun, Nov 9, 2014 at 10:30 PM, Jeff King p...@peff.net wrote: I know you make test before pushing out the results of any integration you do. And I recall that for a while (and maybe still?) you even did so on VMs of a few

[PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-08 Thread Jeff King
On Sat, Nov 08, 2014 at 08:43:54PM -0500, Jeff King wrote: Unfortunately I don't have an OS X install handy to test on. I lied; it turns out I still had access to an old VM. The problem did turn out to be rather silly. Here's a patch. -- 8 -- Two tests recently added to t1410 create branches a