update-ref --stdin: narrow scope of err strbuf
Making the strbuf local in each function that needs to print errors saves the reader from having to think about action at a distance, such as * errors piling up and being concatenated with no newline between them * errors unhandled in one function, to be later handled in another * concurrency issues, if this code starts using threads some day No functional change intended. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7521cc4611
commit
ab5ac95725
@ -16,7 +16,6 @@ static struct ref_transaction *transaction;
|
|||||||
|
|
||||||
static char line_termination = '\n';
|
static char line_termination = '\n';
|
||||||
static int update_flags;
|
static int update_flags;
|
||||||
static struct strbuf err = STRBUF_INIT;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Parse one whitespace- or NUL-terminated, possibly C-quoted argument
|
* Parse one whitespace- or NUL-terminated, possibly C-quoted argument
|
||||||
@ -179,6 +178,7 @@ static int parse_next_sha1(struct strbuf *input, const char **next,
|
|||||||
|
|
||||||
static const char *parse_cmd_update(struct strbuf *input, const char *next)
|
static const char *parse_cmd_update(struct strbuf *input, const char *next)
|
||||||
{
|
{
|
||||||
|
struct strbuf err = STRBUF_INIT;
|
||||||
char *refname;
|
char *refname;
|
||||||
unsigned char new_sha1[20];
|
unsigned char new_sha1[20];
|
||||||
unsigned char old_sha1[20];
|
unsigned char old_sha1[20];
|
||||||
@ -204,12 +204,14 @@ static const char *parse_cmd_update(struct strbuf *input, const char *next)
|
|||||||
|
|
||||||
update_flags = 0;
|
update_flags = 0;
|
||||||
free(refname);
|
free(refname);
|
||||||
|
strbuf_release(&err);
|
||||||
|
|
||||||
return next;
|
return next;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *parse_cmd_create(struct strbuf *input, const char *next)
|
static const char *parse_cmd_create(struct strbuf *input, const char *next)
|
||||||
{
|
{
|
||||||
|
struct strbuf err = STRBUF_INIT;
|
||||||
char *refname;
|
char *refname;
|
||||||
unsigned char new_sha1[20];
|
unsigned char new_sha1[20];
|
||||||
|
|
||||||
@ -232,12 +234,14 @@ static const char *parse_cmd_create(struct strbuf *input, const char *next)
|
|||||||
|
|
||||||
update_flags = 0;
|
update_flags = 0;
|
||||||
free(refname);
|
free(refname);
|
||||||
|
strbuf_release(&err);
|
||||||
|
|
||||||
return next;
|
return next;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *parse_cmd_delete(struct strbuf *input, const char *next)
|
static const char *parse_cmd_delete(struct strbuf *input, const char *next)
|
||||||
{
|
{
|
||||||
|
struct strbuf err = STRBUF_INIT;
|
||||||
char *refname;
|
char *refname;
|
||||||
unsigned char old_sha1[20];
|
unsigned char old_sha1[20];
|
||||||
int have_old;
|
int have_old;
|
||||||
@ -264,12 +268,14 @@ static const char *parse_cmd_delete(struct strbuf *input, const char *next)
|
|||||||
|
|
||||||
update_flags = 0;
|
update_flags = 0;
|
||||||
free(refname);
|
free(refname);
|
||||||
|
strbuf_release(&err);
|
||||||
|
|
||||||
return next;
|
return next;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *parse_cmd_verify(struct strbuf *input, const char *next)
|
static const char *parse_cmd_verify(struct strbuf *input, const char *next)
|
||||||
{
|
{
|
||||||
|
struct strbuf err = STRBUF_INIT;
|
||||||
char *refname;
|
char *refname;
|
||||||
unsigned char new_sha1[20];
|
unsigned char new_sha1[20];
|
||||||
unsigned char old_sha1[20];
|
unsigned char old_sha1[20];
|
||||||
@ -297,6 +303,7 @@ static const char *parse_cmd_verify(struct strbuf *input, const char *next)
|
|||||||
|
|
||||||
update_flags = 0;
|
update_flags = 0;
|
||||||
free(refname);
|
free(refname);
|
||||||
|
strbuf_release(&err);
|
||||||
|
|
||||||
return next;
|
return next;
|
||||||
}
|
}
|
||||||
@ -365,6 +372,8 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
|
|||||||
die("Refusing to perform update with empty message.");
|
die("Refusing to perform update with empty message.");
|
||||||
|
|
||||||
if (read_stdin) {
|
if (read_stdin) {
|
||||||
|
struct strbuf err = STRBUF_INIT;
|
||||||
|
|
||||||
transaction = ref_transaction_begin(&err);
|
transaction = ref_transaction_begin(&err);
|
||||||
if (!transaction)
|
if (!transaction)
|
||||||
die("%s", err.buf);
|
die("%s", err.buf);
|
||||||
|
Loading…
Reference in New Issue
Block a user