From: Mike Hommey Date: Fri, 16 Nov 2007 22:02:08 +0000 (+0100) Subject: Fix and improve t7004 (git-tag tests) X-Git-Tag: v1.5.4-rc0~193 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=eb9d2b91cf12b92ab45855702965f3bc384462f9;p=git.git Fix and improve t7004 (git-tag tests) Brown paper bag fix to avoid using non portable sed syntax. The test by itself didn't catch what it was supposed to, anyways. The new test first checks if git-tag correctly errors out when the user exited the editor without editing the file. Then it checks if what the user was presented in the editor was any useful, which we define as the following: * It begins with a single blank line, where the invoked editor would typically place the editing curser at, so that the user can immediately start typing; * It has some instruction but that comes after that initial blank line, all lines prefixed with "#". We specifically do not check for the wording of this instruction. * And it has nothing else, as the expected behaviour is "Hey you did not leave any message". Signed-off-by: Mike Hommey Signed-off-by: Junio C Hamano --- diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 096fe33b0..5f7e388d7 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1004,10 +1004,20 @@ test_expect_failure \ 'verify signed tag fails when public key is not present' \ 'git-tag -v signed-tag' +test_expect_failure \ + 'git-tag -a fails if tag annotation is empty' ' + GIT_EDITOR=cat git tag -a initial-comment +' + test_expect_success \ 'message in editor has initial comment' ' - GIT_EDITOR=cat git tag -a initial-comment > actual || true && - test $(sed -n "/^\(#\|\$\)/p" actual | wc -l) -gt 0 + GIT_EDITOR=cat git tag -a initial-comment > actual + # check the first line --- should be empty + first=$(sed -e 1q expect