kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

update-ref --stdin: pass transaction around explicitly 

This makes it more obvious at a glance where the output of functions
parsing the --stdin stream goes.

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>
maint
Jonathan Nieder 2014-09-02 14:11:21 -07:00 committed by Junio C Hamano
parent ab5ac95725
commit 88499b296b
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
builtin/update-ref.c
View File

@ -12,8 +12,6 @@ static const char * const git_update_ref_usage[] = {
NULL NULL
}; };


static struct ref_transaction *transaction;

static char line_termination = '\n'; static char line_termination = '\n';
static int update_flags; static int update_flags;


@ -176,7 +174,8 @@ static int parse_next_sha1(struct strbuf *input, const char **next,
* depending on how line_termination is set. * depending on how line_termination is set.
*/ */


static const char *parse_cmd_update(struct strbuf *input, const char *next) static const char *parse_cmd_update(struct ref_transaction *transaction,
struct strbuf *input, const char *next)
{ {
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
char *refname; char *refname;
@ -209,7 +208,8 @@ static const char *parse_cmd_update(struct strbuf *input, const char *next)
return next; return next;
} }


static const char *parse_cmd_create(struct strbuf *input, const char *next) static const char *parse_cmd_create(struct ref_transaction *transaction,
struct strbuf *input, const char *next)
{ {
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
char *refname; char *refname;
@ -239,7 +239,8 @@ static const char *parse_cmd_create(struct strbuf *input, const char *next)
return next; return next;
} }


static const char *parse_cmd_delete(struct strbuf *input, const char *next) static const char *parse_cmd_delete(struct ref_transaction *transaction,
struct strbuf *input, const char *next)
{ {
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
char *refname; char *refname;
@ -273,7 +274,8 @@ static const char *parse_cmd_delete(struct strbuf *input, const char *next)
return next; return next;
} }


static const char *parse_cmd_verify(struct strbuf *input, const char *next) static const char *parse_cmd_verify(struct ref_transaction *transaction,
struct strbuf *input, const char *next)
{ {
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
char *refname; char *refname;
@ -317,7 +319,7 @@ static const char *parse_cmd_option(struct strbuf *input, const char *next)
return next + 8; return next + 8;
} }


static void update_refs_stdin(void) static void update_refs_stdin(struct ref_transaction *transaction)
{ {
struct strbuf input = STRBUF_INIT; struct strbuf input = STRBUF_INIT;
const char *next; const char *next;
@ -332,13 +334,13 @@ static void update_refs_stdin(void)
else if (isspace(*next)) else if (isspace(*next))
die("whitespace before command: %s", next); die("whitespace before command: %s", next);
else if (starts_with(next, "update ")) else if (starts_with(next, "update "))
next = parse_cmd_update(&input, next + 7); next = parse_cmd_update(transaction, &input, next + 7);
else if (starts_with(next, "create ")) else if (starts_with(next, "create "))
next = parse_cmd_create(&input, next + 7); next = parse_cmd_create(transaction, &input, next + 7);
else if (starts_with(next, "delete ")) else if (starts_with(next, "delete "))
next = parse_cmd_delete(&input, next + 7); next = parse_cmd_delete(transaction, &input, next + 7);
else if (starts_with(next, "verify ")) else if (starts_with(next, "verify "))
next = parse_cmd_verify(&input, next + 7); next = parse_cmd_verify(transaction, &input, next + 7);
else if (starts_with(next, "option ")) else if (starts_with(next, "option "))
next = parse_cmd_option(&input, next + 7); next = parse_cmd_option(&input, next + 7);
else else
@ -373,6 +375,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)


if (read_stdin) { if (read_stdin) {
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
struct ref_transaction *transaction;


transaction = ref_transaction_begin(&err); transaction = ref_transaction_begin(&err);
if (!transaction) if (!transaction)
@ -381,7 +384,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
usage_with_options(git_update_ref_usage, options); usage_with_options(git_update_ref_usage, options);
if (end_null) if (end_null)
line_termination = '\0'; line_termination = '\0';
update_refs_stdin(); update_refs_stdin(transaction);
if (ref_transaction_commit(transaction, msg, &err)) if (ref_transaction_commit(transaction, msg, &err))
die("%s", err.buf); die("%s", err.buf);
ref_transaction_free(transaction); ref_transaction_free(transaction);