From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
David Turner <novalis@novalis.org>,
Jacob Keller <jacob.keller@gmail.com>,
Philip Oakley <philipoakley@iee.org>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v4 15/23] log_ref_write_1(): don't depend on logfile argument
Date: Fri, 6 Jan 2017 17:22:35 +0100 [thread overview]
Message-ID: <8c0da0a941845d73988e2c1100f8afb91e272841.1483719289.git.mhagger@alum.mit.edu> (raw)
In-Reply-To: <cover.1483719289.git.mhagger@alum.mit.edu>
It's unnecessary to pass a strbuf holding the reflog path up and down
the call stack now that it is hardly needed by the callers. Remove the
places where log_ref_write_1() uses it, in preparation for making it
internal to log_ref_setup().
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
refs/files-backend.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index f723834..9c5e804 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2838,14 +2838,18 @@ static int log_ref_write_1(const char *refname, const unsigned char *old_sha1,
result = log_ref_write_fd(logfd, old_sha1, new_sha1,
git_committer_info(0), msg);
if (result) {
- strbuf_addf(err, "unable to append to '%s': %s", logfile->buf,
- strerror(errno));
+ int save_errno = errno;
+
+ strbuf_addf(err, "unable to append to '%s': %s",
+ git_path("logs/%s", refname), strerror(save_errno));
close(logfd);
return -1;
}
if (close(logfd)) {
- strbuf_addf(err, "unable to append to '%s': %s", logfile->buf,
- strerror(errno));
+ int save_errno = errno;
+
+ strbuf_addf(err, "unable to append to '%s': %s",
+ git_path("logs/%s", refname), strerror(save_errno));
return -1;
}
return 0;
--
2.9.3
next prev parent reply other threads:[~2017-01-06 16:24 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-06 16:22 [PATCH v4 00/23] Delete directories left empty after ref deletion Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 01/23] files_rename_ref(): tidy up whitespace Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 02/23] refname_is_safe(): correct docstring Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 03/23] t5505: use "for-each-ref" to test for the non-existence of references Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 04/23] safe_create_leading_directories_const(): preserve errno Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 05/23] safe_create_leading_directories(): set errno on SCLD_EXISTS Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 06/23] raceproof_create_file(): new function Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 07/23] lock_ref_sha1_basic(): inline constant Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 08/23] lock_ref_sha1_basic(): use raceproof_create_file() Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 09/23] rename_tmp_log(): " Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 10/23] rename_tmp_log(): improve error reporting Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 11/23] log_ref_write(): inline function Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 12/23] log_ref_setup(): separate code for create vs non-create Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 13/23] log_ref_setup(): improve robustness against races Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 14/23] log_ref_setup(): pass the open file descriptor back to the caller Michael Haggerty
2017-01-06 16:22 ` Michael Haggerty [this message]
2017-01-06 16:22 ` [PATCH v4 16/23] log_ref_setup(): manage the name of the reflog file internally Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 17/23] log_ref_write_1(): inline function Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 18/23] delete_ref_loose(): derive loose reference path from lock Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 19/23] delete_ref_loose(): inline function Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 20/23] try_remove_empty_parents(): rename parameter "name" -> "refname" Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 21/23] try_remove_empty_parents(): don't trash argument contents Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 22/23] try_remove_empty_parents(): teach to remove parents of reflogs, too Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 23/23] files_transaction_commit(): clean up empty directories Michael Haggerty
2017-01-06 19:44 ` [PATCH v4 00/23] Delete directories left empty after ref deletion Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8c0da0a941845d73988e2c1100f8afb91e272841.1483719289.git.mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=novalis@novalis.org \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).