From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v7 08/11] parse-option: rename parse_opt_with_commit()
Date: Thu, 2 Jul 2015 20:51:07 +0530 [thread overview]
Message-ID: <1435850470-5175-8-git-send-email-karthik.188@gmail.com> (raw)
In-Reply-To: <1435850470-5175-1-git-send-email-karthik.188@gmail.com>
Rename parse_opt_with_commit() to parse_opt_commits() to show
that it can be used to obtain a list of commits and is not
constricted to usage of '--contains' option.
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>
---
builtin/branch.c | 4 ++--
builtin/tag.c | 4 ++--
parse-options-cb.c | 2 +-
parse-options.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index e63102e..ae9a0eb 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -832,13 +832,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"),
N_("print only branches that contain the commit"),
PARSE_OPT_LASTARG_DEFAULT,
- parse_opt_with_commit, (intptr_t)"HEAD",
+ parse_opt_commits, (intptr_t)"HEAD",
},
{
OPTION_CALLBACK, 0, "with", &with_commit, N_("commit"),
N_("print only branches that contain the commit"),
PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
- parse_opt_with_commit, (intptr_t) "HEAD",
+ parse_opt_commits, (intptr_t) "HEAD",
},
OPT__ABBREV(&abbrev),
diff --git a/builtin/tag.c b/builtin/tag.c
index 280981f..7af45a0 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -603,13 +603,13 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"),
N_("print only tags that contain the commit"),
PARSE_OPT_LASTARG_DEFAULT,
- parse_opt_with_commit, (intptr_t)"HEAD",
+ parse_opt_commits, (intptr_t)"HEAD",
},
{
OPTION_CALLBACK, 0, "with", &with_commit, N_("commit"),
N_("print only tags that contain the commit"),
PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
- parse_opt_with_commit, (intptr_t)"HEAD",
+ parse_opt_commits, (intptr_t)"HEAD",
},
{
OPTION_CALLBACK, 0, "points-at", &points_at, N_("object"),
diff --git a/parse-options-cb.c b/parse-options-cb.c
index de75411..632f10f 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -77,7 +77,7 @@ int parse_opt_verbosity_cb(const struct option *opt, const char *arg,
return 0;
}
-int parse_opt_with_commit(const struct option *opt, const char *arg, int unset)
+int parse_opt_commits(const struct option *opt, const char *arg, int unset)
{
unsigned char sha1[20];
struct commit *commit;
diff --git a/parse-options.h b/parse-options.h
index 1478818..583690c 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -224,7 +224,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_object_name(const struct option *, const char *, int);
-extern int parse_opt_with_commit(const struct option *, const char *, int);
+extern int parse_opt_commits(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);
extern int parse_opt_noop_cb(const struct option *, const char *, int);
--
2.4.4
next prev parent reply other threads:[~2015-07-02 15:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-02 15:20 [PATCH v7 00/11] add options to for-each-ref Karthik Nayak
2015-07-02 15:21 ` [PATCH v7 01/11] t6302: for-each-ref tests for ref-filter APIs Karthik Nayak
2015-07-02 15:21 ` [PATCH v7 02/11] tag: libify parse_opt_points_at() Karthik Nayak
2015-07-02 15:21 ` [PATCH v7 03/11] ref-filter: implement '--points-at' option Karthik Nayak
2015-07-02 15:21 ` [PATCH v7 04/11] for-each-ref: add " Karthik Nayak
2015-07-02 17:05 ` Matthieu Moy
2015-07-05 16:01 ` Karthik Nayak
2015-07-02 15:21 ` [PATCH v7 05/11] ref-filter: add parse_opt_merge_filter() Karthik Nayak
2015-07-02 17:06 ` Matthieu Moy
2015-07-02 17:21 ` Karthik Nayak
2015-07-02 15:21 ` [PATCH v7 06/11] ref-filter: implement '--merged' and '--no-merged' options Karthik Nayak
2015-07-02 15:21 ` [PATCH v7 07/11] for-each-ref: add " Karthik Nayak
2015-07-02 15:21 ` Karthik Nayak [this message]
2015-07-02 15:21 ` [PATCH v7 09/11] parse-options.h: add macros for '--contains' option Karthik Nayak
2015-07-02 17:08 ` Matthieu Moy
2015-07-02 17:22 ` Karthik Nayak
2015-07-02 15:21 ` [PATCH v7 10/11] ref-filter: implement " Karthik Nayak
2015-07-02 17:12 ` Matthieu Moy
2015-07-02 17:24 ` Karthik Nayak
2015-07-02 15:21 ` [PATCH v7 11/11] for-each-ref: add " Karthik Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435850470-5175-8-git-send-email-karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.