Johannes Schindelin <johannes.schindelin@xxxxxx> writes: > strbuf_addf(&buf, "%s\n", head); > if (write_in_full(fd, buf.buf, buf.len) < 0) > - die_errno(_("Could not write to %s"), git_path_head_file()); > + return error_errno(_("Could not write to %s"), > + git_path_head_file()); Same comment around a left-over lockfile applies to this. An extra rollback being minimally intrusive also applies here, I think. > if (commit_lock_file(&head_lock) < 0) > - die(_("Error wrapping up %s."), git_path_head_file()); > + return error(_("Error wrapping up %s."), git_path_head_file()); > + return 0; > }