Merge branch 'nd/worktree-add-lock'

diff --git a/branch.c b/branch.c
index 6d0ca94cc79fd52b7cd41c49a2790bcf0e72db5d..ad5a2299ba2600e67c8aaa7719a2c7d54898958f 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -296,14 +296,12 @@ void create_branch(const char *name, const char *start_name,
        if (!dont_change_ref) {
                struct ref_transaction *transaction;
                struct strbuf err = STRBUF_INIT;
-               char msg[PATH_MAX + 20];
+               char *msg;
 
                if (forcing)
-                       snprintf(msg, sizeof msg, "branch: Reset to %s",
-                                start_name);
+                       msg = xstrfmt("branch: Reset to %s", start_name);
                else
-                       snprintf(msg, sizeof msg, "branch: Created from %s",
-                                start_name);
+                       msg = xstrfmt("branch: Created from %s", start_name);
 
                transaction = ref_transaction_begin(&err);
                if (!transaction ||
@@ -314,6 +312,7 @@ void create_branch(const char *name, const char *start_name,
                        die("%s", err.buf);
                ref_transaction_free(transaction);
                strbuf_release(&err);
+               free(msg);
        }
 
        if (real_ref && track)