commit.c: check for lock error and return early
Move the check for the lock failure to happen immediately after lock_any_ref_for_update(). Previously the lock and the check-if-lock-failed was separated by a handful of string manipulation statements. Moving the check to occur immediately after the failed lock makes the code slightly easier to read and makes it follow the pattern of try-to-take-a-lock(); if (check-if-lock-failed) { error(); } Signed-off-by: Ronnie Sahlberg <sahlberg@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ronnie Sahlberg committed
Apr 16, 2014 at 11:56 UTC
55a5c8d72b03ad3727b89900069a1d58664fe5e4
1 file changed
+4
-4
builtin/commit.c
+4
-4
@@ -1672,6 +1672,10 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
1672
? NULL
1673
: current_head->object.sha1,
1674
0, NULL);
1675
+ if (!ref_lock) {
1676
+ rollback_index_files();
1677
+ die(_("cannot lock HEAD ref"));
1678
+ }
1679
1680
nl = strchr(sb.buf, '\n');
1681
if (nl)
@@ -1681,10 +1685,6 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
1685
strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
1686
strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
1687
1684
- if (!ref_lock) {
1685
- rollback_index_files();
1686
- die(_("cannot lock HEAD ref"));
1687
- }
1688
if (write_ref_sha1(ref_lock, sha1, sb.buf) < 0) {
1689
rollback_index_files();
1690
die(_("cannot update HEAD ref"));