git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFC/PATCH 4/9] parse-options: add parse_opt_merge_filter()

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 8, 2015, 19:20 UTC
Message-ID
<xmqqvbey9fcx.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1433621052-5588-4-git-send-email-karthik.188@gmail.com>
Karthik Nayak <karthik.188@gmail.com> writes:
Show 20 quoted lines
> +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 = opt->long_name[0] == 'n'
> +		? REF_FILTER_MERGED_OMIT
> +		: REF_FILTER_MERGED_INCLUDE;
> +
> +	if (!arg)
> +		arg = "HEAD";
> +	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;
> +}

Again, this smells too specific to live as a part of parse-options infrastructure. If we want to have two helper callbacks, one that gives the results in an sha1-array (because there is no guarantee that you want only commits) and in a commit-list, I am fine with having parse_opt_object_name() and parse_opt_with_commit(). Perhaps rename the latter which was named too specifically to something more sensible (e.g. parse_opt_commit_object_name()) and use it from the caller you wanted to use parse_opt_merge_filter()? The caller, if it is not prepared to see more than one commits specified, may have to check if (!list || !list->next) { die("I want one and only one") } or something, though.

Having it in ref-filter.h as parse_opt_merge_filter() is fine, though. After all, you would be sharing it with for-each-ref, branch and tag and nobody else anyway.

Show 26 quoted lines
> diff --git a/parse-options.h b/parse-options.h
> index 3ae16a1..7bcf0f3 100644
> --- a/parse-options.h
> +++ b/parse-options.h
> @@ -221,6 +221,7 @@ extern int parse_opt_expiry_date_cb(const struct option *, const char *, int);
>  extern int parse_opt_color_flag_cb(const struct option *, const char *, int);
>  extern int parse_opt_verbosity_cb(const struct option *, const char *, int);
>  extern int parse_opt_points_at(const struct option *, const char *, int);
> +extern int parse_opt_merge_filter(const struct option *, const char *, int);
>  extern int parse_opt_with_commit(const struct option *, const char *, int);
>  extern int parse_opt_tertiary(const struct option *, const char *, int);
>  extern int parse_opt_string_list(const struct option *, const char *, int);
> @@ -243,5 +244,15 @@ extern int parse_opt_noop_cb(const struct option *, const char *, int);
>  	OPT_COLOR_FLAG(0, "color", (var), (h))
>  #define OPT_COLUMN(s, l, v, h) \
>  	{ OPTION_CALLBACK, (s), (l), (v), N_("style"), (h), PARSE_OPT_OPTARG, parseopt_column_callback }
> +#define OPT_NO_MERGED(filter, h) \
> +	{ OPTION_CALLBACK, 0, "no-merged", (filter), N_("commit"), (h), \
> +	  PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, \
> +	  parse_opt_merge_filter, (intptr_t) "HEAD" \
> +	}
> +#define OPT_MERGED(filter, h) \
> +	{ OPTION_CALLBACK, 0, "merged", (filter), N_("commit"), (h), \
> +	  PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, \
> +	  parse_opt_merge_filter, (intptr_t) "HEAD" \
> +	}
Likewise.
Previous: Karthik NayakNext: Karthik Nayak
Message 20 of 37 in “add options to ref-filter”
  1. 0/9 add options to ref-filterKarthik Nayak, Jun 6, 2015
  2. 1/9 tag: libify parse_opt_points_at()Karthik Nayak, Jun 6, 2015
  3. 2/9 ref-filter: implement '--points-at' optionKarthik Nayak, Jun 6, 2015
  4. Matthieu MoyJun 8, 2015
  5. Karthik NayakJun 8, 2015
  6. Matthieu MoyJun 8, 2015
  7. Karthik NayakJun 8, 2015
  8. 3/9 for-each-ref: add '--points-at' optionKarthik Nayak, Jun 6, 2015
  9. Matthieu MoyJun 8, 2015
  10. Karthik NayakJun 8, 2015
  11. Junio C HamanoJun 8, 2015
  12. Karthik NayakJun 9, 2015
  13. Junio C HamanoJun 9, 2015
  14. Karthik NayakJun 10, 2015
  15. Matthieu MoyJun 10, 2015
  16. Karthik NayakJun 10, 2015
  17. 4/9 parse-options: add parse_opt_merge_filter()Karthik Nayak, Jun 6, 2015
  18. Matthieu MoyJun 8, 2015
  19. Karthik NayakJun 8, 2015
  20. Junio C HamanoJun 8, 2015
  21. Karthik NayakJun 9, 2015
  22. 5/9 ref-filter: implement '--merged' and '--no-merged' optionsKarthik Nayak, Jun 6, 2015
  23. Matthieu MoyJun 8, 2015
  24. Karthik NayakJun 8, 2015
  25. 6/9 for-each-ref: add '--merged' and '--no-merged' optionsKarthik Nayak, Jun 6, 2015
  26. Matthieu MoyJun 8, 2015
  27. Karthik NayakJun 8, 2015
  28. 7/9 parse-options.h: add macros for '--contains' optionKarthik Nayak, Jun 6, 2015
  29. Junio C HamanoJun 8, 2015
  30. Karthik NayakJun 9, 2015
  31. 8/9 ref-filter: add '--contains' optionKarthik Nayak, Jun 6, 2015
  32. 9/9 for-each-ref: add '--contains' optionKarthik Nayak, Jun 6, 2015
  33. Junio C HamanoJun 8, 2015
  34. Karthik NayakJun 9, 2015
  35. Christian CouderJun 7, 2015
  36. Karthik NayakJun 8, 2015
  37. Junio C HamanoJun 8, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.