diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:37:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:37:14 -0800 |
| commit | b7f7c07977ab6e41899b835b873a1ac499eaa2b3 (patch) | |
| tree | 9b20151eb2b1a325ed2c72c22fad41616d8d98db /builtin/receive-pack.c | |
| parent | eb8aa3d2c2849cb3a44396b89054339df38e2bfa (diff) | |
| parent | d5a35c114ab6b4337a1c7598bf75c331d94ee092 (diff) | |
| download | git-b7f7c07977ab6e41899b835b873a1ac499eaa2b3.tar.gz | |
Merge branch 'nd/resolve-ref'
* nd/resolve-ref:
Copy resolve_ref() return value for longer use
Convert many resolve_ref() calls to read_ref*() and ref_exists()
Conflicts:
builtin/fmt-merge-msg.c
builtin/merge.c
refs.c
Diffstat (limited to 'builtin/receive-pack.c')
| -rw-r--r-- | builtin/receive-pack.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 7ec68a1e80..b6d957cb0d 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -695,7 +695,10 @@ static void execute_commands(struct command *commands, const char *unpacker_erro check_aliased_updates(commands); + free((char *)head_name); head_name = resolve_ref("HEAD", sha1, 0, NULL); + if (head_name) + head_name = xstrdup(head_name); for (cmd = commands; cmd; cmd = cmd->next) if (!cmd->skip_update) |