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

Make builtin-update-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:14:43 +02:00 committed by Junio C Hamano
parent f81037947c
commit 89942be6a1
1 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
builtin-update-ref.c
View File

@ -1,59 +1,44 @@
#include "cache.h" #include "cache.h"
#include "refs.h" #include "refs.h"
#include "builtin.h" #include "builtin.h"
#include "parse-options.h"
static const char git_update_ref_usage[] = static const char * const git_update_ref_usage[] = {
"git-update-ref [-m <reason>] (-d <refname> <value> | [--no-deref] <refname> <value> [<oldval>])"; "git-update-ref [options] -d <refname> <oldval>",
"git-update-ref [options] <refname> <newval> [<oldval>]",
NULL
};
int cmd_update_ref(int argc, const char **argv, const char *prefix) int cmd_update_ref(int argc, const char **argv, const char *prefix)
{ {
const char *refname=NULL, *value=NULL, *oldval=NULL, *msg=NULL; const char *refname, *value, *oldval, *msg=NULL;
unsigned char sha1[20], oldsha1[20]; unsigned char sha1[20], oldsha1[20];
int i, delete, ref_flags; int delete = 0, no_deref = 0;
struct option options[] = {
OPT_STRING( 'm', NULL, &msg, "reason", "reason of the update"),
OPT_BOOLEAN('d', NULL, &delete, "deletes the reference"),
OPT_BOOLEAN( 0 , "no-deref", &no_deref,
"update <refname> not the one it points to"),
OPT_END(),
};
delete = 0;
ref_flags = 0;
git_config(git_default_config); git_config(git_default_config);
argc = parse_options(argc, argv, options, git_update_ref_usage, 0);
if (msg && !*msg)
die("Refusing to perform update with empty message.");
for (i = 1; i < argc; i++) { if (argc < 2 || argc > 3)
if (!strcmp("-m", argv[i])) { usage_with_options(git_update_ref_usage, options);
if (i+1 >= argc) refname = argv[0];
usage(git_update_ref_usage); value = argv[1];
msg = argv[++i]; oldval = argv[2];
if (!*msg)
die("Refusing to perform update with empty message.");
continue;
}
if (!strcmp("-d", argv[i])) {
delete = 1;
continue;
}
if (!strcmp("--no-deref", argv[i])) {
ref_flags |= REF_NODEREF;
continue;
}
if (!refname) {
refname = argv[i];
continue;
}
if (!value) {
value = argv[i];
continue;
}
if (!oldval) {
oldval = argv[i];
continue;
}
}
if (!refname || !value)
usage(git_update_ref_usage);
if (get_sha1(value, sha1)) if (get_sha1(value, sha1))
die("%s: not a valid SHA1", value); die("%s: not a valid SHA1", value);
if (delete) { if (delete) {
if (oldval) if (oldval)
usage(git_update_ref_usage); usage_with_options(git_update_ref_usage, options);
return delete_ref(refname, sha1); return delete_ref(refname, sha1);
} }
@ -62,5 +47,5 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
die("%s: not a valid old SHA1", oldval); die("%s: not a valid old SHA1", oldval);
return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL, return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL,
ref_flags, DIE_ON_ERR); no_deref ? REF_NODEREF : 0, DIE_ON_ERR);
} }