2005-09-25 20:43:05 +02:00
|
|
|
#include "cache.h"
|
|
|
|
#include "refs.h"
|
2006-06-13 22:22:00 +02:00
|
|
|
#include "builtin.h"
|
2007-10-07 23:14:43 +02:00
|
|
|
#include "parse-options.h"
|
2013-09-09 15:22:32 +02:00
|
|
|
#include "quote.h"
|
|
|
|
#include "argv-array.h"
|
2005-09-25 20:43:05 +02:00
|
|
|
|
2007-10-07 23:14:43 +02:00
|
|
|
static const char * const git_update_ref_usage[] = {
|
2012-08-20 14:32:49 +02:00
|
|
|
N_("git update-ref [options] -d <refname> [<oldval>]"),
|
|
|
|
N_("git update-ref [options] <refname> <newval> [<oldval>]"),
|
2013-09-09 15:22:32 +02:00
|
|
|
N_("git update-ref [options] --stdin [-z]"),
|
2007-10-07 23:14:43 +02:00
|
|
|
NULL
|
|
|
|
};
|
2005-09-26 01:28:51 +02:00
|
|
|
|
2013-09-09 15:22:32 +02:00
|
|
|
static char line_termination = '\n';
|
|
|
|
static int update_flags;
|
2014-04-30 21:22:42 +02:00
|
|
|
static const char *msg;
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:47:54 +02:00
|
|
|
/*
|
|
|
|
* Parse one whitespace- or NUL-terminated, possibly C-quoted argument
|
|
|
|
* and append the result to arg. Return a pointer to the terminator.
|
|
|
|
* Die if there is an error in how the argument is C-quoted. This
|
|
|
|
* function is only used if not -z.
|
|
|
|
*/
|
2013-09-09 15:22:32 +02:00
|
|
|
static const char *parse_arg(const char *next, struct strbuf *arg)
|
|
|
|
{
|
2014-04-07 15:47:54 +02:00
|
|
|
if (*next == '"') {
|
|
|
|
const char *orig = next;
|
|
|
|
|
|
|
|
if (unquote_c_style(arg, next, &next))
|
|
|
|
die("badly quoted argument: %s", orig);
|
|
|
|
if (*next && !isspace(*next))
|
|
|
|
die("unexpected character after quoted argument: %s", orig);
|
|
|
|
} else {
|
2013-09-09 15:22:32 +02:00
|
|
|
while (*next && !isspace(*next))
|
|
|
|
strbuf_addch(arg, *next++);
|
2014-04-07 15:47:54 +02:00
|
|
|
}
|
2013-09-09 15:22:32 +02:00
|
|
|
|
|
|
|
return next;
|
|
|
|
}
|
|
|
|
|
2014-04-07 15:47:58 +02:00
|
|
|
/*
|
2014-04-07 15:48:00 +02:00
|
|
|
* Parse the reference name immediately after "command SP". If not
|
|
|
|
* -z, then handle C-quoting. Return a pointer to a newly allocated
|
|
|
|
* string containing the name of the reference, or NULL if there was
|
|
|
|
* an error. Update *next to point at the character that terminates
|
|
|
|
* the argument. Die if C-quoting is malformed or the reference name
|
|
|
|
* is invalid.
|
2014-04-07 15:47:58 +02:00
|
|
|
*/
|
2014-04-07 15:48:00 +02:00
|
|
|
static char *parse_refname(struct strbuf *input, const char **next)
|
2013-09-09 15:22:32 +02:00
|
|
|
{
|
2014-04-07 15:48:00 +02:00
|
|
|
struct strbuf ref = STRBUF_INIT;
|
|
|
|
|
2013-09-09 15:22:32 +02:00
|
|
|
if (line_termination) {
|
|
|
|
/* Without -z, use the next argument */
|
2014-04-07 15:48:00 +02:00
|
|
|
*next = parse_arg(*next, &ref);
|
2013-09-09 15:22:32 +02:00
|
|
|
} else {
|
2014-04-07 15:47:58 +02:00
|
|
|
/* With -z, use everything up to the next NUL */
|
2014-04-07 15:48:00 +02:00
|
|
|
strbuf_addstr(&ref, *next);
|
|
|
|
*next += ref.len;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ref.len) {
|
|
|
|
strbuf_release(&ref);
|
|
|
|
return NULL;
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
2014-04-07 15:48:00 +02:00
|
|
|
|
|
|
|
if (check_refname_format(ref.buf, REFNAME_ALLOW_ONELEVEL))
|
|
|
|
die("invalid ref format: %s", ref.buf);
|
|
|
|
|
|
|
|
return strbuf_detach(&ref, NULL);
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
2014-04-07 15:47:58 +02:00
|
|
|
/*
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
* The value being parsed is <oldvalue> (as opposed to <newvalue>; the
|
|
|
|
* difference affects which error messages are generated):
|
|
|
|
*/
|
|
|
|
#define PARSE_SHA1_OLD 0x01
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For backwards compatibility, accept an empty string for update's
|
|
|
|
* <newvalue> in binary mode to be equivalent to specifying zeros.
|
|
|
|
*/
|
|
|
|
#define PARSE_SHA1_ALLOW_EMPTY 0x02
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parse an argument separator followed by the next argument, if any.
|
|
|
|
* If there is an argument, convert it to a SHA-1, write it to sha1,
|
|
|
|
* set *next to point at the character terminating the argument, and
|
2014-04-07 15:47:58 +02:00
|
|
|
* return 0. If there is no argument at all (not even the empty
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
* string), return 1 and leave *next unchanged. If the value is
|
|
|
|
* provided but cannot be converted to a SHA-1, die. flags can
|
|
|
|
* include PARSE_SHA1_OLD and/or PARSE_SHA1_ALLOW_EMPTY.
|
2014-04-07 15:47:58 +02:00
|
|
|
*/
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
static int parse_next_sha1(struct strbuf *input, const char **next,
|
|
|
|
unsigned char *sha1,
|
|
|
|
const char *command, const char *refname,
|
|
|
|
int flags)
|
2013-09-09 15:22:32 +02:00
|
|
|
{
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
struct strbuf arg = STRBUF_INIT;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (*next == input->buf + input->len)
|
|
|
|
goto eof;
|
|
|
|
|
2013-09-09 15:22:32 +02:00
|
|
|
if (line_termination) {
|
|
|
|
/* Without -z, consume SP and use next argument */
|
2014-04-07 15:47:58 +02:00
|
|
|
if (!**next || **next == line_termination)
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
return 1;
|
2014-04-07 15:47:58 +02:00
|
|
|
if (**next != ' ')
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
die("%s %s: expected SP but got: %s",
|
|
|
|
command, refname, *next);
|
2014-04-07 15:47:58 +02:00
|
|
|
(*next)++;
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
*next = parse_arg(*next, &arg);
|
|
|
|
if (arg.len) {
|
|
|
|
if (get_sha1(arg.buf, sha1))
|
|
|
|
goto invalid;
|
|
|
|
} else {
|
|
|
|
/* Without -z, an empty value means all zeros: */
|
|
|
|
hashclr(sha1);
|
|
|
|
}
|
2013-09-09 15:22:32 +02:00
|
|
|
} else {
|
|
|
|
/* With -z, read the next NUL-terminated line */
|
2014-04-07 15:47:58 +02:00
|
|
|
if (**next)
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
die("%s %s: expected NUL but got: %s",
|
|
|
|
command, refname, *next);
|
2014-04-07 15:47:58 +02:00
|
|
|
(*next)++;
|
|
|
|
if (*next == input->buf + input->len)
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
goto eof;
|
|
|
|
strbuf_addstr(&arg, *next);
|
|
|
|
*next += arg.len;
|
|
|
|
|
|
|
|
if (arg.len) {
|
|
|
|
if (get_sha1(arg.buf, sha1))
|
|
|
|
goto invalid;
|
|
|
|
} else if (flags & PARSE_SHA1_ALLOW_EMPTY) {
|
|
|
|
/* With -z, treat an empty value as all zeros: */
|
2014-04-07 15:48:06 +02:00
|
|
|
warning("%s %s: missing <newvalue>, treating as zero",
|
|
|
|
command, refname);
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
hashclr(sha1);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* With -z, an empty non-required value means
|
|
|
|
* unspecified:
|
|
|
|
*/
|
|
|
|
ret = 1;
|
|
|
|
}
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
|
|
|
|
strbuf_release(&arg);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
invalid:
|
|
|
|
die(flags & PARSE_SHA1_OLD ?
|
|
|
|
"%s %s: invalid <oldvalue>: %s" :
|
|
|
|
"%s %s: invalid <newvalue>: %s",
|
|
|
|
command, refname, arg.buf);
|
|
|
|
|
|
|
|
eof:
|
|
|
|
die(flags & PARSE_SHA1_OLD ?
|
2014-04-07 15:48:08 +02:00
|
|
|
"%s %s: unexpected end of input when reading <oldvalue>" :
|
|
|
|
"%s %s: unexpected end of input when reading <newvalue>",
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
command, refname);
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
2014-04-07 15:47:58 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The following five parse_cmd_*() functions parse the corresponding
|
|
|
|
* command. In each case, next points at the character following the
|
|
|
|
* command name and the following space. They each return a pointer
|
|
|
|
* to the character terminating the command, and die with an
|
|
|
|
* explanatory message if there are any parsing problems. All of
|
|
|
|
* these functions handle either text or binary format input,
|
|
|
|
* depending on how line_termination is set.
|
|
|
|
*/
|
|
|
|
|
2014-09-02 23:11:21 +02:00
|
|
|
static const char *parse_cmd_update(struct ref_transaction *transaction,
|
|
|
|
struct strbuf *input, const char *next)
|
2013-09-09 15:22:32 +02:00
|
|
|
{
|
2014-09-02 23:10:52 +02:00
|
|
|
struct strbuf err = STRBUF_INIT;
|
2014-04-07 15:48:11 +02:00
|
|
|
char *refname;
|
|
|
|
unsigned char new_sha1[20];
|
|
|
|
unsigned char old_sha1[20];
|
|
|
|
int have_old;
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:48:11 +02:00
|
|
|
refname = parse_refname(input, &next);
|
|
|
|
if (!refname)
|
2014-04-07 15:48:09 +02:00
|
|
|
die("update: missing <ref>");
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:48:11 +02:00
|
|
|
if (parse_next_sha1(input, &next, new_sha1, "update", refname,
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
PARSE_SHA1_ALLOW_EMPTY))
|
2014-04-07 15:48:11 +02:00
|
|
|
die("update %s: missing <newvalue>", refname);
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:48:11 +02:00
|
|
|
have_old = !parse_next_sha1(input, &next, old_sha1, "update", refname,
|
|
|
|
PARSE_SHA1_OLD);
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
|
|
|
|
if (*next != line_termination)
|
2014-04-07 15:48:11 +02:00
|
|
|
die("update %s: extra input: %s", refname, next);
|
|
|
|
|
2014-06-20 16:43:00 +02:00
|
|
|
if (ref_transaction_update(transaction, refname, new_sha1, old_sha1,
|
2014-04-30 21:22:42 +02:00
|
|
|
update_flags, have_old, msg, &err))
|
2014-06-20 16:43:00 +02:00
|
|
|
die("%s", err.buf);
|
2014-04-07 15:48:11 +02:00
|
|
|
|
|
|
|
update_flags = 0;
|
|
|
|
free(refname);
|
2014-09-02 23:10:52 +02:00
|
|
|
strbuf_release(&err);
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:47:58 +02:00
|
|
|
return next;
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
2014-09-02 23:11:21 +02:00
|
|
|
static const char *parse_cmd_create(struct ref_transaction *transaction,
|
|
|
|
struct strbuf *input, const char *next)
|
2013-09-09 15:22:32 +02:00
|
|
|
{
|
2014-09-02 23:10:52 +02:00
|
|
|
struct strbuf err = STRBUF_INIT;
|
2014-04-07 15:48:11 +02:00
|
|
|
char *refname;
|
|
|
|
unsigned char new_sha1[20];
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:48:11 +02:00
|
|
|
refname = parse_refname(input, &next);
|
|
|
|
if (!refname)
|
2014-04-07 15:48:09 +02:00
|
|
|
die("create: missing <ref>");
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:48:11 +02:00
|
|
|
if (parse_next_sha1(input, &next, new_sha1, "create", refname, 0))
|
|
|
|
die("create %s: missing <newvalue>", refname);
|
2014-04-07 15:47:58 +02:00
|
|
|
|
2014-04-07 15:48:11 +02:00
|
|
|
if (is_null_sha1(new_sha1))
|
|
|
|
die("create %s: zero <newvalue>", refname);
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:47:58 +02:00
|
|
|
if (*next != line_termination)
|
2014-04-07 15:48:11 +02:00
|
|
|
die("create %s: extra input: %s", refname, next);
|
|
|
|
|
2014-04-17 00:26:44 +02:00
|
|
|
if (ref_transaction_create(transaction, refname, new_sha1,
|
2014-04-30 21:22:42 +02:00
|
|
|
update_flags, msg, &err))
|
2014-04-17 00:26:44 +02:00
|
|
|
die("%s", err.buf);
|
2014-04-07 15:48:11 +02:00
|
|
|
|
|
|
|
update_flags = 0;
|
|
|
|
free(refname);
|
2014-09-02 23:10:52 +02:00
|
|
|
strbuf_release(&err);
|
2014-04-07 15:47:58 +02:00
|
|
|
|
|
|
|
return next;
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
2014-09-02 23:11:21 +02:00
|
|
|
static const char *parse_cmd_delete(struct ref_transaction *transaction,
|
|
|
|
struct strbuf *input, const char *next)
|
2013-09-09 15:22:32 +02:00
|
|
|
{
|
2014-09-02 23:10:52 +02:00
|
|
|
struct strbuf err = STRBUF_INIT;
|
2014-04-07 15:48:11 +02:00
|
|
|
char *refname;
|
|
|
|
unsigned char old_sha1[20];
|
|
|
|
int have_old;
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:48:11 +02:00
|
|
|
refname = parse_refname(input, &next);
|
|
|
|
if (!refname)
|
2014-04-07 15:48:09 +02:00
|
|
|
die("delete: missing <ref>");
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:48:11 +02:00
|
|
|
if (parse_next_sha1(input, &next, old_sha1, "delete", refname,
|
|
|
|
PARSE_SHA1_OLD)) {
|
|
|
|
have_old = 0;
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
} else {
|
2014-04-07 15:48:11 +02:00
|
|
|
if (is_null_sha1(old_sha1))
|
|
|
|
die("delete %s: zero <oldvalue>", refname);
|
|
|
|
have_old = 1;
|
update-ref.c: extract a new function, parse_next_sha1()
Replace three functions, update_store_new_sha1(),
update_store_old_sha1(), and parse_next_arg(), with a single function,
parse_next_sha1(). The new function takes care of a whole argument,
including checking whether it is there, converting it to an SHA-1, and
emitting errors on EOF or for invalid values. The return value
indicates whether the argument was present or absent, which requires
a bit of intelligence because absent values are represented
differently depending on whether "-z" was used.
The new interface means that the calling functions, parse_cmd_*(),
don't have to interpret the result differently based on the
line_termination mode that is in effect. It also means that
parse_cmd_create() can distinguish unambiguously between an empty new
value and a zeros new value, which fixes a failure in t1400.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-07 15:48:05 +02:00
|
|
|
}
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:47:58 +02:00
|
|
|
if (*next != line_termination)
|
2014-04-07 15:48:11 +02:00
|
|
|
die("delete %s: extra input: %s", refname, next);
|
|
|
|
|
2014-04-17 00:27:45 +02:00
|
|
|
if (ref_transaction_delete(transaction, refname, old_sha1,
|
2014-04-30 21:22:42 +02:00
|
|
|
update_flags, have_old, msg, &err))
|
2014-04-17 00:27:45 +02:00
|
|
|
die("%s", err.buf);
|
2014-04-07 15:48:11 +02:00
|
|
|
|
|
|
|
update_flags = 0;
|
|
|
|
free(refname);
|
2014-09-02 23:10:52 +02:00
|
|
|
strbuf_release(&err);
|
2014-04-07 15:47:58 +02:00
|
|
|
|
|
|
|
return next;
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
2014-09-02 23:11:21 +02:00
|
|
|
static const char *parse_cmd_verify(struct ref_transaction *transaction,
|
|
|
|
struct strbuf *input, const char *next)
|
2013-09-09 15:22:32 +02:00
|
|
|
{
|
2014-09-02 23:10:52 +02:00
|
|
|
struct strbuf err = STRBUF_INIT;
|
2014-04-07 15:48:11 +02:00
|
|
|
char *refname;
|
|
|
|
unsigned char new_sha1[20];
|
|
|
|
unsigned char old_sha1[20];
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:48:11 +02:00
|
|
|
refname = parse_refname(input, &next);
|
|
|
|
if (!refname)
|
2014-04-07 15:48:09 +02:00
|
|
|
die("verify: missing <ref>");
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:48:11 +02:00
|
|
|
if (parse_next_sha1(input, &next, old_sha1, "verify", refname,
|
2014-12-11 00:47:52 +01:00
|
|
|
PARSE_SHA1_OLD))
|
|
|
|
hashclr(old_sha1);
|
|
|
|
|
|
|
|
hashcpy(new_sha1, old_sha1);
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:47:58 +02:00
|
|
|
if (*next != line_termination)
|
2014-04-07 15:48:11 +02:00
|
|
|
die("verify %s: extra input: %s", refname, next);
|
|
|
|
|
2014-06-20 16:43:00 +02:00
|
|
|
if (ref_transaction_update(transaction, refname, new_sha1, old_sha1,
|
2014-12-11 00:47:52 +01:00
|
|
|
update_flags, 1, msg, &err))
|
2014-06-20 16:43:00 +02:00
|
|
|
die("%s", err.buf);
|
2014-04-07 15:48:11 +02:00
|
|
|
|
|
|
|
update_flags = 0;
|
|
|
|
free(refname);
|
2014-09-02 23:10:52 +02:00
|
|
|
strbuf_release(&err);
|
2014-04-07 15:47:58 +02:00
|
|
|
|
|
|
|
return next;
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
2014-04-07 15:47:58 +02:00
|
|
|
static const char *parse_cmd_option(struct strbuf *input, const char *next)
|
2013-09-09 15:22:32 +02:00
|
|
|
{
|
2014-04-07 15:47:58 +02:00
|
|
|
if (!strncmp(next, "no-deref", 8) && next[8] == line_termination)
|
2013-09-09 15:22:32 +02:00
|
|
|
update_flags |= REF_NODEREF;
|
|
|
|
else
|
|
|
|
die("option unknown: %s", next);
|
2014-04-07 15:47:58 +02:00
|
|
|
return next + 8;
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
2014-09-02 23:11:21 +02:00
|
|
|
static void update_refs_stdin(struct ref_transaction *transaction)
|
2013-09-09 15:22:32 +02:00
|
|
|
{
|
2014-04-07 15:47:58 +02:00
|
|
|
struct strbuf input = STRBUF_INIT;
|
|
|
|
const char *next;
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:47:58 +02:00
|
|
|
if (strbuf_read(&input, 0, 1000) < 0)
|
|
|
|
die_errno("could not read from stdin");
|
|
|
|
next = input.buf;
|
2013-09-09 15:22:32 +02:00
|
|
|
/* Read each line dispatch its command */
|
2014-04-07 15:47:58 +02:00
|
|
|
while (next < input.buf + input.len) {
|
|
|
|
if (*next == line_termination)
|
2013-09-09 15:22:32 +02:00
|
|
|
die("empty command in input");
|
2014-04-07 15:47:58 +02:00
|
|
|
else if (isspace(*next))
|
|
|
|
die("whitespace before command: %s", next);
|
|
|
|
else if (starts_with(next, "update "))
|
2014-09-02 23:11:21 +02:00
|
|
|
next = parse_cmd_update(transaction, &input, next + 7);
|
2014-04-07 15:47:58 +02:00
|
|
|
else if (starts_with(next, "create "))
|
2014-09-02 23:11:21 +02:00
|
|
|
next = parse_cmd_create(transaction, &input, next + 7);
|
2014-04-07 15:47:58 +02:00
|
|
|
else if (starts_with(next, "delete "))
|
2014-09-02 23:11:21 +02:00
|
|
|
next = parse_cmd_delete(transaction, &input, next + 7);
|
2014-04-07 15:47:58 +02:00
|
|
|
else if (starts_with(next, "verify "))
|
2014-09-02 23:11:21 +02:00
|
|
|
next = parse_cmd_verify(transaction, &input, next + 7);
|
2014-04-07 15:47:58 +02:00
|
|
|
else if (starts_with(next, "option "))
|
|
|
|
next = parse_cmd_option(&input, next + 7);
|
2013-09-09 15:22:32 +02:00
|
|
|
else
|
2014-04-07 15:47:58 +02:00
|
|
|
die("unknown command: %s", next);
|
|
|
|
|
|
|
|
next++;
|
|
|
|
}
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2014-04-07 15:47:58 +02:00
|
|
|
strbuf_release(&input);
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
2006-07-29 07:44:25 +02:00
|
|
|
int cmd_update_ref(int argc, const char **argv, const char *prefix)
|
2005-09-25 20:43:05 +02:00
|
|
|
{
|
2014-04-30 21:22:42 +02:00
|
|
|
const char *refname, *oldval;
|
2006-05-17 11:55:19 +02:00
|
|
|
unsigned char sha1[20], oldsha1[20];
|
2013-09-09 15:22:32 +02:00
|
|
|
int delete = 0, no_deref = 0, read_stdin = 0, end_null = 0, flags = 0;
|
2007-10-07 23:14:43 +02:00
|
|
|
struct option options[] = {
|
2012-08-20 14:32:49 +02:00
|
|
|
OPT_STRING( 'm', NULL, &msg, N_("reason"), N_("reason of the update")),
|
2013-08-03 13:51:19 +02:00
|
|
|
OPT_BOOL('d', NULL, &delete, N_("delete the reference")),
|
|
|
|
OPT_BOOL( 0 , "no-deref", &no_deref,
|
2012-08-20 14:32:49 +02:00
|
|
|
N_("update <refname> not the one it points to")),
|
2013-09-20 21:36:12 +02:00
|
|
|
OPT_BOOL('z', NULL, &end_null, N_("stdin has NUL-terminated arguments")),
|
|
|
|
OPT_BOOL( 0 , "stdin", &read_stdin, N_("read updates from stdin")),
|
2007-10-07 23:14:43 +02:00
|
|
|
OPT_END(),
|
|
|
|
};
|
2005-09-25 20:43:05 +02:00
|
|
|
|
2008-05-14 19:46:53 +02:00
|
|
|
git_config(git_default_config, NULL);
|
2009-05-23 20:53:12 +02:00
|
|
|
argc = parse_options(argc, argv, prefix, options, git_update_ref_usage,
|
|
|
|
0);
|
2007-10-07 23:14:43 +02:00
|
|
|
if (msg && !*msg)
|
|
|
|
die("Refusing to perform update with empty message.");
|
2006-05-17 11:55:19 +02:00
|
|
|
|
2013-09-09 15:22:32 +02:00
|
|
|
if (read_stdin) {
|
2014-09-02 23:10:52 +02:00
|
|
|
struct strbuf err = STRBUF_INIT;
|
2014-09-02 23:11:21 +02:00
|
|
|
struct ref_transaction *transaction;
|
2014-09-02 23:10:52 +02:00
|
|
|
|
2014-05-19 19:42:34 +02:00
|
|
|
transaction = ref_transaction_begin(&err);
|
|
|
|
if (!transaction)
|
|
|
|
die("%s", err.buf);
|
2013-09-09 15:22:32 +02:00
|
|
|
if (delete || no_deref || argc > 0)
|
|
|
|
usage_with_options(git_update_ref_usage, options);
|
|
|
|
if (end_null)
|
|
|
|
line_termination = '\0';
|
2014-09-02 23:11:21 +02:00
|
|
|
update_refs_stdin(transaction);
|
2014-04-30 21:22:42 +02:00
|
|
|
if (ref_transaction_commit(transaction, &err))
|
2014-06-20 16:42:58 +02:00
|
|
|
die("%s", err.buf);
|
2014-06-20 16:42:43 +02:00
|
|
|
ref_transaction_free(transaction);
|
2014-05-19 19:42:34 +02:00
|
|
|
strbuf_release(&err);
|
2014-06-20 16:42:58 +02:00
|
|
|
return 0;
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (end_null)
|
|
|
|
usage_with_options(git_update_ref_usage, options);
|
|
|
|
|
2006-09-27 10:58:57 +02:00
|
|
|
if (delete) {
|
2008-06-03 01:34:53 +02:00
|
|
|
if (argc < 1 || argc > 2)
|
2008-06-03 01:34:48 +02:00
|
|
|
usage_with_options(git_update_ref_usage, options);
|
|
|
|
refname = argv[0];
|
|
|
|
oldval = argv[1];
|
|
|
|
} else {
|
|
|
|
const char *value;
|
|
|
|
if (argc < 2 || argc > 3)
|
2007-10-07 23:14:43 +02:00
|
|
|
usage_with_options(git_update_ref_usage, options);
|
2008-06-03 01:34:48 +02:00
|
|
|
refname = argv[0];
|
|
|
|
value = argv[1];
|
|
|
|
oldval = argv[2];
|
|
|
|
if (get_sha1(value, sha1))
|
|
|
|
die("%s: not a valid SHA1", value);
|
2006-09-27 10:58:57 +02:00
|
|
|
}
|
|
|
|
|
2008-06-03 01:34:48 +02:00
|
|
|
hashclr(oldsha1); /* all-zero hash in case oldval is the empty string */
|
2006-09-27 10:58:57 +02:00
|
|
|
if (oldval && *oldval && get_sha1(oldval, oldsha1))
|
2005-09-25 20:43:05 +02:00
|
|
|
die("%s: not a valid old SHA1", oldval);
|
|
|
|
|
2008-10-26 03:33:58 +01:00
|
|
|
if (no_deref)
|
|
|
|
flags = REF_NODEREF;
|
2008-06-03 01:34:48 +02:00
|
|
|
if (delete)
|
2008-10-26 03:33:58 +01:00
|
|
|
return delete_ref(refname, oldval ? oldsha1 : NULL, flags);
|
2008-06-03 01:34:48 +02:00
|
|
|
else
|
|
|
|
return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL,
|
2014-04-07 15:47:56 +02:00
|
|
|
flags, UPDATE_REFS_DIE_ON_ERR);
|
2005-09-25 20:43:05 +02:00
|
|
|
}
|