Skip to content

Commit

Permalink
Make builtin-symbolic-ref.c use parse_options.
Browse files Browse the repository at this point in the history
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  • Loading branch information
Pierre Habouzit authored and Junio C Hamano committed Oct 30, 2007
1 parent 89942be commit 7855861
Showing 1 changed file with 18 additions and 34 deletions.
52 changes: 18 additions & 34 deletions builtin-symbolic-ref.c
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
#include "builtin.h"
#include "cache.h"
#include "refs.h"
#include "parse-options.h"

static const char git_symbolic_ref_usage[] =
"git-symbolic-ref [-q] [-m <reason>] name [ref]";
static const char * const git_symbolic_ref_usage[] = {
"git-symbolic-ref [options] name [ref]",
NULL
};

static void check_symref(const char *HEAD, int quiet)
{
Expand All @@ -26,44 +29,25 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
{
int quiet = 0;
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);

while (1 < argc) {
const char *arg = argv[1];
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++;
}

argc = parse_options(argc, argv, options, git_symbolic_ref_usage, 0);
if (msg &&!*msg)
die("Refusing to perform update with empty message");
switch (argc) {
case 2:
check_symref(argv[1], quiet);
case 1:
check_symref(argv[0], quiet);
break;
case 3:
create_symref(argv[1], argv[2], msg);
case 2:
create_symref(argv[0], argv[1], msg);
break;
default:
usage(git_symbolic_ref_usage);
usage_with_options(git_symbolic_ref_usage, options);
}
return 0;
}

0 comments on commit 7855861

Please sign in to comment.