From: Alex Riesen <raa.lkml@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] Fix t6031 on filesystems without working exec bit
Date: Fri, 23 May 2008 21:12:09 +0200 [thread overview]
Message-ID: <20080523191209.GA3673@steel.home> (raw)
In-Reply-To: <20080522131258.GE3206@steel.home>
Alex Riesen, Thu, May 22, 2008 15:12:58 +0200:
> Junio C Hamano, Thu, May 22, 2008 11:04:09 +0200:
> > If your repository is marked so that executable bit is untrustworthy
> > there, the check done when switching to branch "a1" to compare if "file1"
> > that is involved in the switch operation has local changes should ignore
> > (apparent and false) executable-bit change, shouldn't it?
>
> Will see next monday, when I get back to that wretched laptop.
>
I managed to get my hands on it today and tried the test with your
modification. The test succeeds always and it succeeds with or without
the chmod. So it seems merge-recursive somehow ignores the x-bit from
working tree, I just cannot not find how and where.
prev parent reply other threads:[~2008-05-23 19:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-18 14:57 [PATCH] Fix t6031 on filesystems without working exec bit Alex Riesen
2008-05-19 4:51 ` Junio C Hamano
2008-05-19 6:00 ` Alex Riesen
2008-05-21 17:14 ` Junio C Hamano
2008-05-22 8:16 ` Alex Riesen
2008-05-22 9:04 ` Junio C Hamano
2008-05-22 13:12 ` Alex Riesen
2008-05-23 19:12 ` Alex Riesen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080523191209.GA3673@steel.home \
--to=raa.lkml@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).