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

Make builtin-symbolic-ref.c use parse_options.

Browse Source 
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Pierre Habouzit 2007-10-07 23:18:23 +02:00 committed by Junio C Hamano
parent 89942be6a1
commit 785586142a
1 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
builtin-symbolic-ref.c
View File

@ -1,9 +1,12 @@
#include "builtin.h" #include "builtin.h"
#include "cache.h" #include "cache.h"
#include "refs.h" #include "refs.h"
#include "parse-options.h"
static const char git_symbolic_ref_usage[] = static const char * const git_symbolic_ref_usage[] = {
"git-symbolic-ref [-q] [-m <reason>] name [ref]"; "git-symbolic-ref [options] name [ref]",
NULL
};
static void check_symref(const char *HEAD, int quiet) static void check_symref(const char *HEAD, int quiet)
{ {
@ -26,44 +29,25 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
{ {
int quiet = 0; int quiet = 0;
const char *msg = NULL; const char *msg = NULL;
struct option options[] = {
OPT__QUIET(&quiet),
OPT_STRING('m', NULL, &msg, "reason", "reason of the update"),
OPT_END(),
};
git_config(git_default_config); git_config(git_default_config);
argc = parse_options(argc, argv, options, git_symbolic_ref_usage, 0);
while (1 < argc) { if (msg &&!*msg)
const char *arg = argv[1]; die("Refusing to perform update with empty message");
if (arg[0] != '-')
break;
else if (!strcmp("-q", arg))
quiet = 1;
else if (!strcmp("-m", arg)) {
argc--;
argv++;
if (argc <= 1)
break;
msg = argv[1];
if (!*msg)
die("Refusing to perform update with empty message");
}
else if (!strcmp("--", arg)) {
argc--;
argv++;
break;
}
else
die("unknown option %s", arg);
argc--;
argv++;
}
switch (argc) { switch (argc) {
case 2: case 1:
check_symref(argv[1], quiet); check_symref(argv[0], quiet);
break; break;
case 3: case 2:
create_symref(argv[1], argv[2], msg); create_symref(argv[0], argv[1], msg);
break; break;
default: default:
usage(git_symbolic_ref_usage); usage_with_options(git_symbolic_ref_usage, options);
} }
return 0; return 0;
} }