From: Pavel Roskin <proski@gnu.org>
To: Petr Baudis <pasky@suse.cz>
Cc: git <git@vger.kernel.org>
Subject: [PATCH]: cogito testsuite fix - expect "m foo", not "M foo"
Date: Mon, 26 Sep 2005 21:06:01 -0400 [thread overview]
Message-ID: <1127783161.11578.8.camel@dv> (raw)
Signed-off-by: Pavel Roskin <proski@gnu.org>
testsuite fix - expect "m foo", not "M foo"
commit bb42b67ac543416f974d502e269f134ed80bdd4b introduced status 'm'
for modified files that won't be committed. This change also broke test
19 in t9202-merge-on-dirty.sh, which expects status 'M'. I believe the
'm' status is correct in this test, so it's the testsuite that need to
be adjusted.
diff --git a/t/t9202-merge-on-dirty.sh b/t/t9202-merge-on-dirty.sh
--- a/t/t9202-merge-on-dirty.sh
+++ b/t/t9202-merge-on-dirty.sh
@@ -89,7 +89,7 @@ cp branch1/foo branch1/foo-
test_expect_failure 'merging branch2 to branch1 (clean)' \
"(cd branch1 && cg-merge </dev/null)"
test_expect_success 'checking if we still have our local change' \
- '(cd branch1 && cg-status -w | grep -q "^M foo" && cmp foo foo-)'
+ '(cd branch1 && cg-status -w | grep -q "^m foo" && cmp foo foo-)'
# This test is useful if the previous one failed - did it get lost or
# accidentally committed?
test_expect_success 'checking that we didn'\''t commit the local change' \
--
Regards,
Pavel Roskin
reply other threads:[~2005-09-27 1:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1127783161.11578.8.camel@dv \
--to=proski@gnu.org \
--cc=git@vger.kernel.org \
--cc=pasky@suse.cz \
/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).