Re: [PATCH v2 05/11] ref-filter: add parse_opt_merge_filter()

2015-06-14 Thread karthik nayak
On Sun, Jun 14, 2015 at 11:19 AM, Christian Couder christian.cou...@gmail.com wrote: On Sat, Jun 13, 2015 at 10:18 PM, Karthik Nayak karthik@gmail.com wrote: diff --git a/ref-filter.h b/ref-filter.h index c2856b8..799e118 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -50,6 +50,18 @@

Re: [PATCH v2 05/11] ref-filter: add parse_opt_merge_filter()

2015-06-13 Thread Christian Couder
On Sat, Jun 13, 2015 at 10:18 PM, Karthik Nayak karthik@gmail.com wrote: diff --git a/ref-filter.h b/ref-filter.h index c2856b8..799e118 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -50,6 +50,18 @@ struct ref_filter_cbdata { struct ref_filter *filter; }; +/* Macros for

[PATCH v2 05/11] ref-filter: add parse_opt_merge_filter()

2015-06-13 Thread Karthik Nayak
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 p...@peff.net Mentored-by: Christian