[PATCH v4 15/23] log_ref_write_1(): don't depend on logfile argument
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Jan 6, 2017, 16:22 UTC
- Message-ID
- <8c0da0a941845d73988e2c1100f8afb91e272841.1483719289.git.mhagger@alum.mit.edu>
- 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