Skip to content

Commit

Permalink
t7004-tag.sh: re-arrange git tag comment for clarity
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ævar Arnfjörð Bjarmason authored and Junio C Hamano committed Nov 14, 2010
1 parent 6f10c41 commit 5649bd9
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions t/t7004-tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5649bd9

Please sign in to comment.