Skip to content

Commit 651ab9f

Browse files
rsahlberggitster
authored andcommitted
sequencer.c: check for lock failure and bail early in fast_forward_to
Change fast_forward_to() to check if locking the ref failed, print a nice error message and bail out early. The old code did not check if ref_lock was NULL and relied on the fact that the write_ref_sha1() would safely detect this condition and set the return variable ret to indicate an error. While that is safe, it makes the code harder to read for two reasons: * Inconsistency. Almost all other places we do check the lock for NULL explicitly, so the naive reader is confused "why don't we check here?" * And relying on write_ref_sha1() to detect and return an error for when a previous lock_any_ref_for_update() failed feels obfuscated. This change should not change any functionality or logic aside from adding an extra error message when this condition is triggered (write_ref_sha1() returns an error silently for this condition). Signed-off-by: Ronnie Sahlberg <sahlberg@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 3f0c02a commit 651ab9f

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

sequencer.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,12 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from,
281281
exit(1); /* the callee should have complained already */
282282
ref_lock = lock_any_ref_for_update("HEAD", unborn ? null_sha1 : from,
283283
0, NULL);
284+
if (!ref_lock)
285+
return error(_("Failed to lock HEAD during fast_forward_to"));
286+
284287
strbuf_addf(&sb, "%s: fast-forward", action_name(opts));
285288
ret = write_ref_sha1(ref_lock, to, sb.buf);
289+
286290
strbuf_release(&sb);
287291
return ret;
288292
}

0 commit comments

Comments
 (0)