undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make opt_parse_with_commit() non-static

Browse Source 
Moving opt_parse_with_commit() from branch to a common location, in
preparation for using it in tag. Rename it to match naming convention
of other option parsing functions.

Signed-off-by: Jake Goulding <goulding@vivisimo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jake Goulding 2009-01-26 09:13:23 -05:00 committed by Junio C Hamano
parent 98ef23b3b1
commit 269defdf30
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builtin-branch.c
View File

@ -466,22 +466,6 @@ static void rename_branch(const char *oldname, const char *newname, int force)
strbuf_release(&newsection); strbuf_release(&newsection);
} }
static int opt_parse_with_commit(const struct option *opt, const char *arg, int unset)
{
unsigned char sha1[20];
struct commit *commit;
if (!arg)
return -1;
if (get_sha1(arg, sha1))
die("malformed object name %s", arg);
commit = lookup_commit_reference(sha1);
if (!commit)
die("no such commit %s", arg);
commit_list_insert(commit, opt->value);
return 0;
}
static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset) static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset)
{ {
merge_filter = ((opt->long_name[0] == 'n') merge_filter = ((opt->long_name[0] == 'n')
@ -517,13 +501,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
OPTION_CALLBACK, 0, "contains", &with_commit, "commit", OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
"print only branches that contain the commit", "print only branches that contain the commit",
PARSE_OPT_LASTARG_DEFAULT, PARSE_OPT_LASTARG_DEFAULT,
opt_parse_with_commit, (intptr_t)"HEAD", parse_opt_with_commit, (intptr_t)"HEAD",
}, },
{ {
OPTION_CALLBACK, 0, "with", &with_commit, "commit", OPTION_CALLBACK, 0, "with", &with_commit, "commit",
"print only branches that contain the commit", "print only branches that contain the commit",
PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT, PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
opt_parse_with_commit, (intptr_t) "HEAD", parse_opt_with_commit, (intptr_t) "HEAD",
}, },
OPT__ABBREV(&abbrev), OPT__ABBREV(&abbrev),

17
parse-options.c
View File

@ -1,6 +1,7 @@
#include "git-compat-util.h" #include "git-compat-util.h"
#include "parse-options.h" #include "parse-options.h"
#include "cache.h" #include "cache.h"
#include "commit.h"
#define OPT_SHORT 1 #define OPT_SHORT 1
#define OPT_UNSET 2 #define OPT_UNSET 2
@ -506,6 +507,22 @@ int parse_opt_verbosity_cb(const struct option *opt, const char *arg,
return 0; return 0;
} }
int parse_opt_with_commit(const struct option *opt, const char *arg, int unset)
{
unsigned char sha1[20];
struct commit *commit;
if (!arg)
return -1;
if (get_sha1(arg, sha1))
return error("malformed object name %s", arg);
commit = lookup_commit_reference(sha1);
if (!commit)
return error("no such commit %s", arg);
commit_list_insert(commit, opt->value);
return 0;
}
/* /*
* This should really be OPTION_FILENAME type as a part of * This should really be OPTION_FILENAME type as a part of
* parse_options that take prefix to do this while parsing. * parse_options that take prefix to do this while parsing.

1
parse-options.h
View File

@ -151,6 +151,7 @@ extern int parse_options_end(struct parse_opt_ctx_t *ctx);
extern int parse_opt_abbrev_cb(const struct option *, const char *, int); extern int parse_opt_abbrev_cb(const struct option *, const char *, int);
extern int parse_opt_approxidate_cb(const struct option *, const char *, int); extern int parse_opt_approxidate_cb(const struct option *, const char *, int);
extern int parse_opt_verbosity_cb(const struct option *, const char *, int); extern int parse_opt_verbosity_cb(const struct option *, const char *, int);
extern int parse_opt_with_commit(const struct option *, const char *, int);
#define OPT__VERBOSE(var) OPT_BOOLEAN('v', "verbose", (var), "be verbose") #define OPT__VERBOSE(var) OPT_BOOLEAN('v', "verbose", (var), "be verbose")
#define OPT__QUIET(var) OPT_BOOLEAN('q', "quiet", (var), "be quiet") #define OPT__QUIET(var) OPT_BOOLEAN('q', "quiet", (var), "be quiet")