* [PATCH]: cogito testsuite fix - expect "m foo", not "M foo"
@ 2005-09-27 1:06 Pavel Roskin
0 siblings, 0 replies; only message in thread
From: Pavel Roskin @ 2005-09-27 1:06 UTC (permalink / raw)
To: Petr Baudis; +Cc: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-09-27 1:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-09-27 1:06 [PATCH]: cogito testsuite fix - expect "m foo", not "M foo" Pavel Roskin
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.