diff options
| author | Karthik Nayak <karthik.188@gmail.com> | 2015-07-07 16:06:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 17:25:28 (GMT) |
| commit | 5afcb90560586765bf21fb09959a8b4497804639 (patch) | |
| tree | e7af9e16be17a555eb2cbaec09b15591516b0bc6 /ref-filter.c | |
| parent | d325406ef2f3c819d02ac838fb2a3f8e021d08ae (diff) | |
| download | git-5afcb90560586765bf21fb09959a8b4497804639.zip git-5afcb90560586765bf21fb09959a8b4497804639.tar.gz git-5afcb90560586765bf21fb09959a8b4497804639.tar.bz2 | |
ref-filter: add parse_opt_merge_filter()
Add 'parse_opt_merge_filter()' to parse '--merged' and '--no-merged'
options and write macros for the same.
This is copied from 'builtin/branch.c' which will eventually be removed
when we port 'branch.c' to use ref-filter APIs.
Based-on-patch-by: Jeff King <peff@peff.net>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/ref-filter.c b/ref-filter.c index 2efe30a..4fe5a7a 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1134,3 +1134,22 @@ int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset) s->atom = parse_ref_filter_atom(arg, arg+len); return 0; } + +int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset) +{ + struct ref_filter *rf = opt->value; + unsigned char sha1[20]; + + rf->merge = starts_with(opt->long_name, "no") + ? REF_FILTER_MERGED_OMIT + : REF_FILTER_MERGED_INCLUDE; + + if (get_sha1(arg, sha1)) + die(_("malformed object name %s"), arg); + + rf->merge_commit = lookup_commit_reference_gently(sha1, 0); + if (!rf->merge_commit) + return opterror(opt, "must point to a commit", 0); + + return 0; +} |