From: Junio C Hamano <gitster@pobox•com>
To: Lukas Fleischer <git@cryptocrack•de>
Cc: git@vger•kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx•de>
Subject: Re: [PATCH 1/2] t5704: Fix the test that checks for excluded tags
Date: Mon, 04 Aug 2014 13:08:54 -0700 [thread overview]
Message-ID: <xmqqzjfkqap5.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1406968747-16100-1-git-send-email-git@cryptocrack.de> (Lukas Fleischer's message of "Sat, 2 Aug 2014 10:39:06 +0200")
Lukas Fleischer <git@cryptocrack•de> writes:
> In c9a42c4 (bundle: allow rev-list options to exclude annotated tags,
> 2009-01-02), we added a test to check whether annotated tags, which fall
> outside the specified date range, are excluded from bundles. However,
> when initializing the repository, a command to create a lightweight tag
> was used. Fix this by replacing `git tag` by `git tag -a`. Furthermore,
> explicitly mention in the test message that an annotated tag is created
> and also test whether tags within the specified date range are included
> properly.
>
> Note that this fix reveals that the annotated tag exclusion actually
> does not work. Therefore, the test is marked expect-failure for now.
>
> Signed-off-by: Lukas Fleischer <git@cryptocrack•de>
> ---
> t/t5704-bundle.sh | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh
> index a45c316..2f063ea 100755
> --- a/t/t5704-bundle.sh
> +++ b/t/t5704-bundle.sh
> @@ -6,7 +6,7 @@ test_description='some bundle related tests'
> test_expect_success 'setup' '
> test_commit initial &&
> test_tick &&
> - git tag -m tag tag &&
> + git tag -am tag tag &&
I'd prefer to see this spelled as "-a -m tag", but anyway,
this suggests to me that a request to create a light-weight tag
should be made to error out when -m is given, or automatically
promote itself to create an annotated tag, perhaps? That is in line
with what happens when you do "git tag -F <file> tagname".
Oh, wait.
$ git tag -d foo
$ git rev-parse refs/tags/foo --
fatal: bad revision 'refs/tags/foo'
$ git tag -m msg foo
$ git cat-file -t refs/tags/foo
tag
$ git cat-file tag refs/tags/foo
object d84843c...
type commit
tag foo
tagger Junio ....
msg
$ git version
git version 2.1.0-rc0-247-g66c8a75
The output from "git blame -L'/^int cmd_tag/,/^}/' builtin/tag.c"
seems to indicate that we automatically turned annotate on when a
message is given via -m or -F since the very first version of "git
tag" that was re-implemented in C, i.e. 62e09ce9 (Make git tag a
builtin., 2007-07-20).
Your analysis starts to sound fishy. What version of Git are you
talking about?
> test_commit second &&
> test_commit third &&
> git tag -d initial &&
> @@ -14,7 +14,10 @@ test_expect_success 'setup' '
> git tag -d third
> '
>
> -test_expect_success 'tags can be excluded by rev-list options' '
> +test_expect_failure 'annotated tags can be excluded by rev-list options' '
> + git bundle create bundle --all --since=7.Apr.2005.15:14:00.-0700 &&
> + git ls-remote bundle > output &&
> + grep tag output &&
> git bundle create bundle --all --since=7.Apr.2005.15:16:00.-0700 &&
> git ls-remote bundle > output &&
> ! grep tag output
next prev parent reply other threads:[~2014-08-04 20:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-02 8:39 [PATCH 1/2] t5704: Fix the test that checks for excluded tags Lukas Fleischer
2014-08-02 8:39 ` [PATCH 2/2] bundle: Fix exclusion of annotated tags Lukas Fleischer
2014-08-04 20:10 ` Junio C Hamano
2014-08-04 20:08 ` Junio C Hamano [this message]
2014-08-04 20:28 ` [PATCH 1/2] t5704: Fix the test that checks for excluded tags Junio C Hamano
2014-08-04 20:57 ` [PATCH 1/2] t5704: Complement annotated tag exclusion test Lukas Fleischer
2014-08-04 20:57 ` [PATCH 2/2] bundle: Fix exclusion of annotated tags Lukas Fleischer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzjfkqap5.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@cryptocrack$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox