mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
git-tag: Add --contains option
This functions similarly to "git branch --contains"; it will show all tags that contain the specified commit, by sharing the same logic. The patch also adds documentation and tests for the new option. Signed-off-by: Jake Goulding <goulding@vivisimo.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7fcdb36e29
commit
32c35cfb1e
|
@ -12,7 +12,7 @@ SYNOPSIS
|
||||||
'git tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]
|
'git tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]
|
||||||
<name> [<commit> | <object>]
|
<name> [<commit> | <object>]
|
||||||
'git tag' -d <name>...
|
'git tag' -d <name>...
|
||||||
'git tag' [-n[<num>]] -l [<pattern>]
|
'git tag' [-n[<num>]] -l [--contains <commit>] [<pattern>]
|
||||||
'git tag' -v <name>...
|
'git tag' -v <name>...
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
|
@ -68,6 +68,9 @@ OPTIONS
|
||||||
List tags with names that match the given pattern (or all if no pattern is given).
|
List tags with names that match the given pattern (or all if no pattern is given).
|
||||||
Typing "git tag" without arguments, also lists all tags.
|
Typing "git tag" without arguments, also lists all tags.
|
||||||
|
|
||||||
|
--contains <commit>::
|
||||||
|
Only list tags which contain the specified commit.
|
||||||
|
|
||||||
-m <msg>::
|
-m <msg>::
|
||||||
Use the given tag message (instead of prompting).
|
Use the given tag message (instead of prompting).
|
||||||
If multiple `-m` options are given, their values are
|
If multiple `-m` options are given, their values are
|
||||||
|
|
|
@ -26,6 +26,7 @@ static char signingkey[1000];
|
||||||
struct tag_filter {
|
struct tag_filter {
|
||||||
const char *pattern;
|
const char *pattern;
|
||||||
int lines;
|
int lines;
|
||||||
|
struct commit_list *with_commit;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
|
#define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
|
||||||
|
@ -42,6 +43,16 @@ static int show_reference(const char *refname, const unsigned char *sha1,
|
||||||
char *buf, *sp, *eol;
|
char *buf, *sp, *eol;
|
||||||
size_t len;
|
size_t len;
|
||||||
|
|
||||||
|
if (filter->with_commit) {
|
||||||
|
struct commit *commit;
|
||||||
|
|
||||||
|
commit = lookup_commit_reference_gently(sha1, 1);
|
||||||
|
if (!commit)
|
||||||
|
return 0;
|
||||||
|
if (!is_descendant_of(commit, filter->with_commit))
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (!filter->lines) {
|
if (!filter->lines) {
|
||||||
printf("%s\n", refname);
|
printf("%s\n", refname);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -79,7 +90,8 @@ static int show_reference(const char *refname, const unsigned char *sha1,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int list_tags(const char *pattern, int lines)
|
static int list_tags(const char *pattern, int lines,
|
||||||
|
struct commit_list *with_commit)
|
||||||
{
|
{
|
||||||
struct tag_filter filter;
|
struct tag_filter filter;
|
||||||
|
|
||||||
|
@ -88,6 +100,7 @@ static int list_tags(const char *pattern, int lines)
|
||||||
|
|
||||||
filter.pattern = pattern;
|
filter.pattern = pattern;
|
||||||
filter.lines = lines;
|
filter.lines = lines;
|
||||||
|
filter.with_commit = with_commit;
|
||||||
|
|
||||||
for_each_tag_ref(show_reference, (void *) &filter);
|
for_each_tag_ref(show_reference, (void *) &filter);
|
||||||
|
|
||||||
|
@ -360,6 +373,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
|
||||||
list = 0, delete = 0, verify = 0;
|
list = 0, delete = 0, verify = 0;
|
||||||
const char *msgfile = NULL, *keyid = NULL;
|
const char *msgfile = NULL, *keyid = NULL;
|
||||||
struct msg_arg msg = { 0, STRBUF_INIT };
|
struct msg_arg msg = { 0, STRBUF_INIT };
|
||||||
|
struct commit_list *with_commit = NULL;
|
||||||
struct option options[] = {
|
struct option options[] = {
|
||||||
OPT_BOOLEAN('l', NULL, &list, "list tag names"),
|
OPT_BOOLEAN('l', NULL, &list, "list tag names"),
|
||||||
{ OPTION_INTEGER, 'n', NULL, &lines, NULL,
|
{ OPTION_INTEGER, 'n', NULL, &lines, NULL,
|
||||||
|
@ -378,6 +392,14 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
|
||||||
OPT_STRING('u', NULL, &keyid, "key-id",
|
OPT_STRING('u', NULL, &keyid, "key-id",
|
||||||
"use another key to sign the tag"),
|
"use another key to sign the tag"),
|
||||||
OPT_BOOLEAN('f', NULL, &force, "replace the tag if exists"),
|
OPT_BOOLEAN('f', NULL, &force, "replace the tag if exists"),
|
||||||
|
|
||||||
|
OPT_GROUP("Tag listing options"),
|
||||||
|
{
|
||||||
|
OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
|
||||||
|
"print only tags that contain the commit",
|
||||||
|
PARSE_OPT_LASTARG_DEFAULT,
|
||||||
|
parse_opt_with_commit, (intptr_t)"HEAD",
|
||||||
|
},
|
||||||
OPT_END()
|
OPT_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -402,9 +424,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
|
||||||
if (list + delete + verify > 1)
|
if (list + delete + verify > 1)
|
||||||
usage_with_options(git_tag_usage, options);
|
usage_with_options(git_tag_usage, options);
|
||||||
if (list)
|
if (list)
|
||||||
return list_tags(argv[0], lines == -1 ? 0 : lines);
|
return list_tags(argv[0], lines == -1 ? 0 : lines,
|
||||||
|
with_commit);
|
||||||
if (lines != -1)
|
if (lines != -1)
|
||||||
die("-n option is only allowed with -l.");
|
die("-n option is only allowed with -l.");
|
||||||
|
if (with_commit)
|
||||||
|
die("--contains option is only allowed with -l.");
|
||||||
if (delete)
|
if (delete)
|
||||||
return for_each_tag_name(argv, delete_tag);
|
return for_each_tag_name(argv, delete_tag);
|
||||||
if (verify)
|
if (verify)
|
||||||
|
|
115
t/t7004-tag.sh
115
t/t7004-tag.sh
|
@ -1090,6 +1090,121 @@ test_expect_success 'filename for the message is relative to cwd' '
|
||||||
git cat-file tag tag-from-subdir-2 | grep "in sub directory"
|
git cat-file tag tag-from-subdir-2 | grep "in sub directory"
|
||||||
'
|
'
|
||||||
|
|
||||||
|
# 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 &&
|
||||||
|
git commit -m second
|
||||||
|
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)' "
|
||||||
|
git tag -l --contains $hash1 v* >actual
|
||||||
|
test_cmp expected actual
|
||||||
|
"
|
||||||
|
|
||||||
|
# other ways of specifying the commit
|
||||||
|
test_expect_success 'checking that first commit is in all tags (tag)' "
|
||||||
|
git tag -l --contains v1.0 v* >actual
|
||||||
|
test_cmp expected actual
|
||||||
|
"
|
||||||
|
|
||||||
|
test_expect_success 'checking that first commit is in all tags (relative)' "
|
||||||
|
git tag -l --contains HEAD~2 v* >actual
|
||||||
|
test_cmp expected actual
|
||||||
|
"
|
||||||
|
|
||||||
|
cat > expected <<EOF
|
||||||
|
v2.0
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_expect_success 'checking that second commit only has one tag' "
|
||||||
|
git tag -l --contains $hash2 v* >actual
|
||||||
|
test_cmp expected actual
|
||||||
|
"
|
||||||
|
|
||||||
|
|
||||||
|
cat > expected <<EOF
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_expect_success 'checking that third commit has no tags' "
|
||||||
|
git tag -l --contains $hash3 v* >actual
|
||||||
|
test_cmp expected actual
|
||||||
|
"
|
||||||
|
|
||||||
|
# how about a simple merge?
|
||||||
|
|
||||||
|
test_expect_success 'creating simple branch' '
|
||||||
|
git branch stable v2.0 &&
|
||||||
|
git checkout stable &&
|
||||||
|
echo foo-3.0 > foo &&
|
||||||
|
git commit foo -m fourth
|
||||||
|
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' "
|
||||||
|
git tag -l --contains $hash4 v* >actual
|
||||||
|
test_cmp expected actual
|
||||||
|
"
|
||||||
|
|
||||||
|
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' "
|
||||||
|
git tag -l --contains $hash3 v* >actual
|
||||||
|
test_cmp expected actual
|
||||||
|
"
|
||||||
|
|
||||||
|
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' "
|
||||||
|
git tag -l --contains $hash1 v* >actual
|
||||||
|
test_cmp expected actual
|
||||||
|
"
|
||||||
|
|
||||||
# mixing modes and options:
|
# mixing modes and options:
|
||||||
|
|
||||||
test_expect_success 'mixing incompatibles modes and options is forbidden' '
|
test_expect_success 'mixing incompatibles modes and options is forbidden' '
|
||||||
|
|
Loading…
Reference in a new issue