diff options
| author |  Ronnie Sahlberg <sahlberg@google.com> | 2014-04-16 11:56:53 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-04-17 12:57:13 -0700 |
| commit | 55a5c8d72b03ad3727b89900069a1d58664fe5e4 (patch) | |
| tree | bef05af1d24237fb702958193898c2df1305bda2 /builtin | |
| parent | sequencer.c: check for lock failure and bail early in fast_forward_to (diff) | |
| download | tgif-55a5c8d72b03ad3727b89900069a1d58664fe5e4.tar.xz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 9cfef6c6cc..f0b790640d 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1672,6 +1672,10 @@ int cmd_commit(int argc, const char **argv, const char *prefix) ? NULL : current_head->object.sha1, 0, NULL); + if (!ref_lock) { + rollback_index_files(); + die(_("cannot lock HEAD ref")); + } nl = strchr(sb.buf, '\n'); if (nl) @@ -1681,10 +1685,6 @@ int cmd_commit(int argc, const char **argv, const char *prefix) strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg)); strbuf_insert(&sb, strlen(reflog_msg), ": ", 2); - if (!ref_lock) { - rollback_index_files(); - die(_("cannot lock HEAD ref")); - } if (write_ref_sha1(ref_lock, sha1, sb.buf) < 0) { rollback_index_files(); die(_("cannot update HEAD ref")); |