[PATCH 1/2] checkout,clone: check return value of create_symref
- From
Jeff King <peff@peff.net>
- Date
- Jan 11, 2016, 15:49 UTC
- Message-ID
- <20160111154935.GA22778@sigill.intra.peff.net>
- In-Reply-To
- <20160111154651.GA25338@sigill.intra.peff.net>
It's unlikely that we would fail to create or update a symbolic ref (especially HEAD), but if we do, we should notice and complain. Note that there's no need to give more details in our error message; create_symref will already have done so.
While we're here, let's also fix a minor memory leak in clone.
Signed-off-by: Jeff King <peff@peff.net> --- This patch could go to maint. I don't know if it's worth the trouble. I was unable to figure out a way to trigger this reliably (hence no tests). The two ways I considered were:
- "chmod -w .git", but it results in a die() already
- the bug I'm fixing in 2/2; but we don't want to rely on that in our
test suite, since I'm about to fix it. :-/builtin/checkout.c | 3 ++- builtin/clone.c | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c index e8110a9..5af84a3 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -661,7 +661,8 @@ static void update_refs_for_switch(const struct checkout_opts *opts, describe_detached_head(_("HEAD is now at"), new->commit); } } else if (new->path) { /* Switch branches. */ - create_symref("HEAD", new->path, msg.buf); + if (create_symref("HEAD", new->path, msg.buf) < 0) + die("unable to update HEAD"); if (!opts->quiet) { if (old->path && !strcmp(new->path, old->path)) { if (opts->new_branch_force) diff --git a/builtin/clone.c b/builtin/clone.c index a0b3cd9..a7c8def 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -636,9 +636,11 @@ static void update_remote_refs(const struct ref *refs, struct strbuf head_ref = STRBUF_INIT; strbuf_addstr(&head_ref, branch_top); strbuf_addstr(&head_ref, "HEAD"); - create_symref(head_ref.buf, - remote_head_points_at->peer_ref->name, - msg); + if (create_symref(head_ref.buf, + remote_head_points_at->peer_ref->name, + msg) < 0) + die("unable to update %s", head_ref.buf); + strbuf_release(&head_ref); } } @@ -648,7 +650,8 @@ static void update_head(const struct ref *our, const struct ref *remote, const char *head; if (our && skip_prefix(our->name, "refs/heads/", &head)) { /* Local default branch link */ - create_symref("HEAD", our->name, NULL); + if (create_symref("HEAD", our->name, NULL) < 0) + die("unable to update HEAD"); if (!option_bare) { update_ref(msg, "HEAD", our->old_oid.hash, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
-- 2.7.0.368.g04bc9ee