From: "Ingo Brückl" <ib@wupperonline.de>
To: git@vger.kernel.org
Subject: [PATCH] Fix failing test t3700-add.sh
Date: Fri, 29 Jul 2016 14:31:28 +0200 [thread overview]
Message-ID: <579b4ca1.18da2703.bm000@wupperonline.de> (raw)
At the time of the test xfoo1 already exists and is a link.
As a result, the check for file mode 100644 fails.
Create not yet existing file xfoo instead.
Signed-off-by: Ingo Brückl <ib@wupperonline.de>
---
t/t3700-add.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 4865304..aee61b9 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -342,12 +342,12 @@ test_expect_success 'git add --chmod=+x stages a non-executable file with +x' '
'
test_expect_success 'git add --chmod=-x stages an executable file with -x' '
- echo foo >xfoo1 &&
- chmod 755 xfoo1 &&
- git add --chmod=-x xfoo1 &&
- case "$(git ls-files --stage xfoo1)" in
- 100644" "*xfoo1) echo pass;;
- *) echo fail; git ls-files --stage xfoo1; (exit 1);;
+ echo foo >xfoo &&
+ chmod 755 xfoo &&
+ git add --chmod=-x xfoo &&
+ case "$(git ls-files --stage xfoo)" in
+ 100644" "*xfoo) echo pass;;
+ *) echo fail; git ls-files --stage xfoo; (exit 1);;
esac
'
--
2.9.2
next reply other threads:[~2016-07-29 12:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-29 12:31 Ingo Brückl [this message]
2016-07-29 16:23 ` [PATCH] Fix failing test t3700-add.sh Johannes Sixt
2016-07-29 16:39 ` Jeff King
2016-07-29 16:49 ` Junio C Hamano
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=579b4ca1.18da2703.bm000@wupperonline.de \
--to=ib@wupperonline.de \
--cc=git@vger.kernel.org \
/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).