2005-09-25 20:43:05 +02:00
|
|
|
#include "cache.h"
|
2017-06-14 20:07:36 +02:00
|
|
|
#include "config.h"
|
2005-09-25 20:43:05 +02:00
|
|
|
#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"
|
2020-07-28 22:23:39 +02:00
|
|
|
#include "strvec.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[] = {
|
2015-01-13 08:44:47 +01:00
|
|
|
N_("git update-ref [<options>] -d <refname> [<old-val>]"),
|
|
|
|
N_("git update-ref [<options>] <refname> <new-val> [<old-val>]"),
|
|
|
|
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';
|
2018-09-05 19:25:49 +02:00
|
|
|
static unsigned int update_flags;
|
2018-09-05 19:25:50 +02:00
|
|
|
static unsigned int default_flags;
|
2015-07-21 23:04:55 +02:00
|
|
|
static unsigned create_reflog_flag;
|
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
|
|
|
*/
|
2020-04-02 09:09:43 +02:00
|
|
|
static char *parse_refname(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
|
|
|
*/
|
2020-04-02 09:09:48 +02:00
|
|
|
static int parse_next_oid(const char **next, const char *end,
|
2017-07-14 01:49:23 +02:00
|
|
|
struct object_id *oid,
|
|
|
|
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;
|
|
|
|
|
2020-04-02 09:09:48 +02:00
|
|
|
if (*next == end)
|
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;
|
|
|
|
|
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) {
|
2017-07-14 01:49:23 +02:00
|
|
|
if (get_oid(arg.buf, oid))
|
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 invalid;
|
|
|
|
} else {
|
|
|
|
/* Without -z, an empty value means all zeros: */
|
2017-07-14 01:49:23 +02:00
|
|
|
oidclr(oid);
|
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
|
|
|
} 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)++;
|
2020-04-02 09:09:48 +02:00
|
|
|
if (*next == end)
|
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) {
|
2017-07-14 01:49:23 +02:00
|
|
|
if (get_oid(arg.buf, oid))
|
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 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);
|
2017-07-14 01:49:23 +02:00
|
|
|
oidclr(oid);
|
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 {
|
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2020-04-02 09:09:57 +02:00
|
|
|
static void parse_cmd_update(struct ref_transaction *transaction,
|
|
|
|
const char *next, const char *end)
|
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;
|
2017-07-14 01:49:23 +02:00
|
|
|
struct object_id new_oid, old_oid;
|
2014-04-07 15:48:11 +02:00
|
|
|
int have_old;
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2020-04-02 09:09:43 +02:00
|
|
|
refname = parse_refname(&next);
|
2014-04-07 15:48:11 +02:00
|
|
|
if (!refname)
|
2014-04-07 15:48:09 +02:00
|
|
|
die("update: missing <ref>");
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2020-04-02 09:09:48 +02:00
|
|
|
if (parse_next_oid(&next, end, &new_oid, "update", refname,
|
2017-07-14 01:49:23 +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
|
|
|
|
2020-04-02 09:09:48 +02:00
|
|
|
have_old = !parse_next_oid(&next, end, &old_oid, "update", refname,
|
2017-07-14 01:49:23 +02:00
|
|
|
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);
|
|
|
|
|
2015-02-17 18:00:15 +01:00
|
|
|
if (ref_transaction_update(transaction, refname,
|
2017-10-16 00:06:53 +02:00
|
|
|
&new_oid, have_old ? &old_oid : NULL,
|
2015-07-21 23:04:55 +02:00
|
|
|
update_flags | create_reflog_flag,
|
|
|
|
msg, &err))
|
2014-06-20 16:43:00 +02:00
|
|
|
die("%s", err.buf);
|
2014-04-07 15:48:11 +02:00
|
|
|
|
2018-09-05 19:25:50 +02:00
|
|
|
update_flags = default_flags;
|
2014-04-07 15:48:11 +02:00
|
|
|
free(refname);
|
2014-09-02 23:10:52 +02:00
|
|
|
strbuf_release(&err);
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
2020-04-02 09:09:57 +02:00
|
|
|
static void parse_cmd_create(struct ref_transaction *transaction,
|
|
|
|
const char *next, const char *end)
|
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;
|
2017-07-14 01:49:23 +02:00
|
|
|
struct object_id new_oid;
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2020-04-02 09:09:43 +02:00
|
|
|
refname = parse_refname(&next);
|
2014-04-07 15:48:11 +02:00
|
|
|
if (!refname)
|
2014-04-07 15:48:09 +02:00
|
|
|
die("create: missing <ref>");
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2020-04-02 09:09:48 +02:00
|
|
|
if (parse_next_oid(&next, end, &new_oid, "create", refname, 0))
|
2014-04-07 15:48:11 +02:00
|
|
|
die("create %s: missing <newvalue>", refname);
|
2014-04-07 15:47:58 +02:00
|
|
|
|
2017-07-14 01:49:23 +02:00
|
|
|
if (is_null_oid(&new_oid))
|
2014-04-07 15:48:11 +02:00
|
|
|
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);
|
|
|
|
|
2017-10-16 00:06:53 +02:00
|
|
|
if (ref_transaction_create(transaction, refname, &new_oid,
|
2015-07-21 23:04:55 +02:00
|
|
|
update_flags | create_reflog_flag,
|
|
|
|
msg, &err))
|
2014-04-17 00:26:44 +02:00
|
|
|
die("%s", err.buf);
|
2014-04-07 15:48:11 +02:00
|
|
|
|
2018-09-05 19:25:50 +02:00
|
|
|
update_flags = default_flags;
|
2014-04-07 15:48:11 +02:00
|
|
|
free(refname);
|
2014-09-02 23:10:52 +02:00
|
|
|
strbuf_release(&err);
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
2020-04-02 09:09:57 +02:00
|
|
|
static void parse_cmd_delete(struct ref_transaction *transaction,
|
|
|
|
const char *next, const char *end)
|
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;
|
2017-07-14 01:49:23 +02:00
|
|
|
struct object_id old_oid;
|
2014-04-07 15:48:11 +02:00
|
|
|
int have_old;
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2020-04-02 09:09:43 +02:00
|
|
|
refname = parse_refname(&next);
|
2014-04-07 15:48:11 +02:00
|
|
|
if (!refname)
|
2014-04-07 15:48:09 +02:00
|
|
|
die("delete: missing <ref>");
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2020-04-02 09:09:48 +02:00
|
|
|
if (parse_next_oid(&next, end, &old_oid, "delete", refname,
|
2017-07-14 01:49:23 +02:00
|
|
|
PARSE_SHA1_OLD)) {
|
2014-04-07 15:48:11 +02:00
|
|
|
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 {
|
2017-07-14 01:49:23 +02:00
|
|
|
if (is_null_oid(&old_oid))
|
2014-04-07 15:48:11 +02:00
|
|
|
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);
|
|
|
|
|
2015-02-17 18:00:16 +01:00
|
|
|
if (ref_transaction_delete(transaction, refname,
|
2017-10-16 00:06:53 +02:00
|
|
|
have_old ? &old_oid : NULL,
|
2015-02-17 18:00:16 +01:00
|
|
|
update_flags, msg, &err))
|
2014-04-17 00:27:45 +02:00
|
|
|
die("%s", err.buf);
|
2014-04-07 15:48:11 +02:00
|
|
|
|
2018-09-05 19:25:50 +02:00
|
|
|
update_flags = default_flags;
|
2014-04-07 15:48:11 +02:00
|
|
|
free(refname);
|
2014-09-02 23:10:52 +02:00
|
|
|
strbuf_release(&err);
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
2020-04-02 09:09:57 +02:00
|
|
|
static void parse_cmd_verify(struct ref_transaction *transaction,
|
|
|
|
const char *next, const char *end)
|
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;
|
2017-07-14 01:49:23 +02:00
|
|
|
struct object_id old_oid;
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2020-04-02 09:09:43 +02:00
|
|
|
refname = parse_refname(&next);
|
2014-04-07 15:48:11 +02:00
|
|
|
if (!refname)
|
2014-04-07 15:48:09 +02:00
|
|
|
die("verify: missing <ref>");
|
2013-09-09 15:22:32 +02:00
|
|
|
|
2020-04-02 09:09:48 +02:00
|
|
|
if (parse_next_oid(&next, end, &old_oid, "verify", refname,
|
2017-07-14 01:49:23 +02:00
|
|
|
PARSE_SHA1_OLD))
|
|
|
|
oidclr(&old_oid);
|
2014-12-11 00:47:52 +01: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);
|
|
|
|
|
2017-10-16 00:06:53 +02:00
|
|
|
if (ref_transaction_verify(transaction, refname, &old_oid,
|
2015-02-17 18:00:21 +01:00
|
|
|
update_flags, &err))
|
2014-06-20 16:43:00 +02:00
|
|
|
die("%s", err.buf);
|
2014-04-07 15:48:11 +02:00
|
|
|
|
2018-09-05 19:25:50 +02:00
|
|
|
update_flags = default_flags;
|
2014-04-07 15:48:11 +02:00
|
|
|
free(refname);
|
2014-09-02 23:10:52 +02:00
|
|
|
strbuf_release(&err);
|
2013-09-09 15:22:32 +02:00
|
|
|
}
|
|
|
|
|
2021-09-03 11:06:37 +02:00
|
|
|
static void report_ok(const char *command)
|
|
|
|
{
|
|
|
|
fprintf(stdout, "%s: ok\n", command);
|
|
|
|
fflush(stdout);
|
|
|
|
}
|
|
|
|
|
2020-04-02 09:09:57 +02:00
|
|
|
static void parse_cmd_option(struct ref_transaction *transaction,
|
|
|
|
const char *next, const char *end)
|
2013-09-09 15:22:32 +02:00
|
|
|
{
|
2018-06-03 16:36:51 +02:00
|
|
|
const char *rest;
|
|
|
|
if (skip_prefix(next, "no-deref", &rest) && *rest == line_termination)
|
2017-11-05 09:42:06 +01:00
|
|
|
update_flags |= REF_NO_DEREF;
|
2013-09-09 15:22:32 +02:00
|
|
|
else
|
|
|
|
die("option unknown: %s", next);
|
|
|
|
}
|
|
|
|
|
update-ref: implement interactive transaction handling
The git-update-ref(1) command can only handle queueing transactions
right now via its "--stdin" parameter, but there is no way for users to
handle the transaction itself in a more explicit way. E.g. in a
replicated scenario, one may imagine a coordinator that spawns
git-update-ref(1) for multiple repositories and only if all agree that
an update is possible will the coordinator send a commit. Such a
transactional session could look like
> start
< start: ok
> update refs/heads/master $OLD $NEW
> prepare
< prepare: ok
# All nodes have returned "ok"
> commit
< commit: ok
or
> start
< start: ok
> create refs/heads/master $OLD $NEW
> prepare
< fatal: cannot lock ref 'refs/heads/master': reference already exists
# On all other nodes:
> abort
< abort: ok
In order to allow for such transactional sessions, this commit
introduces four new commands for git-update-ref(1), which matches those
we have internally already with the exception of "start":
- start: start a new transaction
- prepare: prepare the transaction, that is try to lock all
references and verify their current value matches the
expected one
- commit: explicitly commit a session, that is update references to
match their new expected state
- abort: abort a session and roll back all changes
By design, git-update-ref(1) will commit as soon as standard input is
being closed. While fine in a non-transactional world, it is definitely
unexpected in a transactional world. Because of this, as soon as any of
the new transactional commands is used, the default will change to
aborting without an explicit "commit". To avoid a race between queueing
updates and the first "prepare" that starts a transaction, the "start"
command has been added to start an explicit transaction.
Add some tests to exercise this new functionality.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-02 09:10:02 +02:00
|
|
|
static void parse_cmd_start(struct ref_transaction *transaction,
|
|
|
|
const char *next, const char *end)
|
|
|
|
{
|
|
|
|
if (*next != line_termination)
|
|
|
|
die("start: extra input: %s", next);
|
2021-09-03 11:06:37 +02:00
|
|
|
report_ok("start");
|
update-ref: implement interactive transaction handling
The git-update-ref(1) command can only handle queueing transactions
right now via its "--stdin" parameter, but there is no way for users to
handle the transaction itself in a more explicit way. E.g. in a
replicated scenario, one may imagine a coordinator that spawns
git-update-ref(1) for multiple repositories and only if all agree that
an update is possible will the coordinator send a commit. Such a
transactional session could look like
> start
< start: ok
> update refs/heads/master $OLD $NEW
> prepare
< prepare: ok
# All nodes have returned "ok"
> commit
< commit: ok
or
> start
< start: ok
> create refs/heads/master $OLD $NEW
> prepare
< fatal: cannot lock ref 'refs/heads/master': reference already exists
# On all other nodes:
> abort
< abort: ok
In order to allow for such transactional sessions, this commit
introduces four new commands for git-update-ref(1), which matches those
we have internally already with the exception of "start":
- start: start a new transaction
- prepare: prepare the transaction, that is try to lock all
references and verify their current value matches the
expected one
- commit: explicitly commit a session, that is update references to
match their new expected state
- abort: abort a session and roll back all changes
By design, git-update-ref(1) will commit as soon as standard input is
being closed. While fine in a non-transactional world, it is definitely
unexpected in a transactional world. Because of this, as soon as any of
the new transactional commands is used, the default will change to
aborting without an explicit "commit". To avoid a race between queueing
updates and the first "prepare" that starts a transaction, the "start"
command has been added to start an explicit transaction.
Add some tests to exercise this new functionality.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-02 09:10:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void parse_cmd_prepare(struct ref_transaction *transaction,
|
|
|
|
const char *next, const char *end)
|
|
|
|
{
|
|
|
|
struct strbuf error = STRBUF_INIT;
|
|
|
|
if (*next != line_termination)
|
|
|
|
die("prepare: extra input: %s", next);
|
|
|
|
if (ref_transaction_prepare(transaction, &error))
|
|
|
|
die("prepare: %s", error.buf);
|
2021-09-03 11:06:37 +02:00
|
|
|
report_ok("prepare");
|
update-ref: implement interactive transaction handling
The git-update-ref(1) command can only handle queueing transactions
right now via its "--stdin" parameter, but there is no way for users to
handle the transaction itself in a more explicit way. E.g. in a
replicated scenario, one may imagine a coordinator that spawns
git-update-ref(1) for multiple repositories and only if all agree that
an update is possible will the coordinator send a commit. Such a
transactional session could look like
> start
< start: ok
> update refs/heads/master $OLD $NEW
> prepare
< prepare: ok
# All nodes have returned "ok"
> commit
< commit: ok
or
> start
< start: ok
> create refs/heads/master $OLD $NEW
> prepare
< fatal: cannot lock ref 'refs/heads/master': reference already exists
# On all other nodes:
> abort
< abort: ok
In order to allow for such transactional sessions, this commit
introduces four new commands for git-update-ref(1), which matches those
we have internally already with the exception of "start":
- start: start a new transaction
- prepare: prepare the transaction, that is try to lock all
references and verify their current value matches the
expected one
- commit: explicitly commit a session, that is update references to
match their new expected state
- abort: abort a session and roll back all changes
By design, git-update-ref(1) will commit as soon as standard input is
being closed. While fine in a non-transactional world, it is definitely
unexpected in a transactional world. Because of this, as soon as any of
the new transactional commands is used, the default will change to
aborting without an explicit "commit". To avoid a race between queueing
updates and the first "prepare" that starts a transaction, the "start"
command has been added to start an explicit transaction.
Add some tests to exercise this new functionality.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-02 09:10:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void parse_cmd_abort(struct ref_transaction *transaction,
|
|
|
|
const char *next, const char *end)
|
|
|
|
{
|
|
|
|
struct strbuf error = STRBUF_INIT;
|
|
|
|
if (*next != line_termination)
|
|
|
|
die("abort: extra input: %s", next);
|
|
|
|
if (ref_transaction_abort(transaction, &error))
|
|
|
|
die("abort: %s", error.buf);
|
2021-09-03 11:06:37 +02:00
|
|
|
report_ok("abort");
|
update-ref: implement interactive transaction handling
The git-update-ref(1) command can only handle queueing transactions
right now via its "--stdin" parameter, but there is no way for users to
handle the transaction itself in a more explicit way. E.g. in a
replicated scenario, one may imagine a coordinator that spawns
git-update-ref(1) for multiple repositories and only if all agree that
an update is possible will the coordinator send a commit. Such a
transactional session could look like
> start
< start: ok
> update refs/heads/master $OLD $NEW
> prepare
< prepare: ok
# All nodes have returned "ok"
> commit
< commit: ok
or
> start
< start: ok
> create refs/heads/master $OLD $NEW
> prepare
< fatal: cannot lock ref 'refs/heads/master': reference already exists
# On all other nodes:
> abort
< abort: ok
In order to allow for such transactional sessions, this commit
introduces four new commands for git-update-ref(1), which matches those
we have internally already with the exception of "start":
- start: start a new transaction
- prepare: prepare the transaction, that is try to lock all
references and verify their current value matches the
expected one
- commit: explicitly commit a session, that is update references to
match their new expected state
- abort: abort a session and roll back all changes
By design, git-update-ref(1) will commit as soon as standard input is
being closed. While fine in a non-transactional world, it is definitely
unexpected in a transactional world. Because of this, as soon as any of
the new transactional commands is used, the default will change to
aborting without an explicit "commit". To avoid a race between queueing
updates and the first "prepare" that starts a transaction, the "start"
command has been added to start an explicit transaction.
Add some tests to exercise this new functionality.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-02 09:10:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void parse_cmd_commit(struct ref_transaction *transaction,
|
|
|
|
const char *next, const char *end)
|
|
|
|
{
|
|
|
|
struct strbuf error = STRBUF_INIT;
|
|
|
|
if (*next != line_termination)
|
|
|
|
die("commit: extra input: %s", next);
|
|
|
|
if (ref_transaction_commit(transaction, &error))
|
|
|
|
die("commit: %s", error.buf);
|
2021-09-03 11:06:37 +02:00
|
|
|
report_ok("commit");
|
update-ref: implement interactive transaction handling
The git-update-ref(1) command can only handle queueing transactions
right now via its "--stdin" parameter, but there is no way for users to
handle the transaction itself in a more explicit way. E.g. in a
replicated scenario, one may imagine a coordinator that spawns
git-update-ref(1) for multiple repositories and only if all agree that
an update is possible will the coordinator send a commit. Such a
transactional session could look like
> start
< start: ok
> update refs/heads/master $OLD $NEW
> prepare
< prepare: ok
# All nodes have returned "ok"
> commit
< commit: ok
or
> start
< start: ok
> create refs/heads/master $OLD $NEW
> prepare
< fatal: cannot lock ref 'refs/heads/master': reference already exists
# On all other nodes:
> abort
< abort: ok
In order to allow for such transactional sessions, this commit
introduces four new commands for git-update-ref(1), which matches those
we have internally already with the exception of "start":
- start: start a new transaction
- prepare: prepare the transaction, that is try to lock all
references and verify their current value matches the
expected one
- commit: explicitly commit a session, that is update references to
match their new expected state
- abort: abort a session and roll back all changes
By design, git-update-ref(1) will commit as soon as standard input is
being closed. While fine in a non-transactional world, it is definitely
unexpected in a transactional world. Because of this, as soon as any of
the new transactional commands is used, the default will change to
aborting without an explicit "commit". To avoid a race between queueing
updates and the first "prepare" that starts a transaction, the "start"
command has been added to start an explicit transaction.
Add some tests to exercise this new functionality.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-02 09:10:02 +02:00
|
|
|
ref_transaction_free(transaction);
|
|
|
|
}
|
|
|
|
|
|
|
|
enum update_refs_state {
|
|
|
|
/* Non-transactional state open for updates. */
|
|
|
|
UPDATE_REFS_OPEN,
|
|
|
|
/* A transaction has been started. */
|
|
|
|
UPDATE_REFS_STARTED,
|
|
|
|
/* References are locked and ready for commit */
|
|
|
|
UPDATE_REFS_PREPARED,
|
|
|
|
/* Transaction has been committed or closed. */
|
|
|
|
UPDATE_REFS_CLOSED,
|
|
|
|
};
|
|
|
|
|
2020-04-02 09:09:38 +02:00
|
|
|
static const struct parse_cmd {
|
|
|
|
const char *prefix;
|
2020-04-02 09:09:57 +02:00
|
|
|
void (*fn)(struct ref_transaction *, const char *, const char *);
|
|
|
|
unsigned args;
|
update-ref: implement interactive transaction handling
The git-update-ref(1) command can only handle queueing transactions
right now via its "--stdin" parameter, but there is no way for users to
handle the transaction itself in a more explicit way. E.g. in a
replicated scenario, one may imagine a coordinator that spawns
git-update-ref(1) for multiple repositories and only if all agree that
an update is possible will the coordinator send a commit. Such a
transactional session could look like
> start
< start: ok
> update refs/heads/master $OLD $NEW
> prepare
< prepare: ok
# All nodes have returned "ok"
> commit
< commit: ok
or
> start
< start: ok
> create refs/heads/master $OLD $NEW
> prepare
< fatal: cannot lock ref 'refs/heads/master': reference already exists
# On all other nodes:
> abort
< abort: ok
In order to allow for such transactional sessions, this commit
introduces four new commands for git-update-ref(1), which matches those
we have internally already with the exception of "start":
- start: start a new transaction
- prepare: prepare the transaction, that is try to lock all
references and verify their current value matches the
expected one
- commit: explicitly commit a session, that is update references to
match their new expected state
- abort: abort a session and roll back all changes
By design, git-update-ref(1) will commit as soon as standard input is
being closed. While fine in a non-transactional world, it is definitely
unexpected in a transactional world. Because of this, as soon as any of
the new transactional commands is used, the default will change to
aborting without an explicit "commit". To avoid a race between queueing
updates and the first "prepare" that starts a transaction, the "start"
command has been added to start an explicit transaction.
Add some tests to exercise this new functionality.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-02 09:10:02 +02:00
|
|
|
enum update_refs_state state;
|
2020-04-02 09:09:38 +02:00
|
|
|
} command[] = {
|
update-ref: implement interactive transaction handling
The git-update-ref(1) command can only handle queueing transactions
right now via its "--stdin" parameter, but there is no way for users to
handle the transaction itself in a more explicit way. E.g. in a
replicated scenario, one may imagine a coordinator that spawns
git-update-ref(1) for multiple repositories and only if all agree that
an update is possible will the coordinator send a commit. Such a
transactional session could look like
> start
< start: ok
> update refs/heads/master $OLD $NEW
> prepare
< prepare: ok
# All nodes have returned "ok"
> commit
< commit: ok
or
> start
< start: ok
> create refs/heads/master $OLD $NEW
> prepare
< fatal: cannot lock ref 'refs/heads/master': reference already exists
# On all other nodes:
> abort
< abort: ok
In order to allow for such transactional sessions, this commit
introduces four new commands for git-update-ref(1), which matches those
we have internally already with the exception of "start":
- start: start a new transaction
- prepare: prepare the transaction, that is try to lock all
references and verify their current value matches the
expected one
- commit: explicitly commit a session, that is update references to
match their new expected state
- abort: abort a session and roll back all changes
By design, git-update-ref(1) will commit as soon as standard input is
being closed. While fine in a non-transactional world, it is definitely
unexpected in a transactional world. Because of this, as soon as any of
the new transactional commands is used, the default will change to
aborting without an explicit "commit". To avoid a race between queueing
updates and the first "prepare" that starts a transaction, the "start"
command has been added to start an explicit transaction.
Add some tests to exercise this new functionality.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-02 09:10:02 +02:00
|
|
|
{ "update", parse_cmd_update, 3, UPDATE_REFS_OPEN },
|
|
|
|
{ "create", parse_cmd_create, 2, UPDATE_REFS_OPEN },
|
|
|
|
{ "delete", parse_cmd_delete, 2, UPDATE_REFS_OPEN },
|
|
|
|
{ "verify", parse_cmd_verify, 2, UPDATE_REFS_OPEN },
|
|
|
|
{ "option", parse_cmd_option, 1, UPDATE_REFS_OPEN },
|
|
|
|
{ "start", parse_cmd_start, 0, UPDATE_REFS_STARTED },
|
|
|
|
{ "prepare", parse_cmd_prepare, 0, UPDATE_REFS_PREPARED },
|
|
|
|
{ "abort", parse_cmd_abort, 0, UPDATE_REFS_CLOSED },
|
|
|
|
{ "commit", parse_cmd_commit, 0, UPDATE_REFS_CLOSED },
|
2020-04-02 09:09:38 +02:00
|
|
|
};
|
|
|
|
|
2020-04-02 09:09:53 +02:00
|
|
|
static void update_refs_stdin(void)
|
2013-09-09 15:22:32 +02:00
|
|
|
{
|
2020-04-02 09:09:53 +02:00
|
|
|
struct strbuf input = STRBUF_INIT, err = STRBUF_INIT;
|
update-ref: implement interactive transaction handling
The git-update-ref(1) command can only handle queueing transactions
right now via its "--stdin" parameter, but there is no way for users to
handle the transaction itself in a more explicit way. E.g. in a
replicated scenario, one may imagine a coordinator that spawns
git-update-ref(1) for multiple repositories and only if all agree that
an update is possible will the coordinator send a commit. Such a
transactional session could look like
> start
< start: ok
> update refs/heads/master $OLD $NEW
> prepare
< prepare: ok
# All nodes have returned "ok"
> commit
< commit: ok
or
> start
< start: ok
> create refs/heads/master $OLD $NEW
> prepare
< fatal: cannot lock ref 'refs/heads/master': reference already exists
# On all other nodes:
> abort
< abort: ok
In order to allow for such transactional sessions, this commit
introduces four new commands for git-update-ref(1), which matches those
we have internally already with the exception of "start":
- start: start a new transaction
- prepare: prepare the transaction, that is try to lock all
references and verify their current value matches the
expected one
- commit: explicitly commit a session, that is update references to
match their new expected state
- abort: abort a session and roll back all changes
By design, git-update-ref(1) will commit as soon as standard input is
being closed. While fine in a non-transactional world, it is definitely
unexpected in a transactional world. Because of this, as soon as any of
the new transactional commands is used, the default will change to
aborting without an explicit "commit". To avoid a race between queueing
updates and the first "prepare" that starts a transaction, the "start"
command has been added to start an explicit transaction.
Add some tests to exercise this new functionality.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-02 09:10:02 +02:00
|
|
|
enum update_refs_state state = UPDATE_REFS_OPEN;
|
2020-04-02 09:09:53 +02:00
|
|
|
struct ref_transaction *transaction;
|
2020-04-02 09:09:57 +02:00
|
|
|
int i, j;
|
2020-04-02 09:09:53 +02:00
|
|
|
|
|
|
|
transaction = ref_transaction_begin(&err);
|
|
|
|
if (!transaction)
|
|
|
|
die("%s", err.buf);
|
|
|
|
|
2013-09-09 15:22:32 +02:00
|
|
|
/* Read each line dispatch its command */
|
2020-04-02 09:09:57 +02:00
|
|
|
while (!strbuf_getwholeline(&input, stdin, line_termination)) {
|
2020-04-02 09:09:38 +02:00
|
|
|
const struct parse_cmd *cmd = NULL;
|
|
|
|
|
2020-04-02 09:09:57 +02:00
|
|
|
if (*input.buf == line_termination)
|
2013-09-09 15:22:32 +02:00
|
|
|
die("empty command in input");
|
2020-04-02 09:09:57 +02:00
|
|
|
else if (isspace(*input.buf))
|
|
|
|
die("whitespace before command: %s", input.buf);
|
2020-04-02 09:09:38 +02:00
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(command); i++) {
|
|
|
|
const char *prefix = command[i].prefix;
|
2020-04-02 09:09:57 +02:00
|
|
|
char c;
|
2020-04-02 09:09:38 +02:00
|
|
|
|
2020-04-02 09:09:57 +02:00
|
|
|
if (!starts_with(input.buf, prefix))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the command has arguments, verify that it's
|
|
|
|
* followed by a space. Otherwise, it shall be followed
|
|
|
|
* by a line terminator.
|
|
|
|
*/
|
|
|
|
c = command[i].args ? ' ' : line_termination;
|
|
|
|
if (input.buf[strlen(prefix)] != c)
|
2020-04-02 09:09:38 +02:00
|
|
|
continue;
|
|
|
|
|
|
|
|
cmd = &command[i];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!cmd)
|
2020-04-02 09:09:57 +02:00
|
|
|
die("unknown command: %s", input.buf);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read additional arguments if NUL-terminated. Do not raise an
|
|
|
|
* error in case there is an early EOF to let the command
|
|
|
|
* handle missing arguments with a proper error message.
|
|
|
|
*/
|
|
|
|
for (j = 1; line_termination == '\0' && j < cmd->args; j++)
|
|
|
|
if (strbuf_appendwholeline(&input, stdin, line_termination))
|
|
|
|
break;
|
|
|
|
|
update-ref: implement interactive transaction handling
The git-update-ref(1) command can only handle queueing transactions
right now via its "--stdin" parameter, but there is no way for users to
handle the transaction itself in a more explicit way. E.g. in a
replicated scenario, one may imagine a coordinator that spawns
git-update-ref(1) for multiple repositories and only if all agree that
an update is possible will the coordinator send a commit. Such a
transactional session could look like
> start
< start: ok
> update refs/heads/master $OLD $NEW
> prepare
< prepare: ok
# All nodes have returned "ok"
> commit
< commit: ok
or
> start
< start: ok
> create refs/heads/master $OLD $NEW
> prepare
< fatal: cannot lock ref 'refs/heads/master': reference already exists
# On all other nodes:
> abort
< abort: ok
In order to allow for such transactional sessions, this commit
introduces four new commands for git-update-ref(1), which matches those
we have internally already with the exception of "start":
- start: start a new transaction
- prepare: prepare the transaction, that is try to lock all
references and verify their current value matches the
expected one
- commit: explicitly commit a session, that is update references to
match their new expected state
- abort: abort a session and roll back all changes
By design, git-update-ref(1) will commit as soon as standard input is
being closed. While fine in a non-transactional world, it is definitely
unexpected in a transactional world. Because of this, as soon as any of
the new transactional commands is used, the default will change to
aborting without an explicit "commit". To avoid a race between queueing
updates and the first "prepare" that starts a transaction, the "start"
command has been added to start an explicit transaction.
Add some tests to exercise this new functionality.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-02 09:10:02 +02:00
|
|
|
switch (state) {
|
|
|
|
case UPDATE_REFS_OPEN:
|
|
|
|
case UPDATE_REFS_STARTED:
|
2020-11-13 09:12:45 +01:00
|
|
|
if (state == UPDATE_REFS_STARTED && cmd->state == UPDATE_REFS_STARTED)
|
|
|
|
die("cannot restart ongoing transaction");
|
update-ref: implement interactive transaction handling
The git-update-ref(1) command can only handle queueing transactions
right now via its "--stdin" parameter, but there is no way for users to
handle the transaction itself in a more explicit way. E.g. in a
replicated scenario, one may imagine a coordinator that spawns
git-update-ref(1) for multiple repositories and only if all agree that
an update is possible will the coordinator send a commit. Such a
transactional session could look like
> start
< start: ok
> update refs/heads/master $OLD $NEW
> prepare
< prepare: ok
# All nodes have returned "ok"
> commit
< commit: ok
or
> start
< start: ok
> create refs/heads/master $OLD $NEW
> prepare
< fatal: cannot lock ref 'refs/heads/master': reference already exists
# On all other nodes:
> abort
< abort: ok
In order to allow for such transactional sessions, this commit
introduces four new commands for git-update-ref(1), which matches those
we have internally already with the exception of "start":
- start: start a new transaction
- prepare: prepare the transaction, that is try to lock all
references and verify their current value matches the
expected one
- commit: explicitly commit a session, that is update references to
match their new expected state
- abort: abort a session and roll back all changes
By design, git-update-ref(1) will commit as soon as standard input is
being closed. While fine in a non-transactional world, it is definitely
unexpected in a transactional world. Because of this, as soon as any of
the new transactional commands is used, the default will change to
aborting without an explicit "commit". To avoid a race between queueing
updates and the first "prepare" that starts a transaction, the "start"
command has been added to start an explicit transaction.
Add some tests to exercise this new functionality.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-02 09:10:02 +02:00
|
|
|
/* Do not downgrade a transaction to a non-transaction. */
|
|
|
|
if (cmd->state >= state)
|
|
|
|
state = cmd->state;
|
|
|
|
break;
|
|
|
|
case UPDATE_REFS_PREPARED:
|
|
|
|
if (cmd->state != UPDATE_REFS_CLOSED)
|
|
|
|
die("prepared transactions can only be closed");
|
|
|
|
state = cmd->state;
|
|
|
|
break;
|
|
|
|
case UPDATE_REFS_CLOSED:
|
2020-11-13 09:12:36 +01:00
|
|
|
if (cmd->state != UPDATE_REFS_STARTED)
|
|
|
|
die("transaction is closed");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Open a new transaction if we're currently closed and
|
|
|
|
* get a "start".
|
|
|
|
*/
|
|
|
|
state = cmd->state;
|
|
|
|
transaction = ref_transaction_begin(&err);
|
|
|
|
if (!transaction)
|
|
|
|
die("%s", err.buf);
|
|
|
|
|
update-ref: implement interactive transaction handling
The git-update-ref(1) command can only handle queueing transactions
right now via its "--stdin" parameter, but there is no way for users to
handle the transaction itself in a more explicit way. E.g. in a
replicated scenario, one may imagine a coordinator that spawns
git-update-ref(1) for multiple repositories and only if all agree that
an update is possible will the coordinator send a commit. Such a
transactional session could look like
> start
< start: ok
> update refs/heads/master $OLD $NEW
> prepare
< prepare: ok
# All nodes have returned "ok"
> commit
< commit: ok
or
> start
< start: ok
> create refs/heads/master $OLD $NEW
> prepare
< fatal: cannot lock ref 'refs/heads/master': reference already exists
# On all other nodes:
> abort
< abort: ok
In order to allow for such transactional sessions, this commit
introduces four new commands for git-update-ref(1), which matches those
we have internally already with the exception of "start":
- start: start a new transaction
- prepare: prepare the transaction, that is try to lock all
references and verify their current value matches the
expected one
- commit: explicitly commit a session, that is update references to
match their new expected state
- abort: abort a session and roll back all changes
By design, git-update-ref(1) will commit as soon as standard input is
being closed. While fine in a non-transactional world, it is definitely
unexpected in a transactional world. Because of this, as soon as any of
the new transactional commands is used, the default will change to
aborting without an explicit "commit". To avoid a race between queueing
updates and the first "prepare" that starts a transaction, the "start"
command has been added to start an explicit transaction.
Add some tests to exercise this new functionality.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-02 09:10:02 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2020-04-02 09:09:57 +02:00
|
|
|
cmd->fn(transaction, input.buf + strlen(cmd->prefix) + !!cmd->args,
|
|
|
|
input.buf + input.len);
|
2014-04-07 15:47:58 +02:00
|
|
|
}
|
2013-09-09 15:22:32 +02:00
|
|
|
|
update-ref: implement interactive transaction handling
The git-update-ref(1) command can only handle queueing transactions
right now via its "--stdin" parameter, but there is no way for users to
handle the transaction itself in a more explicit way. E.g. in a
replicated scenario, one may imagine a coordinator that spawns
git-update-ref(1) for multiple repositories and only if all agree that
an update is possible will the coordinator send a commit. Such a
transactional session could look like
> start
< start: ok
> update refs/heads/master $OLD $NEW
> prepare
< prepare: ok
# All nodes have returned "ok"
> commit
< commit: ok
or
> start
< start: ok
> create refs/heads/master $OLD $NEW
> prepare
< fatal: cannot lock ref 'refs/heads/master': reference already exists
# On all other nodes:
> abort
< abort: ok
In order to allow for such transactional sessions, this commit
introduces four new commands for git-update-ref(1), which matches those
we have internally already with the exception of "start":
- start: start a new transaction
- prepare: prepare the transaction, that is try to lock all
references and verify their current value matches the
expected one
- commit: explicitly commit a session, that is update references to
match their new expected state
- abort: abort a session and roll back all changes
By design, git-update-ref(1) will commit as soon as standard input is
being closed. While fine in a non-transactional world, it is definitely
unexpected in a transactional world. Because of this, as soon as any of
the new transactional commands is used, the default will change to
aborting without an explicit "commit". To avoid a race between queueing
updates and the first "prepare" that starts a transaction, the "start"
command has been added to start an explicit transaction.
Add some tests to exercise this new functionality.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-02 09:10:02 +02:00
|
|
|
switch (state) {
|
|
|
|
case UPDATE_REFS_OPEN:
|
|
|
|
/* Commit by default if no transaction was requested. */
|
|
|
|
if (ref_transaction_commit(transaction, &err))
|
|
|
|
die("%s", err.buf);
|
|
|
|
ref_transaction_free(transaction);
|
|
|
|
break;
|
|
|
|
case UPDATE_REFS_STARTED:
|
|
|
|
case UPDATE_REFS_PREPARED:
|
|
|
|
/* If using a transaction, we want to abort it. */
|
|
|
|
if (ref_transaction_abort(transaction, &err))
|
|
|
|
die("%s", err.buf);
|
|
|
|
break;
|
|
|
|
case UPDATE_REFS_CLOSED:
|
|
|
|
/* Otherwise no need to do anything, the transaction was closed already. */
|
|
|
|
break;
|
|
|
|
}
|
2020-04-02 09:09:53 +02:00
|
|
|
|
|
|
|
strbuf_release(&err);
|
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;
|
2017-07-14 01:49:23 +02:00
|
|
|
struct object_id oid, oldoid;
|
2015-02-17 18:00:13 +01:00
|
|
|
int delete = 0, no_deref = 0, read_stdin = 0, end_null = 0;
|
2015-07-21 23:04:55 +02:00
|
|
|
int create_reflog = 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")),
|
2015-09-11 18:04:13 +02:00
|
|
|
OPT_BOOL( 0 , "create-reflog", &create_reflog, N_("create a reflog")),
|
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
|
|
|
|
2015-07-21 23:04:55 +02:00
|
|
|
create_reflog_flag = create_reflog ? REF_FORCE_CREATE_REFLOG : 0;
|
|
|
|
|
2018-09-05 19:25:50 +02:00
|
|
|
if (no_deref) {
|
|
|
|
default_flags = REF_NO_DEREF;
|
|
|
|
update_flags = default_flags;
|
|
|
|
}
|
|
|
|
|
2013-09-09 15:22:32 +02:00
|
|
|
if (read_stdin) {
|
2018-09-05 19:25:50 +02:00
|
|
|
if (delete || argc > 0)
|
2013-09-09 15:22:32 +02:00
|
|
|
usage_with_options(git_update_ref_usage, options);
|
|
|
|
if (end_null)
|
|
|
|
line_termination = '\0';
|
2020-04-02 09:09:53 +02:00
|
|
|
update_refs_stdin();
|
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];
|
2017-07-14 01:49:23 +02:00
|
|
|
if (get_oid(value, &oid))
|
2008-06-03 01:34:48 +02:00
|
|
|
die("%s: not a valid SHA1", value);
|
2006-09-27 10:58:57 +02:00
|
|
|
}
|
|
|
|
|
2015-06-22 16:03:09 +02:00
|
|
|
if (oldval) {
|
|
|
|
if (!*oldval)
|
|
|
|
/*
|
|
|
|
* The empty string implies that the reference
|
|
|
|
* must not already exist:
|
|
|
|
*/
|
2017-07-14 01:49:23 +02:00
|
|
|
oidclr(&oldoid);
|
|
|
|
else if (get_oid(oldval, &oldoid))
|
2015-06-22 16:03:09 +02:00
|
|
|
die("%s: not a valid old SHA1", oldval);
|
|
|
|
}
|
2005-09-25 20:43:05 +02:00
|
|
|
|
2008-06-03 01:34:48 +02:00
|
|
|
if (delete)
|
2015-06-22 16:03:10 +02:00
|
|
|
/*
|
|
|
|
* For purposes of backwards compatibility, we treat
|
|
|
|
* NULL_SHA1 as "don't care" here:
|
|
|
|
*/
|
2017-02-21 02:10:33 +01:00
|
|
|
return delete_ref(msg, refname,
|
2017-10-16 00:06:50 +02:00
|
|
|
(oldval && !is_null_oid(&oldoid)) ? &oldoid : NULL,
|
2018-09-05 19:25:50 +02:00
|
|
|
default_flags);
|
2008-06-03 01:34:48 +02:00
|
|
|
else
|
2017-10-16 00:06:51 +02:00
|
|
|
return update_ref(msg, refname, &oid, oldval ? &oldoid : NULL,
|
2018-09-05 19:25:50 +02:00
|
|
|
default_flags | create_reflog_flag,
|
2015-07-21 23:04:55 +02:00
|
|
|
UPDATE_REFS_DIE_ON_ERR);
|
2005-09-25 20:43:05 +02:00
|
|
|
}
|