dl/warn-tagging-a-tag, was Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

Commit Message

Johannes Schindelin April 10, 2019, 9:56 p.m. UTC

Hi Junio,

On Wed, 10 Apr 2019, Junio C Hamano wrote:

> * dl/warn-tagging-a-tag (2019-04-09) 2 commits
>  - tag: advise on nested tags
>  - tag: fix formatting
>
>  "git tag" learned to give an advice suggesting it might be a
>  mistake when creating an annotated or signed tag that points at
>  another tag.
>
>  Will merge to 'next'.

For me, this does not work without this squashed in:

-- snipsnap --

Comments

Junio C Hamano April 12, 2019, 1:51 a.m. UTC | #1

Johannes Schindelin <[e-mail]> writes:

> For me, this does not work without this squashed in:
>
> -- snipsnap --
> diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
> index 33a1d70b434d..7767cb1fab64 100755
> --- a/t/t7004-tag.sh
> +++ b/t/t7004-tag.sh
> @@ -1688,7 +1688,7 @@ test_expect_success '--points-at finds annotated tags of tags' '
>  '
>
>  test_expect_success 'recursive tagging should give advice' '
> -	sed -e 's/|$//' <<-EOF >expect &&
> +	sed -e "s/|$//" <<-EOF >expect &&

Ah, that's quite an obvious fix.  We should look out for sq inside
the body of the test.

Will squash in.

Thanks.

Patch

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 33a1d70b434d..7767cb1fab64 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1688,7 +1688,7 @@  test_expect_success '--points-at finds annotated tags of tags' '
 '

 test_expect_success 'recursive tagging should give advice' '
-	sed -e 's/|$//' <<-EOF >expect &&
+	sed -e "s/|$//" <<-EOF >expect &&
 	hint: You have created a nested tag. The object referred to by your new is
 	hint: already a tag. If you meant to tag the object that it points to, use:
 	hint: |