Merge branch 'ew/http-walker' into jk/http-walker-limit-redirect

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index a744437b5876171250d4731d181f7b30e5444187..05d04400f5f0a8dbe9674207a41507fb9aa56f85 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1375,11 +1375,9 @@ static struct command **queue_command(struct command **tail,
 
        refname = line + 82;
        reflen = linelen - 82;
-       cmd = xcalloc(1, st_add3(sizeof(struct command), reflen, 1));
+       FLEX_ALLOC_MEM(cmd, ref_name, refname, reflen);
        hashcpy(cmd->old_sha1, old_sha1);
        hashcpy(cmd->new_sha1, new_sha1);
-       memcpy(cmd->ref_name, refname, reflen);
-       cmd->ref_name[reflen] = '\0';
        *tail = cmd;
        return &cmd->next;
 }