From: "Torsten Bögershausen" <tboegi@web.de>
To: apelisse@gmail.com, Git Mailing List <git@vger.kernel.org>
Cc: "Torsten Bögershausen" <tboegi@web.de>
Subject: t7061: comments and one failure
Date: Sat, 05 Jan 2013 12:07:24 +0100 [thread overview]
Message-ID: <50E8096C.7000501@web.de> (raw)
Hej,
TC 9 is failing (Mac OS X 10.6),
==========================
expecting success:
>tracked/uncommitted &&
git status --porcelain --ignored >actual &&
test_cmp expected actual
--- expected 2013-01-05 11:01:00.000000000 +0000
+++ actual 2013-01-05 11:01:00.000000000 +0000
@@ -1,4 +1,3 @@
?? .gitignore
?? actual
?? expected
-!! tracked/
not ok 9 - status ignored tracked directory and uncommitted file with --ignore
#
# >tracked/uncommitted &&
# git status --porcelain --ignored >actual &&
# test_cmp expected actual
#
=======================
I haven't been able to dig further into this,
(I can volonteer to do some more debugging).
Looking into the code, there are 2 questions:
1) echo "ignored" >.gitignore &&
We don't need the quoting of a simple string which does not have space in it.
2) : >untracked/ignored &&
Do we need the colon here?
Would it make sence to do the following:
diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh
index 0da1214..761a2e7 100755
--- a/t/t7061-wtstatus-ignore.sh
+++ b/t/t7061-wtstatus-ignore.sh
@@ -12,10 +12,10 @@ cat >expected <<\EOF
EOF
test_expect_success 'status untracked directory with --ignored' '
- echo "ignored" >.gitignore &&
+ echo ignored >.gitignore &&
mkdir untracked &&
- : >untracked/ignored &&
- : >untracked/uncommitted &&
+ >untracked/ignored &&
+ >untracked/uncommitted &&
git status --porcelain --ignored >actual &&
test_cmp expected actual
'
@@ -43,7 +43,7 @@ EOF
test_expect_success 'status ignored directory with --ignore' '
rm -rf untracked &&
mkdir ignored &&
- : >ignored/uncommitted &&
+ >ignored/uncommitted &&
git status --porcelain --ignored >actual &&
test_cmp expected actual
'
@@ -71,8 +71,8 @@ test_expect_success 'status untracked directory with ignored files with --ignore
rm -rf ignored &&
mkdir untracked-ignored &&
mkdir untracked-ignored/test &&
- : >untracked-ignored/ignored &&
- : >untracked-ignored/test/ignored &&
+ >untracked-ignored/ignored &&
+ >untracked-ignored/test/ignored &&
git status --porcelain --ignored >actual &&
test_cmp expected actual
'
@@ -99,10 +99,10 @@ EOF
test_expect_success 'status ignored tracked directory with --ignore' '
rm -rf untracked-ignored &&
mkdir tracked &&
- : >tracked/committed &&
+ >tracked/committed &&
git add tracked/committed &&
git commit -m. &&
- echo "tracked" >.gitignore &&
+ echo tracked >.gitignore &&
git status --porcelain --ignored >actual &&
test_cmp expected actual
'
@@ -126,7 +126,7 @@ cat >expected <<\EOF
EOF
test_expect_success 'status ignored tracked directory and uncommitted file with --ignore' '
- : >tracked/uncommitted &&
+ >tracked/uncommitted &&
git status --porcelain --ignored >actual &&
test_cmp expected actual
'
/Torsten
next reply other threads:[~2013-01-05 11:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-05 11:07 Torsten Bögershausen [this message]
2013-01-05 11:24 ` t7061: comments and one failure Jeff King
2013-01-05 11:29 ` Antoine Pelisse
2013-01-05 20:42 ` [PATCH] status: report ignored yet tracked directories Antoine Pelisse
2013-01-05 21:27 ` Torsten Bögershausen
2013-01-05 23:03 ` Jeff King
2013-01-06 16:40 ` Antoine Pelisse
2013-01-07 8:33 ` Jeff King
2013-01-06 22:09 ` [PATCH v2] status: always report ignored " Antoine Pelisse
2013-01-07 17:21 ` Torsten Bögershausen
2013-01-07 17:50 ` Junio C Hamano
2013-01-07 19:06 ` Junio C Hamano
2013-01-07 20:24 ` Antoine Pelisse
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50E8096C.7000501@web.de \
--to=tboegi@web.de \
--cc=apelisse@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).