From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Thomas Gummerer <t.gummerer@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH tg/add-chmod+x-fix 2/2] t3700-add: protect one --chmod=+x test with POSIXPERM
Date: Wed, 21 Sep 2016 14:12:52 -0700 [thread overview]
Message-ID: <xmqq60pp6jor.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <c3aefd9d-b794-21a1-619e-bce6a3c2cf47@kdbg.org> (Johannes Sixt's message of "Wed, 21 Sep 2016 22:58:55 +0200")
Johannes Sixt <j6t@kdbg.org> writes:
> But I came to a different conclusion as I said in a message that
> crossed yours. I hope Thomas can pick up the baton again.
Yeah, our mails crossed, apparently, and I do agree with your
reasoning. How about this, then?
-- >8 --
From: Johannes Sixt <j6t@kdbg.org>
Date: Tue, 20 Sep 2016 08:18:25 +0200
Subject: [PATCH] t3700-add: do not check working tree file mode without POSIXPERM
A recently introduced test checks the result of 'git status' after
setting the executable bit on a file. This check does not yield the
expected result when the filesystem does not support the executable
bit.
What we care about is that a file added with "--chmod=+x" has
executable bit in the index and that "--chmod=+x" (or any other
options for that matter) does not muck with working tree files.
The former is tested by other existing tests, so let's check the
latter more explicitly and only under POSIXPERM prerequisite.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
t/t3700-add.sh | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 16ab2da..924a266 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -361,13 +361,11 @@ test_expect_success 'git add --chmod=[+-]x changes index with already added file
test_mode_in_index 100644 xfoo3
'
-test_expect_success 'file status is changed after git add --chmod=+x' '
- echo "AM foo4" >expected &&
+test_expect_success POSIXPERM 'git add --chmod=[+-]x does not change the working tree' '
echo foo >foo4 &&
git add foo4 &&
git add --chmod=+x foo4 &&
- git status -s foo4 >actual &&
- test_cmp expected actual
+ ! test -x foo4
'
test_expect_success 'no file status change if no pathspec is given' '
--
2.10.0-515-g9036219
next prev parent reply other threads:[~2016-09-21 21:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 6:16 [PATCH tg/add-chmod+x-fix 1/2] t3700-add: create subdirectory gently Johannes Sixt
2016-09-20 6:18 ` [PATCH tg/add-chmod+x-fix 2/2] t3700-add: protect one --chmod=+x test with POSIXPERM Johannes Sixt
2016-09-20 19:34 ` Thomas Gummerer
2016-09-21 18:12 ` Junio C Hamano
2016-09-21 20:47 ` Johannes Sixt
2016-09-21 20:47 ` Junio C Hamano
2016-09-21 20:58 ` Johannes Sixt
2016-09-21 21:12 ` Junio C Hamano [this message]
2016-09-22 5:06 ` Johannes Sixt
2016-09-22 21:01 ` Thomas Gummerer
2016-09-20 19:28 ` [PATCH tg/add-chmod+x-fix 1/2] t3700-add: create subdirectory gently Thomas Gummerer
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=xmqq60pp6jor.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=t.gummerer@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.