2007-07-20 01:42:28 +02:00
|
|
|
/*
|
|
|
|
|
* Builtin "git tag"
|
|
|
|
|
*
|
|
|
|
|
* Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>,
|
|
|
|
|
* Carlos Rica <jasampler@gmail.com>
|
|
|
|
|
* Based on git-tag.sh and mktag.c by Linus Torvalds.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "cache.h"
|
|
|
|
|
#include "builtin.h"
|
|
|
|
|
#include "refs.h"
|
|
|
|
|
#include "tag.h"
|
|
|
|
|
#include "run-command.h"
|
2007-11-09 14:42:56 +01:00
|
|
|
#include "parse-options.h"
|
2011-06-11 21:04:08 +02:00
|
|
|
#include "diff.h"
|
|
|
|
|
#include "revision.h"
|
2011-09-08 06:19:47 +02:00
|
|
|
#include "gpg-interface.h"
|
2012-02-09 00:03:43 +01:00
|
|
|
#include "sha1-array.h"
|
2012-04-13 12:54:41 +02:00
|
|
|
#include "column.h"
|
2015-09-10 17:48:27 +02:00
|
|
|
#include "ref-filter.h"
|
2007-11-09 14:42:56 +01:00
|
|
|
|
|
|
|
|
static const char * const git_tag_usage[] = {
|
2015-01-13 08:44:47 +01:00
|
|
|
N_("git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<head>]"),
|
2012-08-20 14:32:47 +02:00
|
|
|
N_("git tag -d <tagname>..."),
|
2015-01-13 08:44:47 +01:00
|
|
|
N_("git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]"
|
2015-09-10 18:22:49 +02:00
|
|
|
"\n\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"),
|
2012-08-20 14:32:47 +02:00
|
|
|
N_("git tag -v <tagname>..."),
|
2007-11-09 14:42:56 +01:00
|
|
|
NULL
|
|
|
|
|
};
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2012-04-13 12:54:41 +02:00
|
|
|
static unsigned int colopts;
|
2012-02-09 00:03:43 +01:00
|
|
|
|
2015-09-11 17:06:46 +02:00
|
|
|
static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, const char *format)
|
2012-02-06 09:13:12 +01:00
|
|
|
{
|
2015-09-10 17:48:27 +02:00
|
|
|
struct ref_array array;
|
2015-09-11 17:06:46 +02:00
|
|
|
char *to_free = NULL;
|
2012-02-06 09:13:12 +01:00
|
|
|
int i;
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2015-09-10 17:48:27 +02:00
|
|
|
memset(&array, 0, sizeof(array));
|
2009-01-26 15:13:25 +01:00
|
|
|
|
2015-09-10 17:48:27 +02:00
|
|
|
if (filter->lines == -1)
|
|
|
|
|
filter->lines = 0;
|
2012-02-09 00:03:43 +01:00
|
|
|
|
2015-09-11 17:06:46 +02:00
|
|
|
if (!format) {
|
|
|
|
|
if (filter->lines) {
|
|
|
|
|
to_free = xstrfmt("%s %%(contents:lines=%d)",
|
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 04:00:05 +01:00
|
|
|
"%(align:15)%(refname:strip=2)%(end)",
|
2015-09-11 17:06:46 +02:00
|
|
|
filter->lines);
|
|
|
|
|
format = to_free;
|
|
|
|
|
} else
|
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 04:00:05 +01:00
|
|
|
format = "%(refname:strip=2)";
|
2007-07-20 01:42:28 +02:00
|
|
|
}
|
|
|
|
|
|
2015-09-11 17:06:16 +02:00
|
|
|
verify_ref_format(format);
|
2015-10-18 12:25:04 +02:00
|
|
|
filter->with_commit_tag_algo = 1;
|
2015-09-11 17:06:16 +02:00
|
|
|
filter_refs(&array, filter, FILTER_REFS_TAGS);
|
|
|
|
|
ref_array_sort(sorting, &array);
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2015-09-11 17:06:16 +02:00
|
|
|
for (i = 0; i < array.nr; i++)
|
|
|
|
|
show_ref_array_item(array.items[i], format, 0);
|
|
|
|
|
ref_array_clear(&array);
|
|
|
|
|
free(to_free);
|
2014-02-27 13:56:52 +01:00
|
|
|
|
2007-07-20 01:42:28 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2007-07-21 14:13:12 +02:00
|
|
|
typedef int (*each_tag_name_fn)(const char *name, const char *ref,
|
2007-07-20 01:42:28 +02:00
|
|
|
const unsigned char *sha1);
|
|
|
|
|
|
2007-07-21 14:13:12 +02:00
|
|
|
static int for_each_tag_name(const char **argv, each_tag_name_fn fn)
|
2007-07-20 01:42:28 +02:00
|
|
|
{
|
|
|
|
|
const char **p;
|
|
|
|
|
char ref[PATH_MAX];
|
|
|
|
|
int had_error = 0;
|
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
|
|
|
|
|
for (p = argv; *p; p++) {
|
|
|
|
|
if (snprintf(ref, sizeof(ref), "refs/tags/%s", *p)
|
|
|
|
|
>= sizeof(ref)) {
|
2011-02-23 00:42:09 +01:00
|
|
|
error(_("tag name too long: %.*s..."), 50, *p);
|
2007-07-20 01:42:28 +02:00
|
|
|
had_error = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2011-11-13 11:22:14 +01:00
|
|
|
if (read_ref(ref, sha1)) {
|
2011-02-23 00:42:09 +01:00
|
|
|
error(_("tag '%s' not found."), *p);
|
2007-07-20 01:42:28 +02:00
|
|
|
had_error = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (fn(*p, ref, sha1))
|
|
|
|
|
had_error = 1;
|
|
|
|
|
}
|
|
|
|
|
return had_error;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int delete_tag(const char *name, const char *ref,
|
|
|
|
|
const unsigned char *sha1)
|
|
|
|
|
{
|
2008-10-26 03:33:56 +01:00
|
|
|
if (delete_ref(ref, sha1, 0))
|
2007-07-20 01:42:28 +02:00
|
|
|
return 1;
|
2011-02-23 00:42:09 +01:00
|
|
|
printf(_("Deleted tag '%s' (was %s)\n"), name, find_unique_abbrev(sha1, DEFAULT_ABBREV));
|
2007-07-20 01:42:28 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int verify_tag(const char *name, const char *ref,
|
|
|
|
|
const unsigned char *sha1)
|
|
|
|
|
{
|
2010-04-15 11:36:25 +02:00
|
|
|
const char *argv_verify_tag[] = {"verify-tag",
|
2007-07-20 01:42:28 +02:00
|
|
|
"-v", "SHA1_HEX", NULL};
|
|
|
|
|
argv_verify_tag[2] = sha1_to_hex(sha1);
|
|
|
|
|
|
2010-04-15 11:36:25 +02:00
|
|
|
if (run_command_v_opt(argv_verify_tag, RUN_GIT_CMD))
|
2011-02-23 00:42:09 +01:00
|
|
|
return error(_("could not verify the tag '%s'"), name);
|
2007-07-20 01:42:28 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2007-09-10 12:35:09 +02:00
|
|
|
static int do_sign(struct strbuf *buffer)
|
2007-07-20 01:42:28 +02:00
|
|
|
{
|
2011-09-08 06:19:47 +02:00
|
|
|
return sign_buffer(buffer, buffer, get_signing_key());
|
2007-07-20 01:42:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const char tag_template[] =
|
2013-08-30 00:03:10 +02:00
|
|
|
N_("\nWrite a message for tag:\n %s\n"
|
2013-01-16 20:18:48 +01:00
|
|
|
"Lines starting with '%c' will be ignored.\n");
|
2011-12-07 04:01:45 +01:00
|
|
|
|
|
|
|
|
static const char tag_template_nocleanup[] =
|
2013-08-30 00:03:10 +02:00
|
|
|
N_("\nWrite a message for tag:\n %s\n"
|
2013-01-16 20:18:48 +01:00
|
|
|
"Lines starting with '%c' will be kept; you may remove them"
|
|
|
|
|
" yourself if you want to.\n");
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2015-09-11 17:06:16 +02:00
|
|
|
/* Parse arg given and add it the ref_sorting array */
|
|
|
|
|
static int parse_sorting_string(const char *arg, struct ref_sorting **sorting_tail)
|
2014-07-16 23:48:02 +02:00
|
|
|
{
|
2015-09-11 17:06:16 +02:00
|
|
|
struct ref_sorting *s;
|
|
|
|
|
int len;
|
2014-07-16 23:48:02 +02:00
|
|
|
|
2015-09-11 17:06:16 +02:00
|
|
|
s = xcalloc(1, sizeof(*s));
|
|
|
|
|
s->next = *sorting_tail;
|
|
|
|
|
*sorting_tail = s;
|
2014-07-16 23:48:02 +02:00
|
|
|
|
2015-09-11 17:06:16 +02:00
|
|
|
if (*arg == '-') {
|
|
|
|
|
s->reverse = 1;
|
|
|
|
|
arg++;
|
2014-07-16 23:48:02 +02:00
|
|
|
}
|
2015-09-11 17:06:16 +02:00
|
|
|
if (skip_prefix(arg, "version:", &arg) ||
|
|
|
|
|
skip_prefix(arg, "v:", &arg))
|
|
|
|
|
s->version = 1;
|
2014-07-16 23:48:02 +02:00
|
|
|
|
2015-09-11 17:06:16 +02:00
|
|
|
len = strlen(arg);
|
|
|
|
|
s->atom = parse_ref_filter_atom(arg, arg+len);
|
2014-07-16 23:48:02 +02:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2008-05-14 19:46:53 +02:00
|
|
|
static int git_tag_config(const char *var, const char *value, void *cb)
|
2007-07-20 01:42:28 +02:00
|
|
|
{
|
2014-07-16 23:48:02 +02:00
|
|
|
int status;
|
2015-09-11 17:06:16 +02:00
|
|
|
struct ref_sorting **sorting_tail = (struct ref_sorting **)cb;
|
2014-07-16 23:48:02 +02:00
|
|
|
|
|
|
|
|
if (!strcmp(var, "tag.sort")) {
|
|
|
|
|
if (!value)
|
|
|
|
|
return config_error_nonbool(var);
|
2015-09-11 17:06:16 +02:00
|
|
|
parse_sorting_string(value, sorting_tail);
|
2014-07-16 23:48:02 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
status = git_gpg_config(var, value, cb);
|
2011-09-08 06:19:47 +02:00
|
|
|
if (status)
|
|
|
|
|
return status;
|
2013-11-30 21:55:40 +01:00
|
|
|
if (starts_with(var, "column."))
|
2012-04-13 12:54:41 +02:00
|
|
|
return git_column_config(var, value, "tag", &colopts);
|
2008-05-14 19:46:53 +02:00
|
|
|
return git_default_config(var, value, cb);
|
2007-07-20 01:42:28 +02:00
|
|
|
}
|
|
|
|
|
|
2007-11-04 01:11:14 +01:00
|
|
|
static void write_tag_body(int fd, const unsigned char *sha1)
|
|
|
|
|
{
|
|
|
|
|
unsigned long size;
|
|
|
|
|
enum object_type type;
|
2010-11-10 12:17:28 +01:00
|
|
|
char *buf, *sp;
|
2007-11-04 01:11:14 +01:00
|
|
|
|
|
|
|
|
buf = read_sha1_file(sha1, &type, &size);
|
|
|
|
|
if (!buf)
|
|
|
|
|
return;
|
|
|
|
|
/* skip header */
|
|
|
|
|
sp = strstr(buf, "\n\n");
|
|
|
|
|
|
|
|
|
|
if (!sp || !size || type != OBJ_TAG) {
|
|
|
|
|
free(buf);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
sp += 2; /* skip the 2 LFs */
|
2010-11-10 12:17:28 +01:00
|
|
|
write_or_die(fd, sp, parse_signature(sp, buf + size - sp));
|
2007-11-04 01:11:14 +01:00
|
|
|
|
|
|
|
|
free(buf);
|
|
|
|
|
}
|
|
|
|
|
|
2008-12-06 20:40:34 +01:00
|
|
|
static int build_tag_object(struct strbuf *buf, int sign, unsigned char *result)
|
|
|
|
|
{
|
|
|
|
|
if (sign && do_sign(buf) < 0)
|
2011-02-23 00:42:09 +01:00
|
|
|
return error(_("unable to sign the tag"));
|
2008-12-06 20:40:34 +01:00
|
|
|
if (write_sha1_file(buf->buf, buf->len, tag_type, result) < 0)
|
2011-02-23 00:42:09 +01:00
|
|
|
return error(_("unable to write tag file"));
|
2008-12-06 20:40:34 +01:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-07 04:01:45 +01:00
|
|
|
struct create_tag_options {
|
|
|
|
|
unsigned int message_given:1;
|
|
|
|
|
unsigned int sign;
|
|
|
|
|
enum {
|
|
|
|
|
CLEANUP_NONE,
|
|
|
|
|
CLEANUP_SPACE,
|
|
|
|
|
CLEANUP_ALL
|
|
|
|
|
} cleanup_mode;
|
|
|
|
|
};
|
|
|
|
|
|
2007-07-20 01:42:28 +02:00
|
|
|
static void create_tag(const unsigned char *object, const char *tag,
|
2011-12-07 04:01:45 +01:00
|
|
|
struct strbuf *buf, struct create_tag_options *opt,
|
2007-11-23 08:16:51 +01:00
|
|
|
unsigned char *prev, unsigned char *result)
|
2007-07-20 01:42:28 +02:00
|
|
|
{
|
|
|
|
|
enum object_type type;
|
2007-09-10 12:35:09 +02:00
|
|
|
char header_buf[1024];
|
|
|
|
|
int header_len;
|
2008-12-06 20:40:34 +01:00
|
|
|
char *path = NULL;
|
2007-07-20 01:42:28 +02:00
|
|
|
|
|
|
|
|
type = sha1_object_info(object, NULL);
|
2007-07-21 14:13:12 +02:00
|
|
|
if (type <= OBJ_NONE)
|
2011-02-23 00:42:09 +01:00
|
|
|
die(_("bad object type."));
|
2007-07-20 01:42:28 +02:00
|
|
|
|
|
|
|
|
header_len = snprintf(header_buf, sizeof(header_buf),
|
|
|
|
|
"object %s\n"
|
|
|
|
|
"type %s\n"
|
|
|
|
|
"tag %s\n"
|
|
|
|
|
"tagger %s\n\n",
|
|
|
|
|
sha1_to_hex(object),
|
|
|
|
|
typename(type),
|
|
|
|
|
tag,
|
2012-05-25 01:28:40 +02:00
|
|
|
git_committer_info(IDENT_STRICT));
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2007-07-21 14:13:12 +02:00
|
|
|
if (header_len > sizeof(header_buf) - 1)
|
2011-02-23 00:42:09 +01:00
|
|
|
die(_("tag header too big."));
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2011-12-07 04:01:45 +01:00
|
|
|
if (!opt->message_given) {
|
2007-07-20 01:42:28 +02:00
|
|
|
int fd;
|
|
|
|
|
|
|
|
|
|
/* write the template message before editing: */
|
2008-10-27 11:22:09 +01:00
|
|
|
path = git_pathdup("TAG_EDITMSG");
|
2007-07-20 01:42:28 +02:00
|
|
|
fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
|
|
|
|
|
if (fd < 0)
|
2011-02-23 00:42:09 +01:00
|
|
|
die_errno(_("could not create file '%s'"), path);
|
2007-11-04 01:11:14 +01:00
|
|
|
|
2013-01-16 20:18:48 +01:00
|
|
|
if (!is_null_sha1(prev)) {
|
2007-11-04 01:11:14 +01:00
|
|
|
write_tag_body(fd, prev);
|
2013-01-16 20:18:48 +01:00
|
|
|
} else {
|
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
|
strbuf_addch(&buf, '\n');
|
|
|
|
|
if (opt->cleanup_mode == CLEANUP_ALL)
|
2013-08-30 00:03:10 +02:00
|
|
|
strbuf_commented_addf(&buf, _(tag_template), tag, comment_line_char);
|
2013-01-16 20:18:48 +01:00
|
|
|
else
|
2013-08-30 00:03:10 +02:00
|
|
|
strbuf_commented_addf(&buf, _(tag_template_nocleanup), tag, comment_line_char);
|
2013-01-16 20:18:48 +01:00
|
|
|
write_or_die(fd, buf.buf, buf.len);
|
|
|
|
|
strbuf_release(&buf);
|
|
|
|
|
}
|
2007-07-20 01:42:28 +02:00
|
|
|
close(fd);
|
|
|
|
|
|
2008-07-25 18:28:42 +02:00
|
|
|
if (launch_editor(path, buf, NULL)) {
|
|
|
|
|
fprintf(stderr,
|
2011-02-23 00:42:09 +01:00
|
|
|
_("Please supply the message using either -m or -F option.\n"));
|
2008-07-25 18:28:42 +02:00
|
|
|
exit(1);
|
|
|
|
|
}
|
2007-07-20 01:42:28 +02:00
|
|
|
}
|
|
|
|
|
|
2011-12-07 04:01:45 +01:00
|
|
|
if (opt->cleanup_mode != CLEANUP_NONE)
|
2015-10-16 17:16:42 +02:00
|
|
|
strbuf_stripspace(buf, opt->cleanup_mode == CLEANUP_ALL);
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2011-12-07 04:01:45 +01:00
|
|
|
if (!opt->message_given && !buf->len)
|
2011-02-23 00:42:09 +01:00
|
|
|
die(_("no tag message?"));
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2007-09-10 12:35:09 +02:00
|
|
|
strbuf_insert(buf, 0, header_buf, header_len);
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2011-12-07 04:01:45 +01:00
|
|
|
if (build_tag_object(buf, opt->sign, result) < 0) {
|
2008-12-06 20:40:34 +01:00
|
|
|
if (path)
|
2011-02-23 00:42:09 +01:00
|
|
|
fprintf(stderr, _("The tag message has been left in %s\n"),
|
2008-12-06 20:40:34 +01:00
|
|
|
path);
|
|
|
|
|
exit(128);
|
|
|
|
|
}
|
|
|
|
|
if (path) {
|
2009-04-29 23:22:56 +02:00
|
|
|
unlink_or_warn(path);
|
2008-12-06 20:40:34 +01:00
|
|
|
free(path);
|
|
|
|
|
}
|
2007-07-20 01:42:28 +02:00
|
|
|
}
|
|
|
|
|
|
2007-11-23 08:16:51 +01:00
|
|
|
struct msg_arg {
|
|
|
|
|
int given;
|
|
|
|
|
struct strbuf buf;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int parse_msg_arg(const struct option *opt, const char *arg, int unset)
|
|
|
|
|
{
|
|
|
|
|
struct msg_arg *msg = opt->value;
|
|
|
|
|
|
|
|
|
|
if (!arg)
|
|
|
|
|
return -1;
|
|
|
|
|
if (msg->buf.len)
|
|
|
|
|
strbuf_addstr(&(msg->buf), "\n\n");
|
|
|
|
|
strbuf_addstr(&(msg->buf), arg);
|
|
|
|
|
msg->given = 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-10 01:36:36 +02:00
|
|
|
static int strbuf_check_tag_ref(struct strbuf *sb, const char *name)
|
|
|
|
|
{
|
|
|
|
|
if (name[0] == '-')
|
2011-09-15 23:10:25 +02:00
|
|
|
return -1;
|
2011-05-10 01:36:36 +02:00
|
|
|
|
|
|
|
|
strbuf_reset(sb);
|
|
|
|
|
strbuf_addf(sb, "refs/tags/%s", name);
|
|
|
|
|
|
2011-09-15 23:10:25 +02:00
|
|
|
return check_refname_format(sb->buf, 0);
|
2011-05-10 01:36:36 +02:00
|
|
|
}
|
|
|
|
|
|
2007-07-20 01:42:28 +02:00
|
|
|
int cmd_tag(int argc, const char **argv, const char *prefix)
|
|
|
|
|
{
|
2008-10-09 21:12:12 +02:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2011-05-10 01:36:36 +02:00
|
|
|
struct strbuf ref = STRBUF_INIT;
|
2007-07-20 01:42:28 +02:00
|
|
|
unsigned char object[20], prev[20];
|
|
|
|
|
const char *object_ref, *tag;
|
2011-12-07 04:01:45 +01:00
|
|
|
struct create_tag_options opt;
|
|
|
|
|
char *cleanup_arg = NULL;
|
2015-07-21 23:04:55 +02:00
|
|
|
int create_reflog = 0;
|
2015-09-10 17:48:27 +02:00
|
|
|
int annotate = 0, force = 0;
|
2014-07-16 23:48:02 +02:00
|
|
|
int cmdmode = 0;
|
2008-08-06 20:43:47 +02:00
|
|
|
const char *msgfile = NULL, *keyid = NULL;
|
2007-11-23 08:16:51 +01:00
|
|
|
struct msg_arg msg = { 0, STRBUF_INIT };
|
2014-04-17 00:30:41 +02:00
|
|
|
struct ref_transaction *transaction;
|
|
|
|
|
struct strbuf err = STRBUF_INIT;
|
2015-09-10 17:48:27 +02:00
|
|
|
struct ref_filter filter;
|
2015-09-11 17:06:16 +02:00
|
|
|
static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
|
2015-09-11 17:06:46 +02:00
|
|
|
const char *format = NULL;
|
2007-11-09 14:42:56 +01:00
|
|
|
struct option options[] = {
|
2013-07-30 21:31:27 +02:00
|
|
|
OPT_CMDMODE('l', "list", &cmdmode, N_("list tag names"), 'l'),
|
2015-09-10 17:48:27 +02:00
|
|
|
{ OPTION_INTEGER, 'n', NULL, &filter.lines, N_("n"),
|
2012-08-20 14:32:47 +02:00
|
|
|
N_("print <n> lines of each tag message"),
|
2007-11-09 14:42:56 +01:00
|
|
|
PARSE_OPT_OPTARG, NULL, 1 },
|
2013-07-30 21:31:27 +02:00
|
|
|
OPT_CMDMODE('d', "delete", &cmdmode, N_("delete tags"), 'd'),
|
|
|
|
|
OPT_CMDMODE('v', "verify", &cmdmode, N_("verify tags"), 'v'),
|
2007-11-09 14:42:56 +01:00
|
|
|
|
2012-08-20 14:32:47 +02:00
|
|
|
OPT_GROUP(N_("Tag creation options")),
|
2013-08-03 13:51:19 +02:00
|
|
|
OPT_BOOL('a', "annotate", &annotate,
|
2012-08-20 14:32:47 +02:00
|
|
|
N_("annotated tag, needs a message")),
|
|
|
|
|
OPT_CALLBACK('m', "message", &msg, N_("message"),
|
|
|
|
|
N_("tag message"), parse_msg_arg),
|
|
|
|
|
OPT_FILENAME('F', "file", &msgfile, N_("read message from file")),
|
2013-08-03 13:51:19 +02:00
|
|
|
OPT_BOOL('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")),
|
2012-08-20 14:32:47 +02:00
|
|
|
OPT_STRING(0, "cleanup", &cleanup_arg, N_("mode"),
|
|
|
|
|
N_("how to strip spaces and #comments from message")),
|
2014-03-23 23:58:12 +01:00
|
|
|
OPT_STRING('u', "local-user", &keyid, N_("key-id"),
|
2012-08-20 14:32:47 +02:00
|
|
|
N_("use another key to sign the tag")),
|
|
|
|
|
OPT__FORCE(&force, N_("replace the tag if exists")),
|
2015-09-11 18:04:13 +02:00
|
|
|
OPT_BOOL(0, "create-reflog", &create_reflog, N_("create a reflog")),
|
2015-03-12 19:15:09 +01:00
|
|
|
|
|
|
|
|
OPT_GROUP(N_("Tag listing options")),
|
2012-08-20 14:32:47 +02:00
|
|
|
OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),
|
2015-09-10 17:48:27 +02:00
|
|
|
OPT_CONTAINS(&filter.with_commit, N_("print only tags that contain the commit")),
|
|
|
|
|
OPT_WITH(&filter.with_commit, N_("print only tags that contain the commit")),
|
2015-09-10 18:22:49 +02:00
|
|
|
OPT_MERGED(&filter, N_("print only tags that are merged")),
|
|
|
|
|
OPT_NO_MERGED(&filter, N_("print only tags that are not merged")),
|
2015-09-11 17:06:16 +02:00
|
|
|
OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"),
|
|
|
|
|
N_("field name to sort on"), &parse_opt_ref_sorting),
|
2009-01-26 15:13:25 +01:00
|
|
|
{
|
2015-09-10 17:48:27 +02:00
|
|
|
OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"),
|
2015-07-07 18:06:08 +02:00
|
|
|
N_("print only tags of the object"), 0, parse_opt_object_name
|
2012-02-09 00:03:43 +01:00
|
|
|
},
|
2015-09-11 17:06:46 +02:00
|
|
|
OPT_STRING( 0 , "format", &format, N_("format"), N_("format to use for the output")),
|
2007-11-09 14:42:56 +01:00
|
|
|
OPT_END()
|
|
|
|
|
};
|
|
|
|
|
|
2015-09-11 17:06:16 +02:00
|
|
|
git_config(git_tag_config, sorting_tail);
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2011-12-07 04:01:45 +01:00
|
|
|
memset(&opt, 0, sizeof(opt));
|
2015-09-10 17:48:27 +02:00
|
|
|
memset(&filter, 0, sizeof(filter));
|
|
|
|
|
filter.lines = -1;
|
2011-12-07 04:01:45 +01:00
|
|
|
|
2009-05-23 20:53:12 +02:00
|
|
|
argc = parse_options(argc, argv, prefix, options, git_tag_usage, 0);
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2007-12-11 05:08:06 +01:00
|
|
|
if (keyid) {
|
2011-12-07 04:01:45 +01:00
|
|
|
opt.sign = 1;
|
2011-09-08 06:19:47 +02:00
|
|
|
set_signing_key(keyid);
|
2007-12-11 05:08:06 +01:00
|
|
|
}
|
2011-12-07 04:01:45 +01:00
|
|
|
if (opt.sign)
|
2007-11-26 00:21:42 +01:00
|
|
|
annotate = 1;
|
2013-07-30 21:31:27 +02:00
|
|
|
if (argc == 0 && !cmdmode)
|
|
|
|
|
cmdmode = 'l';
|
2007-11-26 00:21:42 +01:00
|
|
|
|
2013-07-30 21:31:27 +02:00
|
|
|
if ((annotate || msg.given || msgfile || force) && (cmdmode != 0))
|
2008-11-05 00:20:31 +01:00
|
|
|
usage_with_options(git_tag_usage, options);
|
|
|
|
|
|
2012-04-13 12:54:41 +02:00
|
|
|
finalize_colopts(&colopts, -1);
|
2015-09-10 17:48:27 +02:00
|
|
|
if (cmdmode == 'l' && filter.lines != -1) {
|
2012-04-13 12:54:41 +02:00
|
|
|
if (explicitly_enable_column(colopts))
|
|
|
|
|
die(_("--column and -n are incompatible"));
|
|
|
|
|
colopts = 0;
|
|
|
|
|
}
|
2015-09-11 17:06:16 +02:00
|
|
|
if (!sorting)
|
|
|
|
|
sorting = ref_default_sorting();
|
2013-07-30 21:31:27 +02:00
|
|
|
if (cmdmode == 'l') {
|
2012-04-13 12:54:41 +02:00
|
|
|
int ret;
|
|
|
|
|
if (column_active(colopts)) {
|
|
|
|
|
struct column_options copts;
|
|
|
|
|
memset(&copts, 0, sizeof(copts));
|
|
|
|
|
copts.padding = 2;
|
|
|
|
|
run_column_filter(colopts, &copts);
|
|
|
|
|
}
|
2015-09-10 17:48:27 +02:00
|
|
|
filter.name_patterns = argv;
|
2015-09-11 17:06:46 +02:00
|
|
|
ret = list_tags(&filter, sorting, format);
|
2012-04-13 12:54:41 +02:00
|
|
|
if (column_active(colopts))
|
|
|
|
|
stop_column_filter();
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
2015-09-10 17:48:27 +02:00
|
|
|
if (filter.lines != -1)
|
2011-02-23 00:42:09 +01:00
|
|
|
die(_("-n option is only allowed with -l."));
|
2015-09-10 17:48:27 +02:00
|
|
|
if (filter.with_commit)
|
2011-02-23 00:42:09 +01:00
|
|
|
die(_("--contains option is only allowed with -l."));
|
2015-09-10 17:48:27 +02:00
|
|
|
if (filter.points_at.nr)
|
2012-02-09 00:03:43 +01:00
|
|
|
die(_("--points-at option is only allowed with -l."));
|
2015-09-10 18:22:49 +02:00
|
|
|
if (filter.merge_commit)
|
|
|
|
|
die(_("--merged and --no-merged option are only allowed with -l"));
|
2013-07-30 21:31:27 +02:00
|
|
|
if (cmdmode == 'd')
|
2007-11-09 14:42:56 +01:00
|
|
|
return for_each_tag_name(argv, delete_tag);
|
2013-07-30 21:31:27 +02:00
|
|
|
if (cmdmode == 'v')
|
2007-11-09 14:42:56 +01:00
|
|
|
return for_each_tag_name(argv, verify_tag);
|
|
|
|
|
|
2007-11-23 08:16:51 +01:00
|
|
|
if (msg.given || msgfile) {
|
|
|
|
|
if (msg.given && msgfile)
|
2011-02-23 00:42:09 +01:00
|
|
|
die(_("only one -F or -m option is allowed."));
|
2007-11-09 14:42:56 +01:00
|
|
|
annotate = 1;
|
2007-11-23 08:16:51 +01:00
|
|
|
if (msg.given)
|
|
|
|
|
strbuf_addbuf(&buf, &(msg.buf));
|
2007-11-09 14:42:56 +01:00
|
|
|
else {
|
|
|
|
|
if (!strcmp(msgfile, "-")) {
|
2007-09-27 15:25:55 +02:00
|
|
|
if (strbuf_read(&buf, 0, 1024) < 0)
|
2011-02-23 00:42:09 +01:00
|
|
|
die_errno(_("cannot read '%s'"), msgfile);
|
2007-09-27 15:25:55 +02:00
|
|
|
} else {
|
2007-11-09 14:42:56 +01:00
|
|
|
if (strbuf_read_file(&buf, msgfile, 1024) < 0)
|
2011-02-23 00:42:09 +01:00
|
|
|
die_errno(_("could not open or read '%s'"),
|
2009-06-27 17:58:46 +02:00
|
|
|
msgfile);
|
2007-07-20 01:42:28 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-11-09 14:42:56 +01:00
|
|
|
tag = argv[0];
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2007-11-09 14:42:56 +01:00
|
|
|
object_ref = argc == 2 ? argv[1] : "HEAD";
|
|
|
|
|
if (argc > 2)
|
2011-02-23 00:42:09 +01:00
|
|
|
die(_("too many params"));
|
2007-07-20 01:42:28 +02:00
|
|
|
|
|
|
|
|
if (get_sha1(object_ref, object))
|
2011-02-23 00:42:09 +01:00
|
|
|
die(_("Failed to resolve '%s' as a valid ref."), object_ref);
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2011-05-10 01:36:36 +02:00
|
|
|
if (strbuf_check_tag_ref(&ref, tag))
|
2011-02-23 00:42:09 +01:00
|
|
|
die(_("'%s' is not a valid tag name."), tag);
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2011-11-13 11:22:14 +01:00
|
|
|
if (read_ref(ref.buf, prev))
|
2007-07-20 01:42:28 +02:00
|
|
|
hashclr(prev);
|
|
|
|
|
else if (!force)
|
2011-02-23 00:42:09 +01:00
|
|
|
die(_("tag '%s' already exists"), tag);
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2011-12-07 04:01:45 +01:00
|
|
|
opt.message_given = msg.given || msgfile;
|
|
|
|
|
|
|
|
|
|
if (!cleanup_arg || !strcmp(cleanup_arg, "strip"))
|
|
|
|
|
opt.cleanup_mode = CLEANUP_ALL;
|
|
|
|
|
else if (!strcmp(cleanup_arg, "verbatim"))
|
|
|
|
|
opt.cleanup_mode = CLEANUP_NONE;
|
|
|
|
|
else if (!strcmp(cleanup_arg, "whitespace"))
|
|
|
|
|
opt.cleanup_mode = CLEANUP_SPACE;
|
|
|
|
|
else
|
|
|
|
|
die(_("Invalid cleanup mode %s"), cleanup_arg);
|
|
|
|
|
|
2007-07-20 01:42:28 +02:00
|
|
|
if (annotate)
|
2011-12-07 04:01:45 +01:00
|
|
|
create_tag(object, tag, &buf, &opt, prev, object);
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2014-04-17 00:30:41 +02:00
|
|
|
transaction = ref_transaction_begin(&err);
|
|
|
|
|
if (!transaction ||
|
|
|
|
|
ref_transaction_update(transaction, ref.buf, object, prev,
|
2015-07-21 23:04:55 +02:00
|
|
|
create_reflog ? REF_FORCE_CREATE_REFLOG : 0,
|
|
|
|
|
NULL, &err) ||
|
2014-04-30 21:22:42 +02:00
|
|
|
ref_transaction_commit(transaction, &err))
|
2014-04-17 00:30:41 +02:00
|
|
|
die("%s", err.buf);
|
|
|
|
|
ref_transaction_free(transaction);
|
2013-03-13 00:13:41 +01:00
|
|
|
if (force && !is_null_sha1(prev) && hashcmp(prev, object))
|
2011-02-23 00:42:09 +01:00
|
|
|
printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev, DEFAULT_ABBREV));
|
2007-07-20 01:42:28 +02:00
|
|
|
|
2014-04-17 00:30:41 +02:00
|
|
|
strbuf_release(&err);
|
2007-09-10 12:35:09 +02:00
|
|
|
strbuf_release(&buf);
|
2011-05-10 01:36:36 +02:00
|
|
|
strbuf_release(&ref);
|
2007-07-20 01:42:28 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|