[RFC/ PATCH 4/5] t3030: update porcelain expected message
- From
- Diane Gasselin <diane.gasselin@ensimag.imag.fr>
- Date
- Jun 9, 2010, 12:44 UTC
- Message-ID
- <1276087446-25112-6-git-send-email-diane.gasselin@ensimag.imag.fr>
- In-Reply-To
- <1276087446-25112-5-git-send-email-diane.gasselin@ensimag.imag.fr>
From: Diane <diane.gasselin@ensimag.imag.fr>
As porcelain messages have been changed, the expected porcelain message tested in this test needs to be changed.
Signed-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Signed-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Signed-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr> --- t/t3030-merge-recursive.sh | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 9929f82..9ac5df8 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -268,6 +268,11 @@ test_expect_success 'merge-recursive result' ' test_cmp expected actual ' +cat> expected2 <<EOF +error: Your local changes to the files: + a +would be overwritten by merge. +EOF test_expect_success 'fail if the index has unresolved entries' ' @@ -282,7 +287,8 @@ test_expect_success '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 -A 2 "Your local changes to" out > tmp && + test_cmp expected2 tmp ' test_expect_success 'merge-recursive remove conflict' '
-- 1.6.6.7.ga5fe3