diff options
author | Ronnie Sahlberg <sahlberg@google.com> | 2014-04-16 11:56:52 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-17 12:54:15 -0700 |
commit | 651ab9f553a1fd8bb847bd42922dacb14f8ec77f (patch) | |
tree | 22fe68bf59da6350daa7328020c8942027d789cd /reachable.c | |
parent | 3f0c02a1c018ddaced5c97b58f550b2ad17dd0a9 (diff) | |
download | git-651ab9f553a1fd8bb847bd42922dacb14f8ec77f.tar.gz |
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>
Diffstat (limited to 'reachable.c')
0 files changed, 0 insertions, 0 deletions