On Sun, Jul 19, 2015 at 12:00 AM, Karthik Nayak <karthik....@gmail.com> wrote:
> From: Karthik Nayak <karthik....@gmail.com>
>
> Using 'ref-filter' APIs implement the '--merged' and '--no-merged'
> options into 'tag.c'. The '--merged' option lets the user to only
> list tags merged into the named commit. The '--no-merged' option
> lets the user to only list tags not merged into the named commit.
> If no object is provided it assumes HEAD as the object.
>
> Add documentation and tests for the same.
>
> Mentored-by: Christian Couder <christian.cou...@gmail.com>
> Mentored-by: Matthieu Moy <matthieu....@grenoble-inp.fr>
> Signed-off-by: Karthik Nayak <karthik....@gmail.com>
> ---
> Documentation/git-tag.txt | 10 +++++++++-
> builtin/tag.c | 6 +++++-
> t/t7004-tag.sh | 27 +++++++++++++++++++++++++++
> 3 files changed, 41 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
> index 16e396c..74ed157 100644
> --- a/Documentation/git-tag.txt
> +++ b/Documentation/git-tag.txt
> @@ -14,7 +14,7 @@ SYNOPSIS
> 'git tag' -d <tagname>...
> 'git tag' [-n[<num>]] -l [--contains <commit>] [--points-at <object>]
> [--column[=<options>] | --no-column] [--sort=<key>]
> [--format=<format>]
> - [<pattern>...]
> + [(--merged | --no-merged) [<commit>]] [<pattern>...]
Maybe [--[no-]merged [<commit>]] instead of [(--merged | --no-merged)
[<commit>]].
> 'git tag' -v <tagname>...
>
> DESCRIPTION
> @@ -169,6 +169,14 @@ This option is only applicable when listing tags without
> annotation lines.
> `%09` to `\t` (TAB) and `%0a` to `\n` (LF).
> The fields are same as those in `git for-each-ref`.
>
> +--merged [<commit>]::
> + Only list tags whose tips are reachable from the
> + specified commit (HEAD if not specified).
> +
> +--no-merged [<commit>]::
> + Only list tags whose tips are not reachable from the
> + specified commit (HEAD if not specified).
Here also you could write something like:
+--[no-]merged [<commit>]::
+ Only list tags whose tips are reachable, or not reachable
+ if --no-merged is used, from the specified commit
+ (HEAD if not specified).
>
> CONFIGURATION
> -------------
> diff --git a/builtin/tag.c b/builtin/tag.c
> index cae113b..0fa1d31 100644
> --- a/builtin/tag.c
> +++ b/builtin/tag.c
> @@ -23,7 +23,7 @@ static const char * const git_tag_usage[] = {
> N_("git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]
> <tagname> [<head>]"),
> N_("git tag -d <tagname>..."),
> N_("git tag -l [-n[<num>]] [--contains <commit>] [--points-at
> <object>]"
> - "\n\t\t[<pattern>...]"),
> + "\n\t\t[--merged [<commit>]] [--no-merged [<commit>]]
> [<pattern>...]"),
[--[no-]merged [<commit>]] here too.
Thanks,
Christian.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
