[PATCH 4/5 v2] tests: update porcelain expected message

From

DGDiane Gasselin <diane.gasselin@ensimag.imag.fr>

Date

Jun 15, 2010, 12:22 UTC

Message-ID

<1276604576-28092-5-git-send-email-diane.gasselin@ensimag.imag.fr>

In-Reply-To

<1276604576-28092-4-git-send-email-diane.gasselin@ensimag.imag.fr>

Signed-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr>
Signed-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr>
Signed-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr>
---
 t/t3030-merge-recursive.sh |    4 ++--
 t/t3400-rebase.sh          |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index 7ef8dd4..77bf0f0 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -269,7 +269,7 @@ test_expect_success 'merge-recursive result' '
 
 '
 
-test_expect_failure 'fail if the index has unresolved entries' '
+test_expect_success 'fail if the index has unresolved entries' '
 
 	rm -fr [abcd] &&
 	git checkout -f "$c1" &&
@@ -282,7 +282,7 @@ test_expect_failure 'fail if the index has unresolved entries' '
 	grep "You have not concluded your merge" out &&
 	rm -f .git/MERGE_HEAD &&
 	test_must_fail git merge "$c5" 2> out &&
-	grep "Your local changes to .* would be overwritten by merge." out
+	grep "Your local changes to the following files would be overwritten by merge:" out
 '
 
 test_expect_success 'merge-recursive remove conflict' '
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index cbf160d..55be0c2 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -121,10 +121,10 @@ test_expect_success 'rebase a single mode change' '
      GIT_TRACE=1 git rebase master
 '
 
-test_expect_failure 'Show verbose error when HEAD could not be detached' '
+test_expect_success 'Show verbose error when HEAD could not be detached' '
      : > B &&
      test_must_fail git rebase topic 2> output.err > output.out &&
-     grep "Untracked working tree file .B. would be overwritten" output.err
+     grep "The following untracked working tree files would be overwritten by checkout:" output.err
 '
 
 test_expect_success 'rebase -q is quiet' '

-- 
1.6.6.7.ga5fe3