diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:41:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-10 07:52:55 (GMT) |
| commit | bacec4784598ca35b9be7635cbb630ef59367b6b (patch) | |
| tree | f49872824d9b9ea390b4a8c48ace6ffaaa8555be /t/t7611-merge-abort.sh | |
| parent | f338cb83a0328b9fe4ec37dff0d4dcc3b8f3cde9 (diff) | |
| download | git-bacec4784598ca35b9be7635cbb630ef59367b6b.zip git-bacec4784598ca35b9be7635cbb630ef59367b6b.tar.gz git-bacec4784598ca35b9be7635cbb630ef59367b6b.tar.bz2 | |
i18n: git-merge basic messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7611-merge-abort.sh')
| -rwxr-xr-x | t/t7611-merge-abort.sh | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/t/t7611-merge-abort.sh b/t/t7611-merge-abort.sh index 61890bc..cdb3f44 100755 --- a/t/t7611-merge-abort.sh +++ b/t/t7611-merge-abort.sh @@ -46,8 +46,14 @@ test_expect_success 'setup' ' pre_merge_head="$(git rev-parse HEAD)" test_expect_success 'fails without MERGE_HEAD (unstarted merge)' ' - test_must_fail git merge --abort 2>output && - grep -q MERGE_HEAD output && + test_must_fail git merge --abort 2>output +' + +test_expect_success C_LOCALE_OUTPUT 'fails without MERGE_HEAD (unstarted merge): fatal output' ' + grep -q MERGE_HEAD output +' + +test_expect_success 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity' ' test ! -f .git/MERGE_HEAD && test "$pre_merge_head" = "$(git rev-parse HEAD)" ' @@ -57,8 +63,14 @@ test_expect_success 'fails without MERGE_HEAD (completed merge)' ' test ! -f .git/MERGE_HEAD && # Merge successfully completed post_merge_head="$(git rev-parse HEAD)" && - test_must_fail git merge --abort 2>output && - grep -q MERGE_HEAD output && + test_must_fail git merge --abort 2>output +' + +test_expect_success C_LOCALE_OUTPUT 'fails without MERGE_HEAD (completed merge): output' ' + grep -q MERGE_HEAD output +' + +test_expect_success 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity' ' test ! -f .git/MERGE_HEAD && test "$post_merge_head" = "$(git rev-parse HEAD)" ' |