mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
t7004-tag.sh: re-arrange git tag comment for clarity
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 <avarab@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6f10c4103d
commit
5649bd9a51
|
@ -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 <actual) &&
|
||||
test -z "$first" &&
|
||||
echo >first.expect &&
|
||||
sed -e 1q <actual >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' <actual) &&
|
||||
test -z "$rest"
|
||||
>rest.expect
|
||||
sed -e 1d -e '/^#/d' <actual >rest.actual &&
|
||||
test_cmp rest.expect rest.actual
|
||||
'
|
||||
|
||||
get_tag_header reuse $commit commit $time >expect
|
||||
|
|
Loading…
Reference in a new issue