From: Ævar Arnfjörð Bjarmason Date: Sun, 14 Nov 2010 14:44:15 GMT Subject: [PATCH 2/4] t7004-tag.sh: re-arrange git tag comment for clarity Message-ID: <1289745857-16704-3-git-send-email-avarab@gmail.com> In-Reply-To: <1289745857-16704-1-git-send-email-avarab@gmail.com> Split the "message in editor has initial comment" test into three tests. The motivation is to be able to only skip the middle part under NO_GETTEXT_POISON. In addition the return value of 'git tag' was being returned. We now check that it's non-zero. I used ! instead of test_must_fail so that the GIT_EDITOR variable was only used in this command invocation, and because the surrounding tests use this style. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t7004-tag.sh | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index ac943f5..700b556 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1051,13 +1051,23 @@ test_expect_success \ test_expect_success \ 'message in editor has initial comment' ' - GIT_EDITOR=cat git tag -a initial-comment > actual + ! (GIT_EDITOR=cat git tag -a initial-comment > actual) +' + +test_expect_success \ + 'message in editor has initial comment: first line' ' # check the first line --- should be empty - first=$(sed -e 1q first.expect && + sed -e 1q first.actual && + test_cmp first.expect first.actual +' + +test_expect_success \ + 'message in editor has initial comment: remainder' ' # remove commented lines from the remainder -- should be empty - rest=$(sed -e 1d -e '/^#/d' rest.expect + sed -e 1d -e '/^#/d' rest.actual && + test_cmp rest.expect rest.actual ' get_tag_header reuse $commit commit $time >expect -- 1.7.2.3