From: Karthik Nayak Date: Tue, 21 Jul 2015 19:28:53 GMT Subject: Re: [PATCH v3 9/9] tag.c: implement '--merged' and '--no-merged' options Message-ID: In-Reply-To: On Mon, Jul 20, 2015 at 12:50 AM, Christian Couder wrote: > On Sun, Jul 19, 2015 at 12:00 AM, Karthik Nayak wrote: >> From: Karthik Nayak >> >> 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 >> Mentored-by: Matthieu Moy >> Signed-off-by: Karthik Nayak >> --- >> 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 ... >> 'git tag' [-n[]] -l [--contains ] [--points-at ] >> [--column[=] | --no-column] [--sort=] [--format=] >> - [...] >> + [(--merged | --no-merged) []] [...] > > Maybe [--[no-]merged []] instead of [(--merged | --no-merged) > []]. > Looks better. will use. >> 'git tag' -v ... >> >> 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 []:: >> + Only list tags whose tips are reachable from the >> + specified commit (HEAD if not specified). >> + >> +--no-merged []:: >> + 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 []:: > + 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 ] [-f] [-m | -F ] []"), >> N_("git tag -d ..."), >> N_("git tag -l [-n[]] [--contains ] [--points-at ]" >> - "\n\t\t[...]"), >> + "\n\t\t[--merged []] [--no-merged []] [...]"), > > [--[no-]merged []] here too. > > Thanks, > Christian. Here too, thanks :) -- Regards, Karthik Nayak