2007-06-28 20:09:12 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Carlos Rica
|
|
|
|
#
|
|
|
|
|
2008-09-03 08:59:31 +00:00
|
|
|
test_description='git tag
|
2007-06-28 20:09:12 +00:00
|
|
|
|
2007-07-19 23:42:28 +00:00
|
|
|
Tests for operations with tags.'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
|
|
|
. ./test-lib.sh
|
2011-09-07 17:42:39 +00:00
|
|
|
. "$TEST_DIRECTORY"/lib-gpg.sh
|
ref-filter: consult want_color() before emitting colors
When color placeholders like %(color:red) are used in a
ref-filter format, we unconditionally output the colors,
even if the user has asked us for no colors. This usually
isn't a problem when the user is constructing a --format on
the command line, but it means we may do the wrong thing
when the format is fed from a script or alias. For example:
$ git config alias.b 'branch --format=%(color:green)%(refname)'
$ git b --no-color
should probably omit the green color. Likewise, running:
$ git b >branches
should probably also omit the color, just as we would for
all baked-in coloring (and as we recently started to do for
user-specified colors in --pretty formats).
This commit makes both of those cases work by teaching
the ref-filter code to consult want_color() before
outputting any color. The color flag in ref_format defaults
to "-1", which means we'll consult color.ui, which in turn
defaults to the usual isatty() check on stdout. However,
callers like git-branch which support their own color config
(and command-line options) can override that.
The new tests independently cover all three of the callers
of ref-filter (for-each-ref, tag, and branch). Even though
these seem redundant, it confirms that we've correctly
plumbed through all of the necessary config to make colors
work by default.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-13 15:09:32 +00:00
|
|
|
. "$TEST_DIRECTORY"/lib-terminal.sh
|
2007-06-28 20:09:12 +00:00
|
|
|
|
|
|
|
# creating and listing lightweight tags:
|
|
|
|
|
|
|
|
tag_exists () {
|
|
|
|
git show-ref --quiet --verify refs/tags/"$1"
|
|
|
|
}
|
|
|
|
|
2007-07-19 23:42:28 +00:00
|
|
|
test_expect_success 'listing all tags in an empty tree should succeed' '
|
|
|
|
git tag -l &&
|
|
|
|
git tag
|
|
|
|
'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
2007-07-19 23:42:28 +00:00
|
|
|
test_expect_success 'listing all tags in an empty tree should output nothing' '
|
2016-01-07 13:51:49 +00:00
|
|
|
test $(git tag -l | wc -l) -eq 0 &&
|
|
|
|
test $(git tag | wc -l) -eq 0
|
2007-07-19 23:42:28 +00:00
|
|
|
'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
2016-12-04 02:52:25 +00:00
|
|
|
test_expect_success 'sort tags, ignore case' '
|
|
|
|
(
|
|
|
|
git init sort &&
|
|
|
|
cd sort &&
|
|
|
|
test_commit initial &&
|
|
|
|
git tag tag-one &&
|
|
|
|
git tag TAG-two &&
|
|
|
|
git tag -l >actual &&
|
|
|
|
cat >expected <<-\EOF &&
|
|
|
|
TAG-two
|
|
|
|
initial
|
|
|
|
tag-one
|
|
|
|
EOF
|
|
|
|
test_cmp expected actual &&
|
|
|
|
git tag -l -i >actual &&
|
|
|
|
cat >expected <<-\EOF &&
|
|
|
|
initial
|
|
|
|
tag-one
|
|
|
|
TAG-two
|
|
|
|
EOF
|
|
|
|
test_cmp expected actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success 'looking for a tag in an empty tree should fail' \
|
|
|
|
'! (tag_exists mytag)'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
|
|
|
test_expect_success 'creating a tag in an empty tree should fail' '
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag mynotag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
! tag_exists mynotag
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'creating a tag for HEAD in an empty tree should fail' '
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag mytaghead HEAD &&
|
2007-06-28 20:09:12 +00:00
|
|
|
! tag_exists mytaghead
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'creating a tag for an unknown revision should fail' '
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag mytagnorev aaaaaaaaaaa &&
|
2007-06-28 20:09:12 +00:00
|
|
|
! tag_exists mytagnorev
|
|
|
|
'
|
|
|
|
|
|
|
|
# commit used in the tests, test_tick is also called here to freeze the date:
|
|
|
|
test_expect_success 'creating a tag using default HEAD should succeed' '
|
2017-01-27 10:09:47 +00:00
|
|
|
test_config core.logAllRefUpdates true &&
|
2007-06-28 20:09:12 +00:00
|
|
|
test_tick &&
|
|
|
|
echo foo >foo &&
|
|
|
|
git add foo &&
|
|
|
|
git commit -m Foo &&
|
2015-07-21 21:04:55 +00:00
|
|
|
git tag mytag &&
|
|
|
|
test_must_fail git reflog exists refs/tags/mytag
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'creating a tag with --create-reflog should create reflog' '
|
tag: generate useful reflog message
When tags are created with `--create-reflog` or with the option
`core.logAllRefUpdates` set to 'always', a reflog is created for them.
So far, the description of reflog entries for tags was empty, making the
reflog hard to understand. For example:
6e3a7b3 refs/tags/test@{0}:
Now, a reflog message is generated when creating a tag, following the
pattern "tag: tagging <short-sha1> (<description>)". If
GIT_REFLOG_ACTION is set, the message becomes "$GIT_REFLOG_ACTION
(<description>)" instead. If the tag references a commit object, the
description is set to the subject line of the commit, followed by its
commit date. For example:
6e3a7b3 refs/tags/test@{0}: tag: tagging 6e3a7b3398 (Git 2.12-rc0, 2017-02-03)
If the tag points to a tree/blob/tag objects, the following static
strings are taken as description:
- "tree object"
- "blob object"
- "other tag object"
Signed-off-by: Cornelius Weig <cornelius.weig@tngtech.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-02-08 22:41:18 +00:00
|
|
|
git log -1 \
|
|
|
|
--format="format:tag: tagging %h (%s, %cd)%n" \
|
|
|
|
--date=format:%Y-%m-%d >expected &&
|
2015-07-21 21:04:55 +00:00
|
|
|
test_when_finished "git tag -d tag_with_reflog" &&
|
|
|
|
git tag --create-reflog tag_with_reflog &&
|
tag: generate useful reflog message
When tags are created with `--create-reflog` or with the option
`core.logAllRefUpdates` set to 'always', a reflog is created for them.
So far, the description of reflog entries for tags was empty, making the
reflog hard to understand. For example:
6e3a7b3 refs/tags/test@{0}:
Now, a reflog message is generated when creating a tag, following the
pattern "tag: tagging <short-sha1> (<description>)". If
GIT_REFLOG_ACTION is set, the message becomes "$GIT_REFLOG_ACTION
(<description>)" instead. If the tag references a commit object, the
description is set to the subject line of the commit, followed by its
commit date. For example:
6e3a7b3 refs/tags/test@{0}: tag: tagging 6e3a7b3398 (Git 2.12-rc0, 2017-02-03)
If the tag points to a tree/blob/tag objects, the following static
strings are taken as description:
- "tree object"
- "blob object"
- "other tag object"
Signed-off-by: Cornelius Weig <cornelius.weig@tngtech.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-02-08 22:41:18 +00:00
|
|
|
git reflog exists refs/tags/tag_with_reflog &&
|
|
|
|
sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog >actual &&
|
2017-05-05 18:19:32 +00:00
|
|
|
test_i18ncmp expected actual
|
tag: generate useful reflog message
When tags are created with `--create-reflog` or with the option
`core.logAllRefUpdates` set to 'always', a reflog is created for them.
So far, the description of reflog entries for tags was empty, making the
reflog hard to understand. For example:
6e3a7b3 refs/tags/test@{0}:
Now, a reflog message is generated when creating a tag, following the
pattern "tag: tagging <short-sha1> (<description>)". If
GIT_REFLOG_ACTION is set, the message becomes "$GIT_REFLOG_ACTION
(<description>)" instead. If the tag references a commit object, the
description is set to the subject line of the commit, followed by its
commit date. For example:
6e3a7b3 refs/tags/test@{0}: tag: tagging 6e3a7b3398 (Git 2.12-rc0, 2017-02-03)
If the tag points to a tree/blob/tag objects, the following static
strings are taken as description:
- "tree object"
- "blob object"
- "other tag object"
Signed-off-by: Cornelius Weig <cornelius.weig@tngtech.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-02-08 22:41:18 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'annotated tag with --create-reflog has correct message' '
|
|
|
|
git log -1 \
|
|
|
|
--format="format:tag: tagging %h (%s, %cd)%n" \
|
|
|
|
--date=format:%Y-%m-%d >expected &&
|
|
|
|
test_when_finished "git tag -d tag_with_reflog" &&
|
|
|
|
git tag -m "annotated tag" --create-reflog tag_with_reflog &&
|
|
|
|
git reflog exists refs/tags/tag_with_reflog &&
|
|
|
|
sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog >actual &&
|
2017-05-05 18:19:32 +00:00
|
|
|
test_i18ncmp expected actual
|
2015-07-21 21:04:55 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--create-reflog does not create reflog on failure' '
|
|
|
|
test_must_fail git tag --create-reflog mytag &&
|
|
|
|
test_must_fail git reflog exists refs/tags/mytag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
2017-01-27 10:09:47 +00:00
|
|
|
test_expect_success 'option core.logAllRefUpdates=always creates reflog' '
|
|
|
|
test_when_finished "git tag -d tag_with_reflog" &&
|
|
|
|
test_config core.logAllRefUpdates always &&
|
|
|
|
git tag tag_with_reflog &&
|
|
|
|
git reflog exists refs/tags/tag_with_reflog
|
|
|
|
'
|
|
|
|
|
2007-07-19 23:42:28 +00:00
|
|
|
test_expect_success 'listing all tags if one exists should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l &&
|
|
|
|
git tag
|
2007-07-19 23:42:28 +00:00
|
|
|
'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
2017-03-24 18:40:54 +00:00
|
|
|
cat >expect <<EOF
|
|
|
|
mytag
|
|
|
|
EOF
|
|
|
|
test_expect_success 'Multiple -l or --list options are equivalent to one -l option' '
|
|
|
|
git tag -l -l >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git tag --list --list >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git tag --list -l --list >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2007-07-19 23:42:28 +00:00
|
|
|
test_expect_success 'listing all tags if one exists should output that tag' '
|
2016-01-07 13:51:49 +00:00
|
|
|
test $(git tag -l) = mytag &&
|
|
|
|
test $(git tag) = mytag
|
2007-07-19 23:42:28 +00:00
|
|
|
'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
|
|
|
# pattern matching:
|
|
|
|
|
|
|
|
test_expect_success 'listing a tag using a matching pattern should succeed' \
|
2008-09-03 08:59:31 +00:00
|
|
|
'git tag -l mytag'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
2016-12-04 02:52:25 +00:00
|
|
|
test_expect_success 'listing a tag with --ignore-case' \
|
|
|
|
'test $(git tag -l --ignore-case MYTAG) = mytag'
|
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
test_expect_success \
|
|
|
|
'listing a tag using a matching pattern should output that tag' \
|
2016-01-07 13:51:49 +00:00
|
|
|
'test $(git tag -l mytag) = mytag'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
2017-03-23 13:05:20 +00:00
|
|
|
'listing tags using a non-matching pattern should succeed' \
|
2008-09-03 08:59:31 +00:00
|
|
|
'git tag -l xxx'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'listing tags using a non-matching pattern should output nothing' \
|
2016-01-07 13:51:49 +00:00
|
|
|
'test $(git tag -l xxx | wc -l) -eq 0'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
|
|
|
# special cases for creating tags:
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success \
|
2007-06-28 20:09:12 +00:00
|
|
|
'trying to create a tag with the name of one existing should fail' \
|
2008-07-12 15:47:52 +00:00
|
|
|
'test_must_fail git tag mytag'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'trying to create a tag with a non-valid name should fail' '
|
2016-01-07 13:51:49 +00:00
|
|
|
test $(git tag -l | wc -l) -eq 1 &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git tag "" &&
|
|
|
|
test_must_fail git tag .othertag &&
|
|
|
|
test_must_fail git tag "other tag" &&
|
|
|
|
test_must_fail git tag "othertag^" &&
|
|
|
|
test_must_fail git tag "other~tag" &&
|
2016-01-07 13:51:49 +00:00
|
|
|
test $(git tag -l | wc -l) -eq 1
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'creating a tag using HEAD directly should succeed' '
|
|
|
|
git tag myhead HEAD &&
|
|
|
|
tag_exists myhead
|
|
|
|
'
|
|
|
|
|
2013-03-12 23:13:41 +00:00
|
|
|
test_expect_success '--force can create a tag with the name of one existing' '
|
|
|
|
tag_exists mytag &&
|
|
|
|
git tag --force mytag &&
|
|
|
|
tag_exists mytag'
|
|
|
|
|
|
|
|
test_expect_success '--force is moot with a non-existing tag name' '
|
2016-12-08 14:23:55 +00:00
|
|
|
test_when_finished git tag -d newtag forcetag &&
|
2013-03-12 23:13:41 +00:00
|
|
|
git tag newtag >expect &&
|
|
|
|
git tag --force forcetag >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
# deleting tags:
|
|
|
|
|
|
|
|
test_expect_success 'trying to delete an unknown tag should fail' '
|
|
|
|
! tag_exists unknown-tag &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -d unknown-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
myhead
|
|
|
|
mytag
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
|
|
|
'trying to delete tags without params should succeed and do nothing' '
|
2008-05-24 05:28:56 +00:00
|
|
|
git tag -l > actual && test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -d &&
|
2008-05-24 05:28:56 +00:00
|
|
|
git tag -l > actual && test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'deleting two existing tags in one command should succeed' '
|
|
|
|
tag_exists mytag &&
|
|
|
|
tag_exists myhead &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -d mytag myhead &&
|
2007-06-28 20:09:12 +00:00
|
|
|
! tag_exists mytag &&
|
|
|
|
! tag_exists myhead
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'creating a tag with the name of another deleted one should succeed' '
|
|
|
|
! tag_exists mytag &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag mytag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
tag_exists mytag
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'trying to delete two tags, existing and not, should fail in the 2nd' '
|
|
|
|
tag_exists mytag &&
|
|
|
|
! tag_exists myhead &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -d mytag anothertag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
! tag_exists mytag &&
|
|
|
|
! tag_exists myhead
|
|
|
|
'
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success 'trying to delete an already deleted tag should fail' \
|
2008-09-03 08:59:31 +00:00
|
|
|
'test_must_fail git tag -d mytag'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
|
|
|
# listing various tags with pattern matching:
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
a1
|
|
|
|
aa1
|
|
|
|
cba
|
|
|
|
t210
|
|
|
|
t211
|
|
|
|
v0.2.1
|
|
|
|
v1.0
|
|
|
|
v1.0.1
|
|
|
|
v1.1.3
|
|
|
|
EOF
|
|
|
|
test_expect_success 'listing all tags should print them ordered' '
|
|
|
|
git tag v1.0.1 &&
|
|
|
|
git tag t211 &&
|
|
|
|
git tag aa1 &&
|
|
|
|
git tag v0.2.1 &&
|
|
|
|
git tag v1.1.3 &&
|
|
|
|
git tag cba &&
|
|
|
|
git tag a1 &&
|
|
|
|
git tag v1.0 &&
|
|
|
|
git tag t210 &&
|
2007-07-10 23:11:53 +00:00
|
|
|
git tag -l > actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-19 23:42:28 +00:00
|
|
|
git tag > actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
a1
|
|
|
|
aa1
|
|
|
|
cba
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
|
|
|
'listing tags with substring as pattern must print those matching' '
|
t2200, t7004: Avoid glob pattern that also matches files
On Windows, there is an unfortunate interaction between the MSYS bash and
git's command line processing:
- Since Windows's CMD does not do the wildcard expansion, but passes
arguments like path* through to the programs, the programs must do the
expansion themselves. This happens in the startup code before main() is
entered.
- bash, however, passes the argument "path*" to git, assuming that git will
see the unquoted word unchanged as a single argument.
But actually git expands the unquoted word before main() is entered.
In t2200, not all names that the test case is interested in exist as files
at the time when 'git ls-files' is invoked. git expands "path?" to only
the subset of files the exist, and only that subset was listed, so that the
test failed. We now list all interesting paths explicitly.
In t7004, git exanded the pattern "*a*" to "actual" (the file that stdout
was redirected to), which is not what the was tested for. We fix it by
renaming the output file (and removing any existing files matching *a*).
This was originally fixed by Johannes Schindelin.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
2009-02-09 09:24:51 +00:00
|
|
|
rm *a* &&
|
|
|
|
git tag -l "*a*" > current &&
|
|
|
|
test_cmp expect current
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
v0.2.1
|
|
|
|
v1.0.1
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
2007-09-01 05:10:09 +00:00
|
|
|
'listing tags with a suffix as pattern must print those matching' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l "*.1" > actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
t210
|
|
|
|
t211
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
2007-09-01 05:10:09 +00:00
|
|
|
'listing tags with a prefix as pattern must print those matching' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l "t21*" > actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
a1
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
2007-09-01 05:10:09 +00:00
|
|
|
'listing tags using a name as pattern must print that one matching' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l a1 > actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
v1.0
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
2007-09-01 05:10:09 +00:00
|
|
|
'listing tags using a name as pattern must print that one matching' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l v1.0 > actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
2007-09-01 05:10:09 +00:00
|
|
|
v1.0.1
|
2007-06-28 20:09:12 +00:00
|
|
|
v1.1.3
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
|
|
|
'listing tags with ? in the pattern should print those matching' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l "v1.?.?" > actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'listing tags using v.* should print nothing because none have v.' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l "v.*" > actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
v0.2.1
|
|
|
|
v1.0
|
|
|
|
v1.0.1
|
|
|
|
v1.1.3
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
|
|
|
'listing tags using v* should print only those having v' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l "v*" > actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
2011-06-20 16:59:28 +00:00
|
|
|
test_expect_success 'tag -l can accept multiple patterns' '
|
|
|
|
git tag -l "v1*" "v0*" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2017-03-24 18:40:54 +00:00
|
|
|
# Between v1.7.7 & v2.13.0 a fair reading of the git-tag documentation
|
|
|
|
# could leave you with the impression that "-l <pattern> -l <pattern>"
|
|
|
|
# was how we wanted to accept multiple patterns.
|
|
|
|
#
|
|
|
|
# This test should not imply that this is a sane thing to support. but
|
|
|
|
# since the documentation was worded like it was let's at least find
|
|
|
|
# out if we're going to break this long-documented form of taking
|
|
|
|
# multiple patterns.
|
|
|
|
test_expect_success 'tag -l <pattern> -l <pattern> works, as our buggy documentation previously suggested' '
|
|
|
|
git tag -l "v1*" -l "v0*" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2012-04-13 10:54:41 +00:00
|
|
|
test_expect_success 'listing tags in column' '
|
2018-05-11 12:13:29 +00:00
|
|
|
COLUMNS=41 git tag -l --column=row >actual &&
|
2012-04-13 10:54:41 +00:00
|
|
|
cat >expected <<\EOF &&
|
|
|
|
a1 aa1 cba t210 t211
|
|
|
|
v0.2.1 v1.0 v1.0.1 v1.1.3
|
|
|
|
EOF
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'listing tags in column with column.*' '
|
2016-12-08 14:23:56 +00:00
|
|
|
test_config column.tag row &&
|
|
|
|
test_config column.ui dense &&
|
2012-04-13 10:54:41 +00:00
|
|
|
COLUMNS=40 git tag -l >actual &&
|
|
|
|
cat >expected <<\EOF &&
|
|
|
|
a1 aa1 cba t210 t211
|
|
|
|
v0.2.1 v1.0 v1.0.1 v1.1.3
|
|
|
|
EOF
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'listing tag with -n --column should fail' '
|
|
|
|
test_must_fail git tag --column -n
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'listing tags -n in column with column.ui ignored' '
|
2016-12-08 14:23:56 +00:00
|
|
|
test_config column.ui "row dense" &&
|
2012-04-13 10:54:41 +00:00
|
|
|
COLUMNS=40 git tag -l -n >actual &&
|
|
|
|
cat >expected <<\EOF &&
|
|
|
|
a1 Foo
|
|
|
|
aa1 Foo
|
|
|
|
cba Foo
|
|
|
|
t210 Foo
|
|
|
|
t211 Foo
|
|
|
|
v0.2.1 Foo
|
|
|
|
v1.0 Foo
|
|
|
|
v1.0.1 Foo
|
|
|
|
v1.1.3 Foo
|
|
|
|
EOF
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
# creating and verifying lightweight tags:
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'a non-annotated tag created without parameters should point to HEAD' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag non-annotated-tag &&
|
2007-07-03 05:52:14 +00:00
|
|
|
test $(git cat-file -t non-annotated-tag) = commit &&
|
|
|
|
test $(git rev-parse non-annotated-tag) = $(git rev-parse HEAD)
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success 'trying to verify an unknown tag should fail' \
|
2008-09-03 08:59:31 +00:00
|
|
|
'test_must_fail git tag -v unknown-tag'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success \
|
2007-06-28 20:09:12 +00:00
|
|
|
'trying to verify a non-annotated and non-signed tag should fail' \
|
2008-09-03 08:59:31 +00:00
|
|
|
'test_must_fail git tag -v non-annotated-tag'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success \
|
2007-07-19 23:42:28 +00:00
|
|
|
'trying to verify many non-annotated or unknown tags, should fail' \
|
2008-09-03 08:59:31 +00:00
|
|
|
'test_must_fail git tag -v unknown-tag1 non-annotated-tag unknown-tag2'
|
2007-07-19 23:42:28 +00:00
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
# creating annotated tags:
|
|
|
|
|
|
|
|
get_tag_msg () {
|
|
|
|
git cat-file tag "$1" | sed -e "/BEGIN PGP/q"
|
|
|
|
}
|
|
|
|
|
|
|
|
# run test_tick before committing always gives the time in that timezone
|
|
|
|
get_tag_header () {
|
|
|
|
cat <<EOF
|
|
|
|
object $2
|
|
|
|
type $3
|
|
|
|
tag $1
|
|
|
|
tagger C O Mitter <committer@example.com> $4 -0700
|
|
|
|
|
|
|
|
EOF
|
|
|
|
}
|
|
|
|
|
|
|
|
commit=$(git rev-parse HEAD)
|
|
|
|
time=$test_tick
|
|
|
|
|
|
|
|
get_tag_header annotated-tag $commit commit $time >expect
|
|
|
|
echo "A message" >>expect
|
|
|
|
test_expect_success \
|
|
|
|
'creating an annotated tag with -m message should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -m "A message" annotated-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
2018-02-06 08:36:24 +00:00
|
|
|
get_tag_header annotated-tag-edit $commit commit $time >expect
|
|
|
|
echo "An edited message" >>expect
|
|
|
|
test_expect_success 'set up editor' '
|
|
|
|
write_script fakeeditor <<-\EOF
|
|
|
|
sed -e "s/A message/An edited message/g" <"$1" >"$1-"
|
|
|
|
mv "$1-" "$1"
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
test_expect_success \
|
|
|
|
'creating an annotated tag with -m message --edit should succeed' '
|
|
|
|
GIT_EDITOR=./fakeeditor git tag -m "A message" --edit annotated-tag-edit &&
|
|
|
|
get_tag_msg annotated-tag-edit >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
cat >msgfile <<EOF
|
|
|
|
Another message
|
|
|
|
in a file.
|
|
|
|
EOF
|
|
|
|
get_tag_header file-annotated-tag $commit commit $time >expect
|
|
|
|
cat msgfile >>expect
|
|
|
|
test_expect_success \
|
|
|
|
'creating an annotated tag with -F messagefile should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -F msgfile file-annotated-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg file-annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
2018-02-06 08:36:24 +00:00
|
|
|
get_tag_header file-annotated-tag-edit $commit commit $time >expect
|
|
|
|
sed -e "s/Another message/Another edited message/g" msgfile >>expect
|
|
|
|
test_expect_success 'set up editor' '
|
|
|
|
write_script fakeeditor <<-\EOF
|
|
|
|
sed -e "s/Another message/Another edited message/g" <"$1" >"$1-"
|
|
|
|
mv "$1-" "$1"
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
test_expect_success \
|
|
|
|
'creating an annotated tag with -F messagefile --edit should succeed' '
|
|
|
|
GIT_EDITOR=./fakeeditor git tag -F msgfile --edit file-annotated-tag-edit &&
|
|
|
|
get_tag_msg file-annotated-tag-edit >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2007-07-19 23:42:28 +00:00
|
|
|
cat >inputmsg <<EOF
|
|
|
|
A message from the
|
|
|
|
standard input
|
|
|
|
EOF
|
|
|
|
get_tag_header stdin-annotated-tag $commit commit $time >expect
|
|
|
|
cat inputmsg >>expect
|
|
|
|
test_expect_success 'creating an annotated tag with -F - should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -F - stdin-annotated-tag <inputmsg &&
|
2007-07-19 23:42:28 +00:00
|
|
|
get_tag_msg stdin-annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-07-19 23:42:28 +00:00
|
|
|
'
|
|
|
|
|
2007-07-21 12:13:12 +00:00
|
|
|
test_expect_success \
|
|
|
|
'trying to create a tag with a non-existing -F file should fail' '
|
|
|
|
! test -f nonexistingfile &&
|
|
|
|
! tag_exists notag &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -F nonexistingfile notag &&
|
2007-07-21 12:13:12 +00:00
|
|
|
! tag_exists notag
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success \
|
2007-11-09 13:42:56 +00:00
|
|
|
'trying to create tags giving both -m or -F options should fail' '
|
2007-07-21 12:13:12 +00:00
|
|
|
echo "message file 1" >msgfile1 &&
|
|
|
|
echo "message file 2" >msgfile2 &&
|
|
|
|
! tag_exists msgtag &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -m "message 1" -F msgfile1 msgtag &&
|
2007-07-21 12:13:12 +00:00
|
|
|
! tag_exists msgtag &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -F msgfile1 -m "message 1" msgtag &&
|
2007-07-21 12:13:12 +00:00
|
|
|
! tag_exists msgtag &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -m "message 1" -F msgfile1 \
|
2008-07-12 15:47:52 +00:00
|
|
|
-m "message 2" msgtag &&
|
2007-07-21 12:13:12 +00:00
|
|
|
! tag_exists msgtag
|
|
|
|
'
|
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
# blank and empty messages:
|
|
|
|
|
|
|
|
get_tag_header empty-annotated-tag $commit commit $time >expect
|
|
|
|
test_expect_success \
|
|
|
|
'creating a tag with an empty -m message should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -m "" empty-annotated-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg empty-annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
>emptyfile
|
|
|
|
get_tag_header emptyfile-annotated-tag $commit commit $time >expect
|
|
|
|
test_expect_success \
|
|
|
|
'creating a tag with an empty -F messagefile should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -F emptyfile emptyfile-annotated-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg emptyfile-annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
printf '\n\n \n\t\nLeading blank lines\n' >blanksfile
|
|
|
|
printf '\n\t \t \nRepeated blank lines\n' >>blanksfile
|
|
|
|
printf '\n\n\nTrailing spaces \t \n' >>blanksfile
|
|
|
|
printf '\nTrailing blank lines\n\n\t \n\n' >>blanksfile
|
|
|
|
get_tag_header blanks-annotated-tag $commit commit $time >expect
|
|
|
|
cat >>expect <<EOF
|
|
|
|
Leading blank lines
|
|
|
|
|
|
|
|
Repeated blank lines
|
|
|
|
|
|
|
|
Trailing spaces
|
|
|
|
|
|
|
|
Trailing blank lines
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
|
|
|
'extra blanks in the message for an annotated tag should be removed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -F blanksfile blanks-annotated-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg blanks-annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
get_tag_header blank-annotated-tag $commit commit $time >expect
|
|
|
|
test_expect_success \
|
|
|
|
'creating a tag with blank -m message with spaces should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -m " " blank-annotated-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg blank-annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
echo ' ' >blankfile
|
|
|
|
echo '' >>blankfile
|
|
|
|
echo ' ' >>blankfile
|
|
|
|
get_tag_header blankfile-annotated-tag $commit commit $time >expect
|
|
|
|
test_expect_success \
|
|
|
|
'creating a tag with blank -F messagefile with spaces should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -F blankfile blankfile-annotated-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg blankfile-annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
printf ' ' >blanknonlfile
|
|
|
|
get_tag_header blanknonlfile-annotated-tag $commit commit $time >expect
|
|
|
|
test_expect_success \
|
|
|
|
'creating a tag with -F file of spaces and no newline should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -F blanknonlfile blanknonlfile-annotated-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg blanknonlfile-annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
# messages with commented lines:
|
|
|
|
|
|
|
|
cat >commentsfile <<EOF
|
|
|
|
# A comment
|
|
|
|
|
|
|
|
############
|
|
|
|
The message.
|
|
|
|
############
|
|
|
|
One line.
|
|
|
|
|
|
|
|
|
|
|
|
# commented lines
|
|
|
|
# commented lines
|
|
|
|
|
|
|
|
Another line.
|
|
|
|
# comments
|
|
|
|
|
|
|
|
Last line.
|
|
|
|
EOF
|
|
|
|
get_tag_header comments-annotated-tag $commit commit $time >expect
|
|
|
|
cat >>expect <<EOF
|
|
|
|
The message.
|
|
|
|
One line.
|
|
|
|
|
|
|
|
Another line.
|
|
|
|
|
|
|
|
Last line.
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
|
|
|
'creating a tag using a -F messagefile with #comments should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -F commentsfile comments-annotated-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg comments-annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
get_tag_header comment-annotated-tag $commit commit $time >expect
|
|
|
|
test_expect_success \
|
|
|
|
'creating a tag with a #comment in the -m message should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -m "#comment" comment-annotated-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg comment-annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
echo '#comment' >commentfile
|
|
|
|
echo '' >>commentfile
|
|
|
|
echo '####' >>commentfile
|
|
|
|
get_tag_header commentfile-annotated-tag $commit commit $time >expect
|
|
|
|
test_expect_success \
|
|
|
|
'creating a tag with #comments in the -F messagefile should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -F commentfile commentfile-annotated-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg commentfile-annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
printf '#comment' >commentnonlfile
|
|
|
|
get_tag_header commentnonlfile-annotated-tag $commit commit $time >expect
|
|
|
|
test_expect_success \
|
|
|
|
'creating a tag with a file of #comment and no newline should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -F commentnonlfile commentnonlfile-annotated-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg commentnonlfile-annotated-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
2007-07-10 23:11:53 +00:00
|
|
|
# listing messages for annotated non-signed tags:
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'listing the one-line message of a non-signed tag should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -m "A msg" tag-one-line &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo "tag-one-line" >expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l | grep "^tag-one-line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n0 -l | grep "^tag-one-line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n0 -l tag-one-line >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
tag: implicitly supply --list given another list-like option
Change the "tag" command to implicitly turn on its --list mode when
provided with a list-like option such as --contains, --points-at etc.
This is for consistency with how "branch" works. When "branch" is
given a list-like option, such as --contains, it implicitly provides
--list. Before this change "tag" would error out on those sorts of
invocations. I.e. while both of these worked for "branch":
git branch --contains v2.8.0 <pattern>
git branch --list --contains v2.8.0 <pattern>
Only the latter form worked for "tag":
git tag --contains v2.8.0 '*rc*'
git tag --list --contains v2.8.0 '*rc*'
Now "tag", like "branch", will implicitly supply --list when a
list-like option is provided, and no other conflicting non-list
options (such as -d) are present on the command-line.
Spelunking through the history via:
git log --reverse -p -G'only allowed with' -- '*builtin*tag*c'
Reveals that there was no good reason for not allowing this in the
first place. The --contains option added in 32c35cfb1e ("git-tag: Add
--contains option", 2009-01-26) made this an error. All the other
subsequent list-like options that were added copied its pattern of
making this usage an error.
The only tests that break as a result of this change are tests that
were explicitly checking that this "branch-like" usage wasn't
permitted. Change those failing tests to check that this invocation
mode is permitted, add extra tests for the list-like options we
weren't testing, and tests to ensure that e.g. we don't toggle the
list mode in the presence of other conflicting non-list options.
With this change errors messages such as "--contains option is only
allowed with -l" don't make sense anymore, since options like
--contain turn on -l. Instead we error out when list-like options such
as --contain are used in conjunction with conflicting options such as
-d or -v.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:55 +00:00
|
|
|
git tag -n0 | grep "^tag-one-line" >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git tag -n0 tag-one-line >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
2007-07-10 23:11:53 +00:00
|
|
|
echo "tag-one-line A msg" >expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n1 -l | grep "^tag-one-line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n -l | grep "^tag-one-line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n1 -l tag-one-line >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n2 -l tag-one-line >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n999 -l tag-one-line >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-07-10 23:11:53 +00:00
|
|
|
'
|
|
|
|
|
tag: implicitly supply --list given another list-like option
Change the "tag" command to implicitly turn on its --list mode when
provided with a list-like option such as --contains, --points-at etc.
This is for consistency with how "branch" works. When "branch" is
given a list-like option, such as --contains, it implicitly provides
--list. Before this change "tag" would error out on those sorts of
invocations. I.e. while both of these worked for "branch":
git branch --contains v2.8.0 <pattern>
git branch --list --contains v2.8.0 <pattern>
Only the latter form worked for "tag":
git tag --contains v2.8.0 '*rc*'
git tag --list --contains v2.8.0 '*rc*'
Now "tag", like "branch", will implicitly supply --list when a
list-like option is provided, and no other conflicting non-list
options (such as -d) are present on the command-line.
Spelunking through the history via:
git log --reverse -p -G'only allowed with' -- '*builtin*tag*c'
Reveals that there was no good reason for not allowing this in the
first place. The --contains option added in 32c35cfb1e ("git-tag: Add
--contains option", 2009-01-26) made this an error. All the other
subsequent list-like options that were added copied its pattern of
making this usage an error.
The only tests that break as a result of this change are tests that
were explicitly checking that this "branch-like" usage wasn't
permitted. Change those failing tests to check that this invocation
mode is permitted, add extra tests for the list-like options we
weren't testing, and tests to ensure that e.g. we don't toggle the
list mode in the presence of other conflicting non-list options.
With this change errors messages such as "--contains option is only
allowed with -l" don't make sense anymore, since options like
--contain turn on -l. Instead we error out when list-like options such
as --contain are used in conjunction with conflicting options such as
-d or -v.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:55 +00:00
|
|
|
test_expect_success 'The -n 100 invocation means -n --list 100, not -n100' '
|
|
|
|
git tag -n 100 >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual &&
|
tag: implicitly supply --list given another list-like option
Change the "tag" command to implicitly turn on its --list mode when
provided with a list-like option such as --contains, --points-at etc.
This is for consistency with how "branch" works. When "branch" is
given a list-like option, such as --contains, it implicitly provides
--list. Before this change "tag" would error out on those sorts of
invocations. I.e. while both of these worked for "branch":
git branch --contains v2.8.0 <pattern>
git branch --list --contains v2.8.0 <pattern>
Only the latter form worked for "tag":
git tag --contains v2.8.0 '*rc*'
git tag --list --contains v2.8.0 '*rc*'
Now "tag", like "branch", will implicitly supply --list when a
list-like option is provided, and no other conflicting non-list
options (such as -d) are present on the command-line.
Spelunking through the history via:
git log --reverse -p -G'only allowed with' -- '*builtin*tag*c'
Reveals that there was no good reason for not allowing this in the
first place. The --contains option added in 32c35cfb1e ("git-tag: Add
--contains option", 2009-01-26) made this an error. All the other
subsequent list-like options that were added copied its pattern of
making this usage an error.
The only tests that break as a result of this change are tests that
were explicitly checking that this "branch-like" usage wasn't
permitted. Change those failing tests to check that this invocation
mode is permitted, add extra tests for the list-like options we
weren't testing, and tests to ensure that e.g. we don't toggle the
list mode in the presence of other conflicting non-list options.
With this change errors messages such as "--contains option is only
allowed with -l" don't make sense anymore, since options like
--contain turn on -l. Instead we error out when list-like options such
as --contain are used in conjunction with conflicting options such as
-d or -v.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:55 +00:00
|
|
|
|
|
|
|
git tag -m "A msg" 100 &&
|
|
|
|
echo "100 A msg" >expect &&
|
|
|
|
git tag -n 100 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2007-07-10 23:11:53 +00:00
|
|
|
test_expect_success \
|
|
|
|
'listing the zero-lines message of a non-signed tag should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -m "" tag-zero-lines &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo "tag-zero-lines" >expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l | grep "^tag-zero-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n0 -l | grep "^tag-zero-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n0 -l tag-zero-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo "tag-zero-lines " >expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n1 -l | grep "^tag-zero-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n -l | grep "^tag-zero-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n1 -l tag-zero-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n2 -l tag-zero-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n999 -l tag-zero-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-07-10 23:11:53 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
echo 'tag line one' >annotagmsg
|
|
|
|
echo 'tag line two' >>annotagmsg
|
|
|
|
echo 'tag line three' >>annotagmsg
|
|
|
|
test_expect_success \
|
|
|
|
'listing many message lines of a non-signed tag should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -F annotagmsg tag-lines &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo "tag-lines" >expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l | grep "^tag-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n0 -l | grep "^tag-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n0 -l tag-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo "tag-lines tag line one" >expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n1 -l | grep "^tag-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n -l | grep "^tag-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n1 -l tag-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo " tag line two" >>expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n2 -l | grep "^ *tag.line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n2 -l tag-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo " tag line three" >>expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n3 -l | grep "^ *tag.line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n3 -l tag-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n4 -l | grep "^ *tag.line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n4 -l tag-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n99 -l | grep "^ *tag.line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n99 -l tag-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-07-10 23:11:53 +00:00
|
|
|
'
|
|
|
|
|
2012-02-06 18:13:27 +00:00
|
|
|
test_expect_success 'annotations for blobs are empty' '
|
|
|
|
blob=$(git hash-object -w --stdin <<-\EOF
|
|
|
|
Blob paragraph 1.
|
|
|
|
|
|
|
|
Blob paragraph 2.
|
|
|
|
EOF
|
|
|
|
) &&
|
|
|
|
git tag tag-blob $blob &&
|
|
|
|
echo "tag-blob " >expect &&
|
|
|
|
git tag -n1 -l tag-blob >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
# trying to verify annotated non-signed tags:
|
|
|
|
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'trying to verify an annotated non-signed tag should fail' '
|
|
|
|
tag_exists annotated-tag &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -v annotated-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'trying to verify a file-annotated non-signed tag should fail' '
|
|
|
|
tag_exists file-annotated-tag &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -v file-annotated-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-07-19 23:42:28 +00:00
|
|
|
'trying to verify two annotated non-signed tags should fail' '
|
|
|
|
tag_exists annotated-tag file-annotated-tag &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -v annotated-tag file-annotated-tag
|
2007-07-19 23:42:28 +00:00
|
|
|
'
|
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
# creating and verifying signed tags:
|
|
|
|
|
|
|
|
get_tag_header signed-tag $commit commit $time >expect
|
|
|
|
echo 'A signed tag message' >>expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG 'creating a signed tag with -m message should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -m "A signed tag message" signed-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
2007-12-11 04:08:06 +00:00
|
|
|
get_tag_header u-signed-tag $commit commit $time >expect
|
|
|
|
echo 'Another message' >>expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG 'sign with a given key id' '
|
2007-12-11 04:08:06 +00:00
|
|
|
|
|
|
|
git tag -u committer@example.com -m "Another message" u-signed-tag &&
|
|
|
|
get_tag_msg u-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-12-11 04:08:06 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG 'sign with an unknown id (1)' '
|
2007-12-11 04:08:06 +00:00
|
|
|
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git tag -u author@example.com \
|
|
|
|
-m "Another message" o-signed-tag
|
2007-12-11 04:08:06 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG 'sign with an unknown id (2)' '
|
2007-12-11 04:08:06 +00:00
|
|
|
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git tag -u DEADBEEF -m "Another message" o-signed-tag
|
2007-12-11 04:08:06 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >fakeeditor <<'EOF'
|
|
|
|
#!/bin/sh
|
|
|
|
test -n "$1" && exec >"$1"
|
|
|
|
echo A signed tag message
|
|
|
|
echo from a fake editor.
|
|
|
|
EOF
|
|
|
|
chmod +x fakeeditor
|
|
|
|
|
|
|
|
get_tag_header implied-sign $commit commit $time >expect
|
|
|
|
./fakeeditor >>expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG '-u implies signed tag' '
|
2008-09-03 08:59:31 +00:00
|
|
|
GIT_EDITOR=./fakeeditor git tag -u CDDE430D implied-sign &&
|
2007-12-11 04:08:06 +00:00
|
|
|
get_tag_msg implied-sign >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-12-11 04:08:06 +00:00
|
|
|
'
|
|
|
|
|
2007-07-19 23:42:28 +00:00
|
|
|
cat >sigmsgfile <<EOF
|
|
|
|
Another signed tag
|
|
|
|
message in a file.
|
|
|
|
EOF
|
|
|
|
get_tag_header file-signed-tag $commit commit $time >expect
|
|
|
|
cat sigmsgfile >>expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-07-19 23:42:28 +00:00
|
|
|
'creating a signed tag with -F messagefile should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -F sigmsgfile file-signed-tag &&
|
2007-07-19 23:42:28 +00:00
|
|
|
get_tag_msg file-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-07-19 23:42:28 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
cat >siginputmsg <<EOF
|
|
|
|
A signed tag message from
|
|
|
|
the standard input
|
|
|
|
EOF
|
|
|
|
get_tag_header stdin-signed-tag $commit commit $time >expect
|
|
|
|
cat siginputmsg >>expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG 'creating a signed tag with -F - should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -F - stdin-signed-tag <siginputmsg &&
|
2007-07-19 23:42:28 +00:00
|
|
|
get_tag_msg stdin-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-07-19 23:42:28 +00:00
|
|
|
'
|
|
|
|
|
2007-11-26 04:50:58 +00:00
|
|
|
get_tag_header implied-annotate $commit commit $time >expect
|
|
|
|
./fakeeditor >>expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG '-s implies annotated tag' '
|
2008-09-03 08:59:31 +00:00
|
|
|
GIT_EDITOR=./fakeeditor git tag -s implied-annotate &&
|
2007-11-26 04:50:58 +00:00
|
|
|
get_tag_msg implied-annotate >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-11-26 04:50:58 +00:00
|
|
|
'
|
|
|
|
|
2016-03-22 20:41:26 +00:00
|
|
|
get_tag_header forcesignannotated-implied-sign $commit commit $time >expect
|
|
|
|
echo "A message" >>expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
|
|
|
test_expect_success GPG \
|
|
|
|
'git tag -s implied if configured with tag.forcesignannotated' \
|
|
|
|
'test_config tag.forcesignannotated true &&
|
|
|
|
git tag -m "A message" forcesignannotated-implied-sign &&
|
|
|
|
get_tag_msg forcesignannotated-implied-sign >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GPG \
|
|
|
|
'lightweight with no message when configured with tag.forcesignannotated' \
|
|
|
|
'test_config tag.forcesignannotated true &&
|
|
|
|
git tag forcesignannotated-lightweight &&
|
|
|
|
tag_exists forcesignannotated-lightweight &&
|
|
|
|
test_must_fail git tag -v forcesignannotated-no-message
|
|
|
|
'
|
|
|
|
|
|
|
|
get_tag_header forcesignannotated-annotate $commit commit $time >expect
|
|
|
|
echo "A message" >>expect
|
|
|
|
test_expect_success GPG \
|
|
|
|
'git tag -a disable configured tag.forcesignannotated' \
|
|
|
|
'test_config tag.forcesignannotated true &&
|
|
|
|
git tag -a -m "A message" forcesignannotated-annotate &&
|
|
|
|
get_tag_msg forcesignannotated-annotate >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
test_must_fail git tag -v forcesignannotated-annotate
|
|
|
|
'
|
|
|
|
|
|
|
|
get_tag_header forcesignannotated-disabled $commit commit $time >expect
|
|
|
|
echo "A message" >>expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
|
|
|
test_expect_success GPG \
|
|
|
|
'git tag --sign enable GPG sign' \
|
|
|
|
'test_config tag.forcesignannotated false &&
|
|
|
|
git tag --sign -m "A message" forcesignannotated-disabled &&
|
|
|
|
get_tag_msg forcesignannotated-disabled >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-07-21 12:13:12 +00:00
|
|
|
'trying to create a signed tag with non-existing -F file should fail' '
|
|
|
|
! test -f nonexistingfile &&
|
|
|
|
! tag_exists nosigtag &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -s -F nonexistingfile nosigtag &&
|
2007-07-21 12:13:12 +00:00
|
|
|
! tag_exists nosigtag
|
|
|
|
'
|
|
|
|
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG 'verifying a signed tag should succeed' \
|
2008-09-03 08:59:31 +00:00
|
|
|
'git tag -v signed-tag'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG 'verifying two signed tags in one command should succeed' \
|
2008-09-03 08:59:31 +00:00
|
|
|
'git tag -v signed-tag file-signed-tag'
|
2007-07-19 23:42:28 +00:00
|
|
|
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-07-19 23:42:28 +00:00
|
|
|
'verifying many signed and non-signed tags should fail' '
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -v signed-tag annotated-tag &&
|
|
|
|
test_must_fail git tag -v file-annotated-tag file-signed-tag &&
|
|
|
|
test_must_fail git tag -v annotated-tag \
|
2008-07-12 15:47:52 +00:00
|
|
|
file-signed-tag file-annotated-tag &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -v signed-tag annotated-tag file-signed-tag
|
2007-07-19 23:42:28 +00:00
|
|
|
'
|
|
|
|
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG 'verifying a forged tag should fail' '
|
2007-06-28 20:09:12 +00:00
|
|
|
forged=$(git cat-file tag signed-tag |
|
|
|
|
sed -e "s/signed-tag/forged-tag/" |
|
|
|
|
git mktag) &&
|
|
|
|
git tag forged-tag $forged &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git tag -v forged-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
t7004, t7030: fix here-doc syntax errors
Jan Palus noticed that some here-doc are spelled incorrectly,
resulting the entire remainder of the test snippet being slurped
into the "expect" file as if it were data, e.g. in this sequence
cat >expect <<EOF &&
... expectation ...
EOF
git $cmd_being_tested >actual &&
test_cmp expect actual
the last command of the test is "cat" that sends everything to
'expect' and succeeds.
Fixing these issues in t7004 and t7030 reveals that "git tag -v"
and "git verify-tag" with their --format option do not work as the
test was expecting originally. Instead of showing both valid tags
and tags with incorrect signatures on their output, tags that do not
pass verification are omitted from the output. Another breakage that
is uncovered is that these tests must be restricted to environment
where gpg is available.
Arguably, that is a safer behaviour, and because the format
specifiers like %(tag) do not have a way to show if the signature
verifies correctly, the command with the --format option cannot be
used to get a list of tags annotated with their signature validity
anyway.
For now, let's fix the here-doc syntax, update the expectation to
match the reality, and update the test prerequisite.
Maybe later when we extend the --format language available to "git
tag -v" and "git verify-tag" to include things like "%(gpg:status)",
we may want to change the behaviour so that piping a list of tag
names into
xargs git verify-tag --format='%(gpg:status) %(tag)'
becomes a good way to produce such a list, but that is a separate
topic.
Noticed-by: Jan Palus <jan.palus@gmail.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Santiago Torres <santiago@nyu.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-23 22:28:47 +00:00
|
|
|
test_expect_success GPG 'verifying a proper tag with --format pass and format accordingly' '
|
|
|
|
cat >expect <<-\EOF &&
|
2017-01-17 23:37:23 +00:00
|
|
|
tagname : signed-tag
|
t7004, t7030: fix here-doc syntax errors
Jan Palus noticed that some here-doc are spelled incorrectly,
resulting the entire remainder of the test snippet being slurped
into the "expect" file as if it were data, e.g. in this sequence
cat >expect <<EOF &&
... expectation ...
EOF
git $cmd_being_tested >actual &&
test_cmp expect actual
the last command of the test is "cat" that sends everything to
'expect' and succeeds.
Fixing these issues in t7004 and t7030 reveals that "git tag -v"
and "git verify-tag" with their --format option do not work as the
test was expecting originally. Instead of showing both valid tags
and tags with incorrect signatures on their output, tags that do not
pass verification are omitted from the output. Another breakage that
is uncovered is that these tests must be restricted to environment
where gpg is available.
Arguably, that is a safer behaviour, and because the format
specifiers like %(tag) do not have a way to show if the signature
verifies correctly, the command with the --format option cannot be
used to get a list of tags annotated with their signature validity
anyway.
For now, let's fix the here-doc syntax, update the expectation to
match the reality, and update the test prerequisite.
Maybe later when we extend the --format language available to "git
tag -v" and "git verify-tag" to include things like "%(gpg:status)",
we may want to change the behaviour so that piping a list of tag
names into
xargs git verify-tag --format='%(gpg:status) %(tag)'
becomes a good way to produce such a list, but that is a separate
topic.
Noticed-by: Jan Palus <jan.palus@gmail.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Santiago Torres <santiago@nyu.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-23 22:28:47 +00:00
|
|
|
EOF
|
2017-01-17 23:37:23 +00:00
|
|
|
git tag -v --format="tagname : %(tag)" "signed-tag" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
t7004, t7030: fix here-doc syntax errors
Jan Palus noticed that some here-doc are spelled incorrectly,
resulting the entire remainder of the test snippet being slurped
into the "expect" file as if it were data, e.g. in this sequence
cat >expect <<EOF &&
... expectation ...
EOF
git $cmd_being_tested >actual &&
test_cmp expect actual
the last command of the test is "cat" that sends everything to
'expect' and succeeds.
Fixing these issues in t7004 and t7030 reveals that "git tag -v"
and "git verify-tag" with their --format option do not work as the
test was expecting originally. Instead of showing both valid tags
and tags with incorrect signatures on their output, tags that do not
pass verification are omitted from the output. Another breakage that
is uncovered is that these tests must be restricted to environment
where gpg is available.
Arguably, that is a safer behaviour, and because the format
specifiers like %(tag) do not have a way to show if the signature
verifies correctly, the command with the --format option cannot be
used to get a list of tags annotated with their signature validity
anyway.
For now, let's fix the here-doc syntax, update the expectation to
match the reality, and update the test prerequisite.
Maybe later when we extend the --format language available to "git
tag -v" and "git verify-tag" to include things like "%(gpg:status)",
we may want to change the behaviour so that piping a list of tag
names into
xargs git verify-tag --format='%(gpg:status) %(tag)'
becomes a good way to produce such a list, but that is a separate
topic.
Noticed-by: Jan Palus <jan.palus@gmail.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Santiago Torres <santiago@nyu.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-23 22:28:47 +00:00
|
|
|
test_expect_success GPG 'verifying a forged tag with --format should fail silently' '
|
2017-01-17 23:37:23 +00:00
|
|
|
test_must_fail git tag -v --format="tagname : %(tag)" "forged-tag" >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual
|
2017-01-17 23:37:23 +00:00
|
|
|
'
|
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
# blank and empty messages for signed tags:
|
|
|
|
|
|
|
|
get_tag_header empty-signed-tag $commit commit $time >expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'creating a signed tag with an empty -m message should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -m "" empty-signed-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg empty-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -v empty-signed-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
>sigemptyfile
|
|
|
|
get_tag_header emptyfile-signed-tag $commit commit $time >expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'creating a signed tag with an empty -F messagefile should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -F sigemptyfile emptyfile-signed-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg emptyfile-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -v emptyfile-signed-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
printf '\n\n \n\t\nLeading blank lines\n' > sigblanksfile
|
|
|
|
printf '\n\t \t \nRepeated blank lines\n' >>sigblanksfile
|
|
|
|
printf '\n\n\nTrailing spaces \t \n' >>sigblanksfile
|
|
|
|
printf '\nTrailing blank lines\n\n\t \n\n' >>sigblanksfile
|
|
|
|
get_tag_header blanks-signed-tag $commit commit $time >expect
|
|
|
|
cat >>expect <<EOF
|
|
|
|
Leading blank lines
|
|
|
|
|
|
|
|
Repeated blank lines
|
|
|
|
|
|
|
|
Trailing spaces
|
|
|
|
|
|
|
|
Trailing blank lines
|
|
|
|
EOF
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'extra blanks in the message for a signed tag should be removed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -F sigblanksfile blanks-signed-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg blanks-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -v blanks-signed-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
get_tag_header blank-signed-tag $commit commit $time >expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'creating a signed tag with a blank -m message should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -m " " blank-signed-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg blank-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -v blank-signed-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
echo ' ' >sigblankfile
|
|
|
|
echo '' >>sigblankfile
|
|
|
|
echo ' ' >>sigblankfile
|
|
|
|
get_tag_header blankfile-signed-tag $commit commit $time >expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'creating a signed tag with blank -F file with spaces should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -F sigblankfile blankfile-signed-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg blankfile-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -v blankfile-signed-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
printf ' ' >sigblanknonlfile
|
|
|
|
get_tag_header blanknonlfile-signed-tag $commit commit $time >expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'creating a signed tag with spaces and no newline should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -F sigblanknonlfile blanknonlfile-signed-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg blanknonlfile-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2018-04-13 21:18:29 +00:00
|
|
|
git tag -v blanknonlfile-signed-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
2018-04-13 21:18:35 +00:00
|
|
|
test_expect_success GPG 'signed tag with embedded PGP message' '
|
|
|
|
cat >msg <<-\EOF &&
|
|
|
|
-----BEGIN PGP MESSAGE-----
|
|
|
|
|
|
|
|
this is not a real PGP message
|
|
|
|
-----END PGP MESSAGE-----
|
|
|
|
EOF
|
|
|
|
git tag -s -F msg confusing-pgp-message &&
|
|
|
|
git tag -v confusing-pgp-message
|
|
|
|
'
|
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
# messages with commented lines for signed tags:
|
|
|
|
|
|
|
|
cat >sigcommentsfile <<EOF
|
|
|
|
# A comment
|
|
|
|
|
|
|
|
############
|
|
|
|
The message.
|
|
|
|
############
|
|
|
|
One line.
|
|
|
|
|
|
|
|
|
|
|
|
# commented lines
|
|
|
|
# commented lines
|
|
|
|
|
|
|
|
Another line.
|
|
|
|
# comments
|
|
|
|
|
|
|
|
Last line.
|
|
|
|
EOF
|
|
|
|
get_tag_header comments-signed-tag $commit commit $time >expect
|
|
|
|
cat >>expect <<EOF
|
|
|
|
The message.
|
|
|
|
One line.
|
|
|
|
|
|
|
|
Another line.
|
|
|
|
|
|
|
|
Last line.
|
|
|
|
EOF
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'creating a signed tag with a -F file with #comments should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -F sigcommentsfile comments-signed-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg comments-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -v comments-signed-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
get_tag_header comment-signed-tag $commit commit $time >expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'creating a signed tag with #commented -m message should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -m "#comment" comment-signed-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg comment-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -v comment-signed-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
echo '#comment' >sigcommentfile
|
|
|
|
echo '' >>sigcommentfile
|
|
|
|
echo '####' >>sigcommentfile
|
|
|
|
get_tag_header commentfile-signed-tag $commit commit $time >expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'creating a signed tag with #commented -F messagefile should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -F sigcommentfile commentfile-signed-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg commentfile-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -v commentfile-signed-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
printf '#comment' >sigcommentnonlfile
|
|
|
|
get_tag_header commentnonlfile-signed-tag $commit commit $time >expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'creating a signed tag with a #comment and no newline should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -F sigcommentnonlfile commentnonlfile-signed-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg commentnonlfile-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -v commentnonlfile-signed-tag
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
2007-07-10 23:11:53 +00:00
|
|
|
# listing messages for signed tags:
|
|
|
|
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-07-10 23:11:53 +00:00
|
|
|
'listing the one-line message of a signed tag should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -m "A message line signed" stag-one-line &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo "stag-one-line" >expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l | grep "^stag-one-line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n0 -l | grep "^stag-one-line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n0 -l stag-one-line >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo "stag-one-line A message line signed" >expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n1 -l | grep "^stag-one-line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n -l | grep "^stag-one-line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n1 -l stag-one-line >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n2 -l stag-one-line >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n999 -l stag-one-line >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-07-10 23:11:53 +00:00
|
|
|
'
|
|
|
|
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-07-10 23:11:53 +00:00
|
|
|
'listing the zero-lines message of a signed tag should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -m "" stag-zero-lines &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo "stag-zero-lines" >expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l | grep "^stag-zero-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n0 -l | grep "^stag-zero-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n0 -l stag-zero-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo "stag-zero-lines " >expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n1 -l | grep "^stag-zero-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n -l | grep "^stag-zero-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n1 -l stag-zero-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n2 -l stag-zero-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n999 -l stag-zero-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-07-10 23:11:53 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
echo 'stag line one' >sigtagmsg
|
|
|
|
echo 'stag line two' >>sigtagmsg
|
|
|
|
echo 'stag line three' >>sigtagmsg
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-07-10 23:11:53 +00:00
|
|
|
'listing many message lines of a signed tag should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -F sigtagmsg stag-lines &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo "stag-lines" >expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -l | grep "^stag-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n0 -l | grep "^stag-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n0 -l stag-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo "stag-lines stag line one" >expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n1 -l | grep "^stag-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n -l | grep "^stag-lines" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n1 -l stag-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo " stag line two" >>expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n2 -l | grep "^ *stag.line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n2 -l stag-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2007-07-10 23:11:53 +00:00
|
|
|
|
|
|
|
echo " stag line three" >>expect &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n3 -l | grep "^ *stag.line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n3 -l stag-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n4 -l | grep "^ *stag.line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n4 -l stag-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n99 -l | grep "^ *stag.line" >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -n99 -l stag-lines >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-07-10 23:11:53 +00:00
|
|
|
'
|
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
# tags pointing to objects different from commits:
|
|
|
|
|
|
|
|
tree=$(git rev-parse HEAD^{tree})
|
|
|
|
blob=$(git rev-parse HEAD:foo)
|
2009-03-16 14:09:23 +00:00
|
|
|
tag=$(git rev-parse signed-tag 2>/dev/null)
|
2007-06-28 20:09:12 +00:00
|
|
|
|
|
|
|
get_tag_header tree-signed-tag $tree tree $time >expect
|
|
|
|
echo "A message for a tree" >>expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'creating a signed tag pointing to a tree should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -m "A message for a tree" tree-signed-tag HEAD^{tree} &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg tree-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
get_tag_header blob-signed-tag $blob blob $time >expect
|
|
|
|
echo "A message for a blob" >>expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'creating a signed tag pointing to a blob should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -m "A message for a blob" blob-signed-tag HEAD:foo &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg blob-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
get_tag_header tag-signed-tag $tag tag $time >expect
|
|
|
|
echo "A message for another tag" >>expect
|
|
|
|
echo '-----BEGIN PGP SIGNATURE-----' >>expect
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'creating a signed tag pointing to another tag should succeed' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git tag -s -m "A message for another tag" tag-signed-tag signed-tag &&
|
2007-06-28 20:09:12 +00:00
|
|
|
get_tag_msg tag-signed-tag >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-06-28 20:09:12 +00:00
|
|
|
'
|
|
|
|
|
2010-11-10 11:17:26 +00:00
|
|
|
# usage with rfc1991 signatures
|
|
|
|
get_tag_header rfc1991-signed-tag $commit commit $time >expect
|
|
|
|
echo "RFC1991 signed tag" >>expect
|
|
|
|
echo '-----BEGIN PGP MESSAGE-----' >>expect
|
2014-12-12 08:50:13 +00:00
|
|
|
test_expect_success GPG,RFC1991 \
|
2010-11-10 11:17:26 +00:00
|
|
|
'creating a signed tag with rfc1991' '
|
2012-12-18 19:26:24 +00:00
|
|
|
echo "rfc1991" >gpghome/gpg.conf &&
|
2010-11-10 11:17:26 +00:00
|
|
|
git tag -s -m "RFC1991 signed tag" rfc1991-signed-tag $commit &&
|
|
|
|
get_tag_msg rfc1991-signed-tag >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >fakeeditor <<'EOF'
|
|
|
|
#!/bin/sh
|
|
|
|
cp "$1" actual
|
|
|
|
EOF
|
|
|
|
chmod +x fakeeditor
|
|
|
|
|
2014-12-12 08:50:13 +00:00
|
|
|
test_expect_success GPG,RFC1991 \
|
2010-11-10 11:17:26 +00:00
|
|
|
'reediting a signed tag body omits signature' '
|
2012-12-18 19:26:24 +00:00
|
|
|
echo "rfc1991" >gpghome/gpg.conf &&
|
2010-11-10 11:17:26 +00:00
|
|
|
echo "RFC1991 signed tag" >expect &&
|
|
|
|
GIT_EDITOR=./fakeeditor git tag -f -s rfc1991-signed-tag $commit &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2014-12-12 08:50:13 +00:00
|
|
|
test_expect_success GPG,RFC1991 \
|
2010-11-10 11:17:26 +00:00
|
|
|
'verifying rfc1991 signature' '
|
2012-12-18 19:26:24 +00:00
|
|
|
echo "rfc1991" >gpghome/gpg.conf &&
|
2010-11-10 11:17:26 +00:00
|
|
|
git tag -v rfc1991-signed-tag
|
|
|
|
'
|
|
|
|
|
2014-12-12 08:50:13 +00:00
|
|
|
test_expect_success GPG,RFC1991 \
|
2010-11-10 11:17:26 +00:00
|
|
|
'list tag with rfc1991 signature' '
|
2012-12-18 19:26:24 +00:00
|
|
|
echo "rfc1991" >gpghome/gpg.conf &&
|
2010-11-10 11:17:26 +00:00
|
|
|
echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
|
|
|
|
git tag -l -n1 rfc1991-signed-tag >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git tag -l -n2 rfc1991-signed-tag >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git tag -l -n999 rfc1991-signed-tag >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
rm -f gpghome/gpg.conf
|
|
|
|
|
2014-12-12 08:50:13 +00:00
|
|
|
test_expect_success GPG,RFC1991 \
|
2010-11-10 11:17:26 +00:00
|
|
|
'verifying rfc1991 signature without --rfc1991' '
|
|
|
|
git tag -v rfc1991-signed-tag
|
|
|
|
'
|
|
|
|
|
2014-12-12 08:50:13 +00:00
|
|
|
test_expect_success GPG,RFC1991 \
|
2010-11-10 11:17:26 +00:00
|
|
|
'list tag with rfc1991 signature without --rfc1991' '
|
|
|
|
echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
|
|
|
|
git tag -l -n1 rfc1991-signed-tag >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git tag -l -n2 rfc1991-signed-tag >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git tag -l -n999 rfc1991-signed-tag >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2014-12-12 08:50:13 +00:00
|
|
|
test_expect_success GPG,RFC1991 \
|
2010-11-10 11:17:26 +00:00
|
|
|
'reediting a signed tag body omits signature' '
|
|
|
|
echo "RFC1991 signed tag" >expect &&
|
|
|
|
GIT_EDITOR=./fakeeditor git tag -f -s rfc1991-signed-tag $commit &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2007-09-09 00:39:29 +00:00
|
|
|
# try to sign with bad user.signingkey
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2016-06-17 23:38:59 +00:00
|
|
|
'git tag -s fails if gpg is misconfigured (bad key)' \
|
2016-12-08 14:23:56 +00:00
|
|
|
'test_config user.signingkey BobTheMouse &&
|
|
|
|
test_must_fail git tag -s -m tail tag-gpg-failure'
|
2007-09-09 00:39:29 +00:00
|
|
|
|
2016-06-17 23:38:59 +00:00
|
|
|
# try to produce invalid signature
|
|
|
|
test_expect_success GPG \
|
|
|
|
'git tag -s fails if gpg is misconfigured (bad signature format)' \
|
|
|
|
'test_config gpg.program echo &&
|
|
|
|
test_must_fail git tag -s -m tail tag-gpg-failure'
|
|
|
|
|
2018-07-20 08:28:07 +00:00
|
|
|
# try to sign with bad user.signingkey
|
|
|
|
test_expect_success GPGSM \
|
|
|
|
'git tag -s fails if gpgsm is misconfigured (bad key)' \
|
|
|
|
'test_config user.signingkey BobTheMouse &&
|
|
|
|
test_config gpg.format x509 &&
|
|
|
|
test_must_fail git tag -s -m tail tag-gpg-failure'
|
|
|
|
|
|
|
|
# try to produce invalid signature
|
|
|
|
test_expect_success GPGSM \
|
|
|
|
'git tag -s fails if gpgsm is misconfigured (bad signature format)' \
|
|
|
|
'test_config gpg.x509.program echo &&
|
|
|
|
test_config gpg.format x509 &&
|
|
|
|
test_must_fail git tag -s -m tail tag-gpg-failure'
|
2016-06-17 23:38:59 +00:00
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
# try to verify without gpg:
|
|
|
|
|
|
|
|
rm -rf gpghome
|
2009-03-16 14:09:23 +00:00
|
|
|
test_expect_success GPG \
|
2007-06-28 20:09:12 +00:00
|
|
|
'verify signed tag fails when public key is not present' \
|
2008-09-03 08:59:31 +00:00
|
|
|
'test_must_fail git tag -v signed-tag'
|
2007-06-28 20:09:12 +00:00
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success \
|
2008-09-03 08:59:31 +00:00
|
|
|
'git tag -a fails if tag annotation is empty' '
|
2008-02-01 09:50:53 +00:00
|
|
|
! (GIT_EDITOR=cat git tag -a initial-comment)
|
2007-11-16 22:02:08 +00:00
|
|
|
'
|
|
|
|
|
2007-11-04 00:11:15 +00:00
|
|
|
test_expect_success \
|
|
|
|
'message in editor has initial comment' '
|
2010-11-14 14:44:15 +00:00
|
|
|
! (GIT_EDITOR=cat git tag -a initial-comment > actual)
|
|
|
|
'
|
|
|
|
|
2011-04-12 23:33:39 +00:00
|
|
|
test_expect_success 'message in editor has initial comment: first line' '
|
2007-11-16 22:02:08 +00:00
|
|
|
# check the first line --- should be empty
|
2010-11-14 14:44:15 +00:00
|
|
|
echo >first.expect &&
|
|
|
|
sed -e 1q <actual >first.actual &&
|
2011-04-12 23:33:39 +00:00
|
|
|
test_i18ncmp first.expect first.actual
|
2010-11-14 14:44:15 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'message in editor has initial comment: remainder' '
|
2007-11-16 22:02:08 +00:00
|
|
|
# remove commented lines from the remainder -- should be empty
|
2015-03-20 10:13:29 +00:00
|
|
|
sed -e 1d -e "/^#/d" <actual >rest.actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty rest.actual
|
2007-11-04 00:11:15 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
get_tag_header reuse $commit commit $time >expect
|
|
|
|
echo "An annotation to be reused" >> expect
|
|
|
|
test_expect_success \
|
|
|
|
'overwriting an annoted tag should use its previous body' '
|
|
|
|
git tag -a -m "An annotation to be reused" reuse &&
|
|
|
|
GIT_EDITOR=true git tag -f -a reuse &&
|
|
|
|
get_tag_msg reuse >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2007-11-04 00:11:15 +00:00
|
|
|
'
|
|
|
|
|
2008-08-06 18:43:47 +00:00
|
|
|
test_expect_success 'filename for the message is relative to cwd' '
|
|
|
|
mkdir subdir &&
|
|
|
|
echo "Tag message in top directory" >msgfile-5 &&
|
|
|
|
echo "Tag message in sub directory" >subdir/msgfile-5 &&
|
|
|
|
(
|
|
|
|
cd subdir &&
|
|
|
|
git tag -a -F msgfile-5 tag-from-subdir
|
|
|
|
) &&
|
|
|
|
git cat-file tag tag-from-subdir | grep "in sub directory"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'filename for the message is relative to cwd' '
|
|
|
|
echo "Tag message in sub directory" >subdir/msgfile-6 &&
|
|
|
|
(
|
|
|
|
cd subdir &&
|
|
|
|
git tag -a -F msgfile-6 tag-from-subdir-2
|
|
|
|
) &&
|
|
|
|
git cat-file tag tag-from-subdir-2 | grep "in sub directory"
|
|
|
|
'
|
|
|
|
|
2009-01-26 14:13:25 +00:00
|
|
|
# create a few more commits to test --contains
|
|
|
|
|
|
|
|
hash1=$(git rev-parse HEAD)
|
|
|
|
|
|
|
|
test_expect_success 'creating second commit and tag' '
|
|
|
|
echo foo-2.0 >foo &&
|
|
|
|
git add foo &&
|
2010-10-31 07:30:58 +00:00
|
|
|
git commit -m second &&
|
2009-01-26 14:13:25 +00:00
|
|
|
git tag v2.0
|
|
|
|
'
|
|
|
|
|
|
|
|
hash2=$(git rev-parse HEAD)
|
|
|
|
|
|
|
|
test_expect_success 'creating third commit without tag' '
|
|
|
|
echo foo-dev >foo &&
|
|
|
|
git add foo &&
|
|
|
|
git commit -m third
|
|
|
|
'
|
|
|
|
|
|
|
|
hash3=$(git rev-parse HEAD)
|
|
|
|
|
|
|
|
# simple linear checks of --continue
|
|
|
|
|
|
|
|
cat > expected <<EOF
|
|
|
|
v0.2.1
|
|
|
|
v1.0
|
|
|
|
v1.0.1
|
|
|
|
v1.1.3
|
|
|
|
v2.0
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'checking that first commit is in all tags (hash)' "
|
2010-10-31 07:30:58 +00:00
|
|
|
git tag -l --contains $hash1 v* >actual &&
|
2009-01-26 14:13:25 +00:00
|
|
|
test_cmp expected actual
|
|
|
|
"
|
|
|
|
|
|
|
|
# other ways of specifying the commit
|
|
|
|
test_expect_success 'checking that first commit is in all tags (tag)' "
|
2010-10-31 07:30:58 +00:00
|
|
|
git tag -l --contains v1.0 v* >actual &&
|
2009-01-26 14:13:25 +00:00
|
|
|
test_cmp expected actual
|
|
|
|
"
|
|
|
|
|
|
|
|
test_expect_success 'checking that first commit is in all tags (relative)' "
|
2010-10-31 07:30:58 +00:00
|
|
|
git tag -l --contains HEAD~2 v* >actual &&
|
2009-01-26 14:13:25 +00:00
|
|
|
test_cmp expected actual
|
|
|
|
"
|
|
|
|
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
# All the --contains tests above, but with --no-contains
|
|
|
|
test_expect_success 'checking that first commit is not listed in any tag with --no-contains (hash)' "
|
|
|
|
git tag -l --no-contains $hash1 v* >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
"
|
|
|
|
|
|
|
|
test_expect_success 'checking that first commit is in all tags (tag)' "
|
|
|
|
git tag -l --no-contains v1.0 v* >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
"
|
|
|
|
|
|
|
|
test_expect_success 'checking that first commit is in all tags (relative)' "
|
|
|
|
git tag -l --no-contains HEAD~2 v* >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
"
|
|
|
|
|
2009-01-26 14:13:25 +00:00
|
|
|
cat > expected <<EOF
|
|
|
|
v2.0
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'checking that second commit only has one tag' "
|
2010-10-31 07:30:58 +00:00
|
|
|
git tag -l --contains $hash2 v* >actual &&
|
2009-01-26 14:13:25 +00:00
|
|
|
test_cmp expected actual
|
|
|
|
"
|
|
|
|
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
cat > expected <<EOF
|
|
|
|
v0.2.1
|
|
|
|
v1.0
|
|
|
|
v1.0.1
|
|
|
|
v1.1.3
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'inverse of the last test, with --no-contains' "
|
|
|
|
git tag -l --no-contains $hash2 v* >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
"
|
2009-01-26 14:13:25 +00:00
|
|
|
|
|
|
|
test_expect_success 'checking that third commit has no tags' "
|
2010-10-31 07:30:58 +00:00
|
|
|
git tag -l --contains $hash3 v* >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual
|
2009-01-26 14:13:25 +00:00
|
|
|
"
|
|
|
|
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
cat > expected <<EOF
|
|
|
|
v0.2.1
|
|
|
|
v1.0
|
|
|
|
v1.0.1
|
|
|
|
v1.1.3
|
|
|
|
v2.0
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'conversely --no-contains on the third commit lists all tags' "
|
|
|
|
git tag -l --no-contains $hash3 v* >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
"
|
|
|
|
|
2009-01-26 14:13:25 +00:00
|
|
|
# how about a simple merge?
|
|
|
|
|
|
|
|
test_expect_success 'creating simple branch' '
|
|
|
|
git branch stable v2.0 &&
|
|
|
|
git checkout stable &&
|
|
|
|
echo foo-3.0 > foo &&
|
2010-10-31 07:30:58 +00:00
|
|
|
git commit foo -m fourth &&
|
2009-01-26 14:13:25 +00:00
|
|
|
git tag v3.0
|
|
|
|
'
|
|
|
|
|
|
|
|
hash4=$(git rev-parse HEAD)
|
|
|
|
|
|
|
|
cat > expected <<EOF
|
|
|
|
v3.0
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'checking that branch head only has one tag' "
|
2010-10-31 07:30:58 +00:00
|
|
|
git tag -l --contains $hash4 v* >actual &&
|
2009-01-26 14:13:25 +00:00
|
|
|
test_cmp expected actual
|
|
|
|
"
|
|
|
|
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
cat > expected <<EOF
|
|
|
|
v0.2.1
|
|
|
|
v1.0
|
|
|
|
v1.0.1
|
|
|
|
v1.1.3
|
|
|
|
v2.0
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'checking that branch head with --no-contains lists all but one tag' "
|
|
|
|
git tag -l --no-contains $hash4 v* >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
"
|
|
|
|
|
2009-01-26 14:13:25 +00:00
|
|
|
test_expect_success 'merging original branch into this branch' '
|
|
|
|
git merge --strategy=ours master &&
|
|
|
|
git tag v4.0
|
|
|
|
'
|
|
|
|
|
|
|
|
cat > expected <<EOF
|
|
|
|
v4.0
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'checking that original branch head has one tag now' "
|
2010-10-31 07:30:58 +00:00
|
|
|
git tag -l --contains $hash3 v* >actual &&
|
2009-01-26 14:13:25 +00:00
|
|
|
test_cmp expected actual
|
|
|
|
"
|
|
|
|
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
cat > expected <<EOF
|
|
|
|
v0.2.1
|
|
|
|
v1.0
|
|
|
|
v1.0.1
|
|
|
|
v1.1.3
|
|
|
|
v2.0
|
|
|
|
v3.0
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'checking that original branch head with --no-contains lists all but one tag now' "
|
|
|
|
git tag -l --no-contains $hash3 v* >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
"
|
|
|
|
|
2009-01-26 14:13:25 +00:00
|
|
|
cat > expected <<EOF
|
|
|
|
v0.2.1
|
|
|
|
v1.0
|
|
|
|
v1.0.1
|
|
|
|
v1.1.3
|
|
|
|
v2.0
|
|
|
|
v3.0
|
|
|
|
v4.0
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'checking that initial commit is in all tags' "
|
2010-10-31 07:30:58 +00:00
|
|
|
git tag -l --contains $hash1 v* >actual &&
|
2009-01-26 14:13:25 +00:00
|
|
|
test_cmp expected actual
|
|
|
|
"
|
|
|
|
|
tag: implicitly supply --list given another list-like option
Change the "tag" command to implicitly turn on its --list mode when
provided with a list-like option such as --contains, --points-at etc.
This is for consistency with how "branch" works. When "branch" is
given a list-like option, such as --contains, it implicitly provides
--list. Before this change "tag" would error out on those sorts of
invocations. I.e. while both of these worked for "branch":
git branch --contains v2.8.0 <pattern>
git branch --list --contains v2.8.0 <pattern>
Only the latter form worked for "tag":
git tag --contains v2.8.0 '*rc*'
git tag --list --contains v2.8.0 '*rc*'
Now "tag", like "branch", will implicitly supply --list when a
list-like option is provided, and no other conflicting non-list
options (such as -d) are present on the command-line.
Spelunking through the history via:
git log --reverse -p -G'only allowed with' -- '*builtin*tag*c'
Reveals that there was no good reason for not allowing this in the
first place. The --contains option added in 32c35cfb1e ("git-tag: Add
--contains option", 2009-01-26) made this an error. All the other
subsequent list-like options that were added copied its pattern of
making this usage an error.
The only tests that break as a result of this change are tests that
were explicitly checking that this "branch-like" usage wasn't
permitted. Change those failing tests to check that this invocation
mode is permitted, add extra tests for the list-like options we
weren't testing, and tests to ensure that e.g. we don't toggle the
list mode in the presence of other conflicting non-list options.
With this change errors messages such as "--contains option is only
allowed with -l" don't make sense anymore, since options like
--contain turn on -l. Instead we error out when list-like options such
as --contain are used in conjunction with conflicting options such as
-d or -v.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:55 +00:00
|
|
|
test_expect_success 'checking that --contains can be used in non-list mode' '
|
|
|
|
git tag --contains $hash1 v* >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
test_expect_success 'checking that initial commit is in all tags with --no-contains' "
|
|
|
|
git tag -l --no-contains $hash1 v* >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
"
|
|
|
|
|
2008-11-04 23:20:36 +00:00
|
|
|
# mixing modes and options:
|
|
|
|
|
|
|
|
test_expect_success 'mixing incompatibles modes and options is forbidden' '
|
2010-10-31 07:30:58 +00:00
|
|
|
test_must_fail git tag -a &&
|
2017-03-24 18:40:52 +00:00
|
|
|
test_must_fail git tag -a -l &&
|
|
|
|
test_must_fail git tag -s &&
|
|
|
|
test_must_fail git tag -s -l &&
|
|
|
|
test_must_fail git tag -m &&
|
|
|
|
test_must_fail git tag -m -l &&
|
|
|
|
test_must_fail git tag -m "hlagh" &&
|
|
|
|
test_must_fail git tag -m "hlagh" -l &&
|
|
|
|
test_must_fail git tag -F &&
|
|
|
|
test_must_fail git tag -F -l &&
|
|
|
|
test_must_fail git tag -f &&
|
|
|
|
test_must_fail git tag -f -l &&
|
|
|
|
test_must_fail git tag -a -s -m -F &&
|
|
|
|
test_must_fail git tag -a -s -m -F -l &&
|
2010-10-31 07:30:58 +00:00
|
|
|
test_must_fail git tag -l -v &&
|
2017-03-24 18:40:52 +00:00
|
|
|
test_must_fail git tag -l -d &&
|
|
|
|
test_must_fail git tag -l -v -d &&
|
|
|
|
test_must_fail git tag -n 100 -v &&
|
2010-10-31 07:30:58 +00:00
|
|
|
test_must_fail git tag -l -m msg &&
|
|
|
|
test_must_fail git tag -l -F some file &&
|
2017-03-23 13:05:18 +00:00
|
|
|
test_must_fail git tag -v -s &&
|
|
|
|
test_must_fail git tag --contains tag-tree &&
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
test_must_fail git tag --contains tag-blob &&
|
|
|
|
test_must_fail git tag --no-contains tag-tree &&
|
|
|
|
test_must_fail git tag --no-contains tag-blob &&
|
2017-03-24 18:40:59 +00:00
|
|
|
test_must_fail git tag --contains --no-contains &&
|
|
|
|
test_must_fail git tag --no-with HEAD &&
|
|
|
|
test_must_fail git tag --no-without HEAD
|
2008-11-04 23:20:36 +00:00
|
|
|
'
|
|
|
|
|
2017-03-24 18:40:59 +00:00
|
|
|
for option in --contains --with --no-contains --without --merged --no-merged --points-at
|
tag: implicitly supply --list given another list-like option
Change the "tag" command to implicitly turn on its --list mode when
provided with a list-like option such as --contains, --points-at etc.
This is for consistency with how "branch" works. When "branch" is
given a list-like option, such as --contains, it implicitly provides
--list. Before this change "tag" would error out on those sorts of
invocations. I.e. while both of these worked for "branch":
git branch --contains v2.8.0 <pattern>
git branch --list --contains v2.8.0 <pattern>
Only the latter form worked for "tag":
git tag --contains v2.8.0 '*rc*'
git tag --list --contains v2.8.0 '*rc*'
Now "tag", like "branch", will implicitly supply --list when a
list-like option is provided, and no other conflicting non-list
options (such as -d) are present on the command-line.
Spelunking through the history via:
git log --reverse -p -G'only allowed with' -- '*builtin*tag*c'
Reveals that there was no good reason for not allowing this in the
first place. The --contains option added in 32c35cfb1e ("git-tag: Add
--contains option", 2009-01-26) made this an error. All the other
subsequent list-like options that were added copied its pattern of
making this usage an error.
The only tests that break as a result of this change are tests that
were explicitly checking that this "branch-like" usage wasn't
permitted. Change those failing tests to check that this invocation
mode is permitted, add extra tests for the list-like options we
weren't testing, and tests to ensure that e.g. we don't toggle the
list mode in the presence of other conflicting non-list options.
With this change errors messages such as "--contains option is only
allowed with -l" don't make sense anymore, since options like
--contain turn on -l. Instead we error out when list-like options such
as --contain are used in conjunction with conflicting options such as
-d or -v.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:55 +00:00
|
|
|
do
|
|
|
|
test_expect_success "mixing incompatible modes with $option is forbidden" "
|
|
|
|
test_must_fail git tag -d $option HEAD &&
|
|
|
|
test_must_fail git tag -d $option HEAD some-tag &&
|
|
|
|
test_must_fail git tag -v $option HEAD
|
|
|
|
"
|
|
|
|
test_expect_success "Doing 'git tag --list-like $option <commit> <pattern> is permitted" "
|
|
|
|
git tag -n $option HEAD HEAD &&
|
2017-03-24 18:40:56 +00:00
|
|
|
git tag $option HEAD HEAD &&
|
|
|
|
git tag $option
|
tag: implicitly supply --list given another list-like option
Change the "tag" command to implicitly turn on its --list mode when
provided with a list-like option such as --contains, --points-at etc.
This is for consistency with how "branch" works. When "branch" is
given a list-like option, such as --contains, it implicitly provides
--list. Before this change "tag" would error out on those sorts of
invocations. I.e. while both of these worked for "branch":
git branch --contains v2.8.0 <pattern>
git branch --list --contains v2.8.0 <pattern>
Only the latter form worked for "tag":
git tag --contains v2.8.0 '*rc*'
git tag --list --contains v2.8.0 '*rc*'
Now "tag", like "branch", will implicitly supply --list when a
list-like option is provided, and no other conflicting non-list
options (such as -d) are present on the command-line.
Spelunking through the history via:
git log --reverse -p -G'only allowed with' -- '*builtin*tag*c'
Reveals that there was no good reason for not allowing this in the
first place. The --contains option added in 32c35cfb1e ("git-tag: Add
--contains option", 2009-01-26) made this an error. All the other
subsequent list-like options that were added copied its pattern of
making this usage an error.
The only tests that break as a result of this change are tests that
were explicitly checking that this "branch-like" usage wasn't
permitted. Change those failing tests to check that this invocation
mode is permitted, add extra tests for the list-like options we
weren't testing, and tests to ensure that e.g. we don't toggle the
list mode in the presence of other conflicting non-list options.
With this change errors messages such as "--contains option is only
allowed with -l" don't make sense anymore, since options like
--contain turn on -l. Instead we error out when list-like options such
as --contain are used in conjunction with conflicting options such as
-d or -v.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:55 +00:00
|
|
|
"
|
|
|
|
done
|
2008-11-04 23:20:36 +00:00
|
|
|
|
2012-02-08 23:03:43 +00:00
|
|
|
# check points-at
|
|
|
|
|
tag: implicitly supply --list given another list-like option
Change the "tag" command to implicitly turn on its --list mode when
provided with a list-like option such as --contains, --points-at etc.
This is for consistency with how "branch" works. When "branch" is
given a list-like option, such as --contains, it implicitly provides
--list. Before this change "tag" would error out on those sorts of
invocations. I.e. while both of these worked for "branch":
git branch --contains v2.8.0 <pattern>
git branch --list --contains v2.8.0 <pattern>
Only the latter form worked for "tag":
git tag --contains v2.8.0 '*rc*'
git tag --list --contains v2.8.0 '*rc*'
Now "tag", like "branch", will implicitly supply --list when a
list-like option is provided, and no other conflicting non-list
options (such as -d) are present on the command-line.
Spelunking through the history via:
git log --reverse -p -G'only allowed with' -- '*builtin*tag*c'
Reveals that there was no good reason for not allowing this in the
first place. The --contains option added in 32c35cfb1e ("git-tag: Add
--contains option", 2009-01-26) made this an error. All the other
subsequent list-like options that were added copied its pattern of
making this usage an error.
The only tests that break as a result of this change are tests that
were explicitly checking that this "branch-like" usage wasn't
permitted. Change those failing tests to check that this invocation
mode is permitted, add extra tests for the list-like options we
weren't testing, and tests to ensure that e.g. we don't toggle the
list mode in the presence of other conflicting non-list options.
With this change errors messages such as "--contains option is only
allowed with -l" don't make sense anymore, since options like
--contain turn on -l. Instead we error out when list-like options such
as --contain are used in conjunction with conflicting options such as
-d or -v.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:55 +00:00
|
|
|
test_expect_success '--points-at can be used in non-list mode' '
|
|
|
|
echo v4.0 >expect &&
|
|
|
|
git tag --points-at=v4.0 "v*" >actual &&
|
|
|
|
test_cmp expect actual
|
2012-02-08 23:03:43 +00:00
|
|
|
'
|
|
|
|
|
2017-03-24 18:40:56 +00:00
|
|
|
test_expect_success '--points-at is a synonym for --points-at HEAD' '
|
|
|
|
echo v4.0 >expect &&
|
|
|
|
git tag --points-at >actual &&
|
|
|
|
test_cmp expect actual
|
2012-02-08 23:03:43 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--points-at finds lightweight tags' '
|
|
|
|
echo v4.0 >expect &&
|
|
|
|
git tag --points-at v4.0 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--points-at finds annotated tags of commits' '
|
|
|
|
git tag -m "v4.0, annotated" annotated-v4.0 v4.0 &&
|
|
|
|
echo annotated-v4.0 >expect &&
|
|
|
|
git tag -l --points-at v4.0 "annotated*" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--points-at finds annotated tags of tags' '
|
|
|
|
git tag -m "describing the v4.0 tag object" \
|
|
|
|
annotated-again-v4.0 annotated-v4.0 &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
annotated-again-v4.0
|
|
|
|
annotated-v4.0
|
|
|
|
EOF
|
|
|
|
git tag --points-at=annotated-v4.0 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2019-04-04 18:25:15 +00:00
|
|
|
test_expect_success 'recursive tagging should give advice' '
|
|
|
|
sed -e "s/|$//" <<-EOF >expect &&
|
2019-05-08 19:16:41 +00:00
|
|
|
hint: You have created a nested tag. The object referred to by your new tag is
|
2019-04-04 18:25:15 +00:00
|
|
|
hint: already a tag. If you meant to tag the object that it points to, use:
|
|
|
|
hint: |
|
|
|
|
hint: git tag -f nested annotated-v4.0^{}
|
|
|
|
EOF
|
|
|
|
git tag -m nested nested annotated-v4.0 2>actual &&
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
'
|
|
|
|
|
2012-02-08 23:03:43 +00:00
|
|
|
test_expect_success 'multiple --points-at are OR-ed together' '
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
v2.0
|
|
|
|
v3.0
|
|
|
|
EOF
|
|
|
|
git tag --points-at=v2.0 --points-at=v3.0 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2014-02-27 12:56:52 +00:00
|
|
|
test_expect_success 'lexical sort' '
|
|
|
|
git tag foo1.3 &&
|
|
|
|
git tag foo1.6 &&
|
|
|
|
git tag foo1.10 &&
|
|
|
|
git tag -l --sort=refname "foo*" >actual &&
|
2014-07-11 22:55:46 +00:00
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.10
|
|
|
|
foo1.3
|
|
|
|
foo1.6
|
|
|
|
EOF
|
2014-02-27 12:56:52 +00:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'version sort' '
|
|
|
|
git tag -l --sort=version:refname "foo*" >actual &&
|
2014-07-11 22:55:46 +00:00
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.3
|
|
|
|
foo1.6
|
|
|
|
foo1.10
|
|
|
|
EOF
|
2014-02-27 12:56:52 +00:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'reverse version sort' '
|
|
|
|
git tag -l --sort=-version:refname "foo*" >actual &&
|
2014-07-11 22:55:46 +00:00
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.10
|
|
|
|
foo1.6
|
|
|
|
foo1.3
|
|
|
|
EOF
|
2014-02-27 12:56:52 +00:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'reverse lexical sort' '
|
|
|
|
git tag -l --sort=-refname "foo*" >actual &&
|
2014-07-11 22:55:46 +00:00
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.6
|
|
|
|
foo1.3
|
|
|
|
foo1.10
|
|
|
|
EOF
|
2014-02-27 12:56:52 +00:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2014-07-16 21:48:02 +00:00
|
|
|
test_expect_success 'configured lexical sort' '
|
2016-12-08 14:23:56 +00:00
|
|
|
test_config tag.sort "v:refname" &&
|
2014-07-16 21:48:02 +00:00
|
|
|
git tag -l "foo*" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.3
|
|
|
|
foo1.6
|
|
|
|
foo1.10
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'option override configured sort' '
|
2016-12-08 14:23:56 +00:00
|
|
|
test_config tag.sort "v:refname" &&
|
2014-07-16 21:48:02 +00:00
|
|
|
git tag -l --sort=-refname "foo*" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.6
|
|
|
|
foo1.3
|
|
|
|
foo1.10
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'invalid sort parameter on command line' '
|
|
|
|
test_must_fail git tag -l --sort=notvalid "foo*" >actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'invalid sort parameter in configuratoin' '
|
2016-12-08 14:23:56 +00:00
|
|
|
test_config tag.sort "v:notvalid" &&
|
2015-09-11 15:06:16 +00:00
|
|
|
test_must_fail git tag -l "foo*"
|
2014-07-16 21:48:02 +00:00
|
|
|
'
|
|
|
|
|
2015-02-26 10:44:01 +00:00
|
|
|
test_expect_success 'version sort with prerelease reordering' '
|
2016-12-08 14:23:56 +00:00
|
|
|
test_config versionsort.prereleaseSuffix -rc &&
|
2015-02-26 10:44:01 +00:00
|
|
|
git tag foo1.6-rc1 &&
|
|
|
|
git tag foo1.6-rc2 &&
|
|
|
|
git tag -l --sort=version:refname "foo*" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.3
|
|
|
|
foo1.6-rc1
|
|
|
|
foo1.6-rc2
|
|
|
|
foo1.6
|
|
|
|
foo1.10
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'reverse version sort with prerelease reordering' '
|
2016-12-08 14:23:56 +00:00
|
|
|
test_config versionsort.prereleaseSuffix -rc &&
|
2015-02-26 10:44:01 +00:00
|
|
|
git tag -l --sort=-version:refname "foo*" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.10
|
|
|
|
foo1.6
|
|
|
|
foo1.6-rc2
|
|
|
|
foo1.6-rc1
|
|
|
|
foo1.3
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
versioncmp: cope with common part overlapping with prerelease suffix
Version sort with prerelease reordering sometimes puts tagnames in the
wrong order, when the common part of two compared tagnames overlaps
with the leading character(s) of one or more configured prerelease
suffixes. Note the position of "v2.1.0-beta-1":
$ git -c versionsort.prereleaseSuffix=-beta \
tag -l --sort=version:refname v2.1.*
v2.1.0-beta-2
v2.1.0-beta-3
v2.1.0
v2.1.0-RC1
v2.1.0-RC2
v2.1.0-beta-1
v2.1.1
v2.1.2
The reason is that when comparing a pair of tagnames, first
versioncmp() looks for the first different character in a pair of
tagnames, and then the swap_prereleases() helper function looks for a
configured prerelease suffix _starting at_ that character. Thus, when
in the above example the sorting algorithm happens to compare the
tagnames "v2.1.0-beta-1" and "v2.1.0-RC2", swap_prereleases() tries to
match the suffix "-beta" against "beta-1" to no avail, and the two
tagnames erroneously end up being ordered lexicographically.
To fix this issue change swap_prereleases() to look for configured
prerelease suffixes _containing_ the position of that first different
character.
Care must be taken, when a configured suffix is longer than the
tagnames' common part up to the first different character, to avoid
reading memory before the beginning of the tagnames. Add a test that
uses an exceptionally long prerelease suffix to check for this, in the
hope that in case of a regression the illegal memory access causes a
segfault in 'git tag' on one of the commonly used platforms (the test
happens to pass successfully on my Linux system with the safety check
removed), or at least makes valgrind complain.
Under some circumstances it's possible that more than one prerelease
suffixes can be found in the same tagname around that first different
character. With this simple bugfix patch such a tagname is sorted
according to the contained suffix that comes first in the
configuration for now. This is less than ideal in some cases, and the
following patch will take care of those.
Reported-by: Leho Kraav <leho@conversionready.com>
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-08 14:23:59 +00:00
|
|
|
test_expect_success 'version sort with prerelease reordering and common leading character' '
|
2016-12-08 14:23:57 +00:00
|
|
|
test_config versionsort.prereleaseSuffix -before &&
|
|
|
|
git tag foo1.7-before1 &&
|
|
|
|
git tag foo1.7 &&
|
|
|
|
git tag foo1.7-after1 &&
|
|
|
|
git tag -l --sort=version:refname "foo1.7*" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.7-before1
|
|
|
|
foo1.7
|
|
|
|
foo1.7-after1
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
versioncmp: cope with common part overlapping with prerelease suffix
Version sort with prerelease reordering sometimes puts tagnames in the
wrong order, when the common part of two compared tagnames overlaps
with the leading character(s) of one or more configured prerelease
suffixes. Note the position of "v2.1.0-beta-1":
$ git -c versionsort.prereleaseSuffix=-beta \
tag -l --sort=version:refname v2.1.*
v2.1.0-beta-2
v2.1.0-beta-3
v2.1.0
v2.1.0-RC1
v2.1.0-RC2
v2.1.0-beta-1
v2.1.1
v2.1.2
The reason is that when comparing a pair of tagnames, first
versioncmp() looks for the first different character in a pair of
tagnames, and then the swap_prereleases() helper function looks for a
configured prerelease suffix _starting at_ that character. Thus, when
in the above example the sorting algorithm happens to compare the
tagnames "v2.1.0-beta-1" and "v2.1.0-RC2", swap_prereleases() tries to
match the suffix "-beta" against "beta-1" to no avail, and the two
tagnames erroneously end up being ordered lexicographically.
To fix this issue change swap_prereleases() to look for configured
prerelease suffixes _containing_ the position of that first different
character.
Care must be taken, when a configured suffix is longer than the
tagnames' common part up to the first different character, to avoid
reading memory before the beginning of the tagnames. Add a test that
uses an exceptionally long prerelease suffix to check for this, in the
hope that in case of a regression the illegal memory access causes a
segfault in 'git tag' on one of the commonly used platforms (the test
happens to pass successfully on my Linux system with the safety check
removed), or at least makes valgrind complain.
Under some circumstances it's possible that more than one prerelease
suffixes can be found in the same tagname around that first different
character. With this simple bugfix patch such a tagname is sorted
according to the contained suffix that comes first in the
configuration for now. This is less than ideal in some cases, and the
following patch will take care of those.
Reported-by: Leho Kraav <leho@conversionready.com>
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-08 14:23:59 +00:00
|
|
|
test_expect_success 'version sort with prerelease reordering, multiple suffixes and common leading character' '
|
2016-12-08 14:23:57 +00:00
|
|
|
test_config versionsort.prereleaseSuffix -before &&
|
|
|
|
git config --add versionsort.prereleaseSuffix -after &&
|
|
|
|
git tag -l --sort=version:refname "foo1.7*" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.7-before1
|
|
|
|
foo1.7-after1
|
|
|
|
foo1.7
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
versioncmp: use earliest-longest contained suffix to determine sorting order
When comparing tagnames, it is possible that a tagname contains more
than one of the configured prerelease suffixes around the first
different character. After fixing a bug in the previous commit such a
tagname is sorted according to the contained suffix which comes first
in the configuration. This is, however, not quite the right thing to
do in the following corner cases:
1. $ git -c versionsort.suffix=-bar
-c versionsort.suffix=-foo-baz
-c versionsort.suffix=-foo-bar
tag -l --sort=version:refname 'v1*'
v1.0-foo-bar
v1.0-foo-baz
The suffix of the tagname 'v1.0-foo-bar' is clearly '-foo-bar',
so it should be listed last. However, as it also contains '-bar'
around the first different character, it is listed first instead,
because that '-bar' suffix comes first the configuration.
2. One of the configured suffixes starts with the other:
$ git -c versionsort.prereleasesuffix=-pre \
-c versionsort.prereleasesuffix=-prerelease \
tag -l --sort=version:refname 'v2*'
v2.0-prerelease1
v2.0-pre1
v2.0-pre2
Here the tagname 'v2.0-prerelease1' should be the last. When
comparing 'v2.0-pre1' and 'v2.0-prerelease1' the first different
characters are '1' and 'r', respectively. Since this first
different character must be part of the configured suffix, the
'-pre' suffix is not recognized in the first tagname. OTOH, the
'-prerelease' suffix is properly recognized in
'v2.0-prerelease1', thus it is listed first.
Improve version sort in these corner cases, and
- look for a configured prerelease suffix containing the first
different character or ending right before it, so the '-pre'
suffixes are recognized in case (2). This also means that
when comparing tagnames 'v2.0-pre1' and 'v2.0-pre2',
swap_prereleases() would find the '-pre' suffix in both, but then
it will return "undecided" and the caller will do the right thing
by sorting based in '1' and '2'.
- If the tagname contains more than one suffix, then give precedence
to the contained suffix that starts at the earliest offset in the
tagname to address (1).
- If there are more than one suffixes starting at that earliest
position, then give precedence to the longest of those suffixes,
thus ensuring that in (2) the tagname 'v2.0-prerelease1' won't be
sorted based on the '-pre' suffix.
Add tests for these corner cases and adjust the documentation
accordingly.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-08 14:24:00 +00:00
|
|
|
test_expect_success 'version sort with prerelease reordering, multiple suffixes match the same tag' '
|
|
|
|
test_config versionsort.prereleaseSuffix -bar &&
|
|
|
|
git config --add versionsort.prereleaseSuffix -foo-baz &&
|
|
|
|
git config --add versionsort.prereleaseSuffix -foo-bar &&
|
|
|
|
git tag foo1.8-foo-bar &&
|
|
|
|
git tag foo1.8-foo-baz &&
|
|
|
|
git tag foo1.8 &&
|
|
|
|
git tag -l --sort=version:refname "foo1.8*" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.8-foo-baz
|
|
|
|
foo1.8-foo-bar
|
|
|
|
foo1.8
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'version sort with prerelease reordering, multiple suffixes match starting at the same position' '
|
|
|
|
test_config versionsort.prereleaseSuffix -pre &&
|
|
|
|
git config --add versionsort.prereleaseSuffix -prerelease &&
|
|
|
|
git tag foo1.9-pre1 &&
|
|
|
|
git tag foo1.9-pre2 &&
|
|
|
|
git tag foo1.9-prerelease1 &&
|
|
|
|
git tag -l --sort=version:refname "foo1.9*" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.9-pre1
|
|
|
|
foo1.9-pre2
|
|
|
|
foo1.9-prerelease1
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
versioncmp: generalize version sort suffix reordering
The 'versionsort.prereleaseSuffix' configuration variable, as its name
suggests, is supposed to only deal with tagnames with prerelease
suffixes, and allows sorting those prerelease tags in a user-defined
order before the suffixless main release tag, instead of sorting them
simply lexicographically.
However, the previous changes in this series resulted in an
interesting and useful property of version sort:
- The empty string as a configured suffix matches all tagnames,
including tagnames without any suffix, but
- tagnames containing a "real" configured suffix are still ordered
according to that real suffix, because any longer suffix takes
precedence over the empty string.
Exploiting this property we can easily generalize suffix reordering
and specify the order of tags with given suffixes not only before but
even after a main release tag by using the empty suffix to denote the
position of the main release tag, without any algorithm changes:
$ git -c versionsort.prereleaseSuffix=-alpha \
-c versionsort.prereleaseSuffix=-beta \
-c versionsort.prereleaseSuffix="" \
-c versionsort.prereleaseSuffix=-gamma \
-c versionsort.prereleaseSuffix=-delta \
tag -l --sort=version:refname 'v3.0*'
v3.0-alpha1
v3.0-beta1
v3.0
v3.0-gamma1
v3.0-delta1
Since 'versionsort.prereleaseSuffix' is not a fitting name for a
configuration variable to control this more general suffix reordering,
introduce the new variable 'versionsort.suffix'. Still keep the old
configuration variable name as a deprecated alias, though, to avoid
suddenly breaking setups already using it. Ignore the old variable if
both old and new configuration variables are set, but emit a warning
so users will be aware of it and can fix their configuration. Extend
the documentation to describe and add a test to check this more
general behavior.
Note: since the empty suffix matches all tagnames, tagnames with
suffixes not included in the configuration are listed together with
the suffixless main release tag, ordered lexicographically right after
that, i.e. before tags with suffixes listed in the configuration
following the empty suffix.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-08 14:24:01 +00:00
|
|
|
test_expect_success 'version sort with general suffix reordering' '
|
|
|
|
test_config versionsort.suffix -alpha &&
|
|
|
|
git config --add versionsort.suffix -beta &&
|
|
|
|
git config --add versionsort.suffix "" &&
|
|
|
|
git config --add versionsort.suffix -gamma &&
|
|
|
|
git config --add versionsort.suffix -delta &&
|
|
|
|
git tag foo1.10-alpha &&
|
|
|
|
git tag foo1.10-beta &&
|
|
|
|
git tag foo1.10-gamma &&
|
|
|
|
git tag foo1.10-delta &&
|
|
|
|
git tag foo1.10-unlisted-suffix &&
|
|
|
|
git tag -l --sort=version:refname "foo1.10*" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.10-alpha
|
|
|
|
foo1.10-beta
|
|
|
|
foo1.10
|
|
|
|
foo1.10-unlisted-suffix
|
|
|
|
foo1.10-gamma
|
|
|
|
foo1.10-delta
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'versionsort.suffix overrides versionsort.prereleaseSuffix' '
|
|
|
|
test_config versionsort.suffix -before &&
|
|
|
|
test_config versionsort.prereleaseSuffix -after &&
|
|
|
|
git tag -l --sort=version:refname "foo1.7*" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
foo1.7-before1
|
|
|
|
foo1.7
|
|
|
|
foo1.7-after1
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
versioncmp: cope with common part overlapping with prerelease suffix
Version sort with prerelease reordering sometimes puts tagnames in the
wrong order, when the common part of two compared tagnames overlaps
with the leading character(s) of one or more configured prerelease
suffixes. Note the position of "v2.1.0-beta-1":
$ git -c versionsort.prereleaseSuffix=-beta \
tag -l --sort=version:refname v2.1.*
v2.1.0-beta-2
v2.1.0-beta-3
v2.1.0
v2.1.0-RC1
v2.1.0-RC2
v2.1.0-beta-1
v2.1.1
v2.1.2
The reason is that when comparing a pair of tagnames, first
versioncmp() looks for the first different character in a pair of
tagnames, and then the swap_prereleases() helper function looks for a
configured prerelease suffix _starting at_ that character. Thus, when
in the above example the sorting algorithm happens to compare the
tagnames "v2.1.0-beta-1" and "v2.1.0-RC2", swap_prereleases() tries to
match the suffix "-beta" against "beta-1" to no avail, and the two
tagnames erroneously end up being ordered lexicographically.
To fix this issue change swap_prereleases() to look for configured
prerelease suffixes _containing_ the position of that first different
character.
Care must be taken, when a configured suffix is longer than the
tagnames' common part up to the first different character, to avoid
reading memory before the beginning of the tagnames. Add a test that
uses an exceptionally long prerelease suffix to check for this, in the
hope that in case of a regression the illegal memory access causes a
segfault in 'git tag' on one of the commonly used platforms (the test
happens to pass successfully on my Linux system with the safety check
removed), or at least makes valgrind complain.
Under some circumstances it's possible that more than one prerelease
suffixes can be found in the same tagname around that first different
character. With this simple bugfix patch such a tagname is sorted
according to the contained suffix that comes first in the
configuration for now. This is less than ideal in some cases, and the
following patch will take care of those.
Reported-by: Leho Kraav <leho@conversionready.com>
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-08 14:23:59 +00:00
|
|
|
test_expect_success 'version sort with very long prerelease suffix' '
|
|
|
|
test_config versionsort.prereleaseSuffix -very-looooooooooooooooooooooooong-prerelease-suffix &&
|
|
|
|
git tag -l --sort=version:refname
|
|
|
|
'
|
|
|
|
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
test_expect_success ULIMIT_STACK_SIZE '--contains and --no-contains work in a deep repo' '
|
2014-04-24 12:24:39 +00:00
|
|
|
i=1 &&
|
2014-09-23 22:41:38 +00:00
|
|
|
while test $i -lt 8000
|
2014-04-24 12:24:39 +00:00
|
|
|
do
|
|
|
|
echo "commit refs/heads/master
|
|
|
|
committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
|
|
|
|
data <<EOF
|
|
|
|
commit #$i
|
|
|
|
EOF"
|
|
|
|
test $i = 1 && echo "from refs/heads/master^0"
|
|
|
|
i=$(($i + 1))
|
|
|
|
done | git fast-import &&
|
|
|
|
git checkout master &&
|
|
|
|
git tag far-far-away HEAD^ &&
|
|
|
|
run_with_limited_stack git tag --contains HEAD >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual &&
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
run_with_limited_stack git tag --no-contains HEAD >actual &&
|
2017-08-06 23:38:50 +00:00
|
|
|
test_line_count "-gt" 10 actual
|
2014-04-24 12:24:39 +00:00
|
|
|
'
|
|
|
|
|
2015-09-11 15:06:46 +00:00
|
|
|
test_expect_success '--format should list tags as per format given' '
|
|
|
|
cat >expect <<-\EOF &&
|
2016-12-08 14:23:57 +00:00
|
|
|
refname : refs/tags/v1.0
|
|
|
|
refname : refs/tags/v1.0.1
|
|
|
|
refname : refs/tags/v1.1.3
|
2015-09-11 15:06:46 +00:00
|
|
|
EOF
|
2016-12-08 14:23:57 +00:00
|
|
|
git tag -l --format="refname : %(refname)" "v1*" >actual &&
|
2015-09-11 15:06:46 +00:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
ref-filter: consult want_color() before emitting colors
When color placeholders like %(color:red) are used in a
ref-filter format, we unconditionally output the colors,
even if the user has asked us for no colors. This usually
isn't a problem when the user is constructing a --format on
the command line, but it means we may do the wrong thing
when the format is fed from a script or alias. For example:
$ git config alias.b 'branch --format=%(color:green)%(refname)'
$ git b --no-color
should probably omit the green color. Likewise, running:
$ git b >branches
should probably also omit the color, just as we would for
all baked-in coloring (and as we recently started to do for
user-specified colors in --pretty formats).
This commit makes both of those cases work by teaching
the ref-filter code to consult want_color() before
outputting any color. The color flag in ref_format defaults
to "-1", which means we'll consult color.ui, which in turn
defaults to the usual isatty() check on stdout. However,
callers like git-branch which support their own color config
(and command-line options) can override that.
The new tests independently cover all three of the callers
of ref-filter (for-each-ref, tag, and branch). Even though
these seem redundant, it confirms that we've correctly
plumbed through all of the necessary config to make colors
work by default.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-13 15:09:32 +00:00
|
|
|
test_expect_success "set up color tests" '
|
|
|
|
echo "<RED>v1.0<RESET>" >expect.color &&
|
|
|
|
echo "v1.0" >expect.bare &&
|
|
|
|
color_args="--format=%(color:red)%(refname:short) --list v1.0"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '%(color) omitted without tty' '
|
|
|
|
TERM=vt100 git tag $color_args >actual.raw &&
|
|
|
|
test_decode_color <actual.raw >actual &&
|
|
|
|
test_cmp expect.bare actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success TTY '%(color) present with tty' '
|
2017-10-03 13:39:34 +00:00
|
|
|
test_terminal git tag $color_args >actual.raw &&
|
ref-filter: consult want_color() before emitting colors
When color placeholders like %(color:red) are used in a
ref-filter format, we unconditionally output the colors,
even if the user has asked us for no colors. This usually
isn't a problem when the user is constructing a --format on
the command line, but it means we may do the wrong thing
when the format is fed from a script or alias. For example:
$ git config alias.b 'branch --format=%(color:green)%(refname)'
$ git b --no-color
should probably omit the green color. Likewise, running:
$ git b >branches
should probably also omit the color, just as we would for
all baked-in coloring (and as we recently started to do for
user-specified colors in --pretty formats).
This commit makes both of those cases work by teaching
the ref-filter code to consult want_color() before
outputting any color. The color flag in ref_format defaults
to "-1", which means we'll consult color.ui, which in turn
defaults to the usual isatty() check on stdout. However,
callers like git-branch which support their own color config
(and command-line options) can override that.
The new tests independently cover all three of the callers
of ref-filter (for-each-ref, tag, and branch). Even though
these seem redundant, it confirms that we've correctly
plumbed through all of the necessary config to make colors
work by default.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-13 15:09:32 +00:00
|
|
|
test_decode_color <actual.raw >actual &&
|
|
|
|
test_cmp expect.color actual
|
|
|
|
'
|
|
|
|
|
2017-10-03 13:45:47 +00:00
|
|
|
test_expect_success '--color overrides auto-color' '
|
|
|
|
git tag --color $color_args >actual.raw &&
|
ref-filter: consult want_color() before emitting colors
When color placeholders like %(color:red) are used in a
ref-filter format, we unconditionally output the colors,
even if the user has asked us for no colors. This usually
isn't a problem when the user is constructing a --format on
the command line, but it means we may do the wrong thing
when the format is fed from a script or alias. For example:
$ git config alias.b 'branch --format=%(color:green)%(refname)'
$ git b --no-color
should probably omit the green color. Likewise, running:
$ git b >branches
should probably also omit the color, just as we would for
all baked-in coloring (and as we recently started to do for
user-specified colors in --pretty formats).
This commit makes both of those cases work by teaching
the ref-filter code to consult want_color() before
outputting any color. The color flag in ref_format defaults
to "-1", which means we'll consult color.ui, which in turn
defaults to the usual isatty() check on stdout. However,
callers like git-branch which support their own color config
(and command-line options) can override that.
The new tests independently cover all three of the callers
of ref-filter (for-each-ref, tag, and branch). Even though
these seem redundant, it confirms that we've correctly
plumbed through all of the necessary config to make colors
work by default.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-13 15:09:32 +00:00
|
|
|
test_decode_color <actual.raw >actual &&
|
|
|
|
test_cmp expect.color actual
|
|
|
|
'
|
|
|
|
|
tag: respect color.ui config
Since 11b087adfd (ref-filter: consult want_color() before
emitting colors, 2017-07-13), we expect that setting
"color.ui" to "always" will enable color tag formats even
without a tty. As that commit was built on top of
136c8c8b8f (color: check color.ui in git_default_config(),
2017-07-13) from the same series, we didn't need to touch
tag's config parsing at all.
However, since we reverted 136c8c8b8f, we now need to
explicitly call git_color_default_config() to make this
work.
Let's do so, and also restore the test dropped in 0c88bf5050
(provide --color option for all ref-filter users,
2017-10-03). That commit swapped out our "color.ui=always"
test for "--color" in preparation for "always" going away.
But since it is here to stay, we should test both cases.
Note that for-each-ref also lost its color.ui support as
part of reverting 136c8c8b8f. But as a plumbing command, it
should _not_ respect the color.ui config. Since it also
gained a --color option in 0c88bf5050, that's the correct
way to ask it for color. We'll continue to test that, and
confirm that "color.ui" is not respected.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-10-13 17:26:02 +00:00
|
|
|
test_expect_success 'color.ui=always overrides auto-color' '
|
|
|
|
git -c color.ui=always tag $color_args >actual.raw &&
|
|
|
|
test_decode_color <actual.raw >actual &&
|
|
|
|
test_cmp expect.color actual
|
|
|
|
'
|
|
|
|
|
2015-09-10 16:22:49 +00:00
|
|
|
test_expect_success 'setup --merged test tags' '
|
|
|
|
git tag mergetest-1 HEAD~2 &&
|
|
|
|
git tag mergetest-2 HEAD~1 &&
|
|
|
|
git tag mergetest-3 HEAD
|
|
|
|
'
|
|
|
|
|
tag: implicitly supply --list given another list-like option
Change the "tag" command to implicitly turn on its --list mode when
provided with a list-like option such as --contains, --points-at etc.
This is for consistency with how "branch" works. When "branch" is
given a list-like option, such as --contains, it implicitly provides
--list. Before this change "tag" would error out on those sorts of
invocations. I.e. while both of these worked for "branch":
git branch --contains v2.8.0 <pattern>
git branch --list --contains v2.8.0 <pattern>
Only the latter form worked for "tag":
git tag --contains v2.8.0 '*rc*'
git tag --list --contains v2.8.0 '*rc*'
Now "tag", like "branch", will implicitly supply --list when a
list-like option is provided, and no other conflicting non-list
options (such as -d) are present on the command-line.
Spelunking through the history via:
git log --reverse -p -G'only allowed with' -- '*builtin*tag*c'
Reveals that there was no good reason for not allowing this in the
first place. The --contains option added in 32c35cfb1e ("git-tag: Add
--contains option", 2009-01-26) made this an error. All the other
subsequent list-like options that were added copied its pattern of
making this usage an error.
The only tests that break as a result of this change are tests that
were explicitly checking that this "branch-like" usage wasn't
permitted. Change those failing tests to check that this invocation
mode is permitted, add extra tests for the list-like options we
weren't testing, and tests to ensure that e.g. we don't toggle the
list mode in the presence of other conflicting non-list options.
With this change errors messages such as "--contains option is only
allowed with -l" don't make sense anymore, since options like
--contain turn on -l. Instead we error out when list-like options such
as --contain are used in conjunction with conflicting options such as
-d or -v.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:55 +00:00
|
|
|
test_expect_success '--merged can be used in non-list mode' '
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
mergetest-1
|
|
|
|
mergetest-2
|
|
|
|
EOF
|
|
|
|
git tag --merged=mergetest-2 "mergetest*" >actual &&
|
|
|
|
test_cmp expect actual
|
2015-09-10 16:22:49 +00:00
|
|
|
'
|
|
|
|
|
2017-03-21 12:58:49 +00:00
|
|
|
test_expect_success '--merged is incompatible with --no-merged' '
|
|
|
|
test_must_fail git tag --merged HEAD --no-merged HEAD
|
2015-09-10 16:22:49 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--merged shows merged tags' '
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
mergetest-1
|
|
|
|
mergetest-2
|
|
|
|
EOF
|
|
|
|
git tag -l --merged=mergetest-2 mergetest-* >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--no-merged show unmerged tags' '
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
mergetest-3
|
|
|
|
EOF
|
|
|
|
git tag -l --no-merged=mergetest-2 mergetest-* >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
tag: implicitly supply --list given another list-like option
Change the "tag" command to implicitly turn on its --list mode when
provided with a list-like option such as --contains, --points-at etc.
This is for consistency with how "branch" works. When "branch" is
given a list-like option, such as --contains, it implicitly provides
--list. Before this change "tag" would error out on those sorts of
invocations. I.e. while both of these worked for "branch":
git branch --contains v2.8.0 <pattern>
git branch --list --contains v2.8.0 <pattern>
Only the latter form worked for "tag":
git tag --contains v2.8.0 '*rc*'
git tag --list --contains v2.8.0 '*rc*'
Now "tag", like "branch", will implicitly supply --list when a
list-like option is provided, and no other conflicting non-list
options (such as -d) are present on the command-line.
Spelunking through the history via:
git log --reverse -p -G'only allowed with' -- '*builtin*tag*c'
Reveals that there was no good reason for not allowing this in the
first place. The --contains option added in 32c35cfb1e ("git-tag: Add
--contains option", 2009-01-26) made this an error. All the other
subsequent list-like options that were added copied its pattern of
making this usage an error.
The only tests that break as a result of this change are tests that
were explicitly checking that this "branch-like" usage wasn't
permitted. Change those failing tests to check that this invocation
mode is permitted, add extra tests for the list-like options we
weren't testing, and tests to ensure that e.g. we don't toggle the
list mode in the presence of other conflicting non-list options.
With this change errors messages such as "--contains option is only
allowed with -l" don't make sense anymore, since options like
--contain turn on -l. Instead we error out when list-like options such
as --contain are used in conjunction with conflicting options such as
-d or -v.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:55 +00:00
|
|
|
test_expect_success '--no-merged can be used in non-list mode' '
|
|
|
|
git tag --no-merged=mergetest-2 mergetest-* >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
tag: do not show ambiguous tag names as "tags/foo"
Since b7cc53e9 (tag.c: use 'ref-filter' APIs, 2015-07-11),
git-tag has started showing tags with ambiguous names (i.e.,
when both "heads/foo" and "tags/foo" exists) as "tags/foo"
instead of just "foo". This is both:
- pointless; the output of "git tag" includes only
refs/tags, so we know that "foo" means the one in
"refs/tags".
and
- ambiguous; in the original output, we know that the line
"foo" means that "refs/tags/foo" exists. In the new
output, it is unclear whether we mean "refs/tags/foo" or
"refs/tags/tags/foo".
The reason this happens is that commit b7cc53e9 switched
git-tag to use ref-filter's "%(refname:short)" output
formatting, which was adapted from for-each-ref. This more
general code does not know that we care only about tags, and
uses shorten_unambiguous_ref to get the short-name. We need
to tell it that we care only about "refs/tags/", and it
should shorten with respect to that value.
In theory, the ref-filter code could figure this out by us
passing FILTER_REFS_TAGS. But there are two complications
there:
1. The handling of refname:short is deep in formatting
code that does not even have our ref_filter struct, let
alone the arguments to the filter_ref struct.
2. In git v2.7.0, we expose the formatting language to the
user. If we follow this path, it will mean that
"%(refname:short)" behaves differently for "tag" versus
"for-each-ref" (including "for-each-ref refs/tags/"),
which can lead to confusion.
Instead, let's add a new modifier to the formatting
language, "strip", to remove a specific set of prefix
components. This fixes "git tag", and lets users invoke the
same behavior from their own custom formats (for "tag" or
"for-each-ref") while leaving ":short" with its same
consistent meaning in all places.
We introduce a test in t7004 for "git tag", which fails
without this patch. We also add a similar test in t3203 for
"git branch", which does not actually fail. But since it is
likely that "branch" will eventually use the same formatting
code, the test helps defend against future regressions.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-01-26 03:00:05 +00:00
|
|
|
test_expect_success 'ambiguous branch/tags not marked' '
|
|
|
|
git tag ambiguous &&
|
|
|
|
git branch ambiguous &&
|
|
|
|
echo ambiguous >expect &&
|
|
|
|
git tag -l ambiguous >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 18:40:57 +00:00
|
|
|
test_expect_success '--contains combined with --no-contains' '
|
|
|
|
(
|
|
|
|
git init no-contains &&
|
|
|
|
cd no-contains &&
|
|
|
|
test_commit v0.1 &&
|
|
|
|
test_commit v0.2 &&
|
|
|
|
test_commit v0.3 &&
|
|
|
|
test_commit v0.4 &&
|
|
|
|
test_commit v0.5 &&
|
|
|
|
cat >expected <<-\EOF &&
|
|
|
|
v0.2
|
|
|
|
v0.3
|
|
|
|
v0.4
|
|
|
|
EOF
|
|
|
|
git tag --contains v0.2 --no-contains v0.5 >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
# As the docs say, list tags which contain a specified *commit*. We
|
|
|
|
# don't recurse down to tags for trees or blobs pointed to by *those*
|
|
|
|
# commits.
|
|
|
|
test_expect_success 'Does --[no-]contains stop at commits? Yes!' '
|
|
|
|
cd no-contains &&
|
|
|
|
blob=$(git rev-parse v0.3:v0.3.t) &&
|
|
|
|
tree=$(git rev-parse v0.3^{tree}) &&
|
|
|
|
git tag tag-blob $blob &&
|
|
|
|
git tag tag-tree $tree &&
|
|
|
|
git tag --contains v0.3 >actual &&
|
|
|
|
cat >expected <<-\EOF &&
|
|
|
|
v0.3
|
|
|
|
v0.4
|
|
|
|
v0.5
|
|
|
|
EOF
|
|
|
|
test_cmp expected actual &&
|
|
|
|
git tag --no-contains v0.3 >actual &&
|
|
|
|
cat >expected <<-\EOF &&
|
|
|
|
v0.1
|
|
|
|
v0.2
|
|
|
|
EOF
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2007-06-28 20:09:12 +00:00
|
|
|
test_done
|