worktree: make setup of new HEAD distinct from worktree population

diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 866bbee67e99a3c982e86badf640bccb68acc50e..6c9be051284a78cbdbe6630dbcaae4846288c667 100644 (file)
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -12,10 +12,9 @@ static const char * const git_update_ref_usage[] = {
        NULL
 };
 
-static struct ref_transaction *transaction;
-
 static char line_termination = '\n';
 static int update_flags;
+static const char *msg;
 
 /*
  * Parse one whitespace- or NUL-terminated, possibly C-quoted argument
@@ -176,7 +175,8 @@ static int parse_next_sha1(struct strbuf *input, const char **next,
  * 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;
        char *refname;
@@ -199,7 +199,7 @@ static const char *parse_cmd_update(struct strbuf *input, const char *next)
                die("update %s: extra input: %s", refname, next);
 
        if (ref_transaction_update(transaction, refname, new_sha1, old_sha1,
-                                  update_flags, have_old, &err))
+                                  update_flags, have_old, msg, &err))
                die("%s", err.buf);
 
        update_flags = 0;
@@ -209,7 +209,8 @@ static const char *parse_cmd_update(struct strbuf *input, const char *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;
        char *refname;
@@ -229,7 +230,7 @@ static const char *parse_cmd_create(struct strbuf *input, const char *next)
                die("create %s: extra input: %s", refname, next);
 
        if (ref_transaction_create(transaction, refname, new_sha1,
-                                  update_flags, &err))
+                                  update_flags, msg, &err))
                die("%s", err.buf);
 
        update_flags = 0;
@@ -239,7 +240,8 @@ static const char *parse_cmd_create(struct strbuf *input, const char *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;
        char *refname;
@@ -263,7 +265,7 @@ static const char *parse_cmd_delete(struct strbuf *input, const char *next)
                die("delete %s: extra input: %s", refname, next);
 
        if (ref_transaction_delete(transaction, refname, old_sha1,
-                                  update_flags, have_old, &err))
+                                  update_flags, have_old, msg, &err))
                die("%s", err.buf);
 
        update_flags = 0;
@@ -273,7 +275,8 @@ static const char *parse_cmd_delete(struct strbuf *input, const char *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;
        char *refname;
@@ -298,7 +301,7 @@ static const char *parse_cmd_verify(struct strbuf *input, const char *next)
                die("verify %s: extra input: %s", refname, next);
 
        if (ref_transaction_update(transaction, refname, new_sha1, old_sha1,
-                                  update_flags, have_old, &err))
+                                  update_flags, have_old, msg, &err))
                die("%s", err.buf);
 
        update_flags = 0;
@@ -317,7 +320,7 @@ static const char *parse_cmd_option(struct strbuf *input, const char *next)
        return next + 8;
 }
 
-static void update_refs_stdin(void)
+static void update_refs_stdin(struct ref_transaction *transaction)
 {
        struct strbuf input = STRBUF_INIT;
        const char *next;
@@ -332,13 +335,13 @@ static void update_refs_stdin(void)
                else if (isspace(*next))
                        die("whitespace before command: %s", next);
                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 "))
-                       next = parse_cmd_create(&input, next + 7);
+                       next = parse_cmd_create(transaction, &input, next + 7);
                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 "))
-                       next = parse_cmd_verify(&input, next + 7);
+                       next = parse_cmd_verify(transaction, &input, next + 7);
                else if (starts_with(next, "option "))
                        next = parse_cmd_option(&input, next + 7);
                else
@@ -352,7 +355,7 @@ static void update_refs_stdin(void)
 
 int cmd_update_ref(int argc, const char **argv, const char *prefix)
 {
-       const char *refname, *oldval, *msg = NULL;
+       const char *refname, *oldval;
        unsigned char sha1[20], oldsha1[20];
        int delete = 0, no_deref = 0, read_stdin = 0, end_null = 0, flags = 0;
        struct option options[] = {
@@ -373,6 +376,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 
        if (read_stdin) {
                struct strbuf err = STRBUF_INIT;
+               struct ref_transaction *transaction;
 
                transaction = ref_transaction_begin(&err);
                if (!transaction)
@@ -381,8 +385,8 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
                        usage_with_options(git_update_ref_usage, options);
                if (end_null)
                        line_termination = '\0';
-               update_refs_stdin();
-               if (ref_transaction_commit(transaction, msg, &err))
+               update_refs_stdin(transaction);
+               if (ref_transaction_commit(transaction, &err))
                        die("%s", err.buf);
                ref_transaction_free(transaction);
                strbuf_release(&err);