diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2017-01-06 17:22:35 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-07 19:30:09 -0800 |
| commit | 87b21e05ed869806f865ada8f5d977ce99f18f20 (patch) | |
| tree | 9bf3b88e866bf30ee10f52565abc7174b9f0c36a | |
| parent | e404f459fdc0d42e9ea83084cb1acdd241c14de3 (diff) | |
| download | git-87b21e05ed869806f865ada8f5d977ce99f18f20.tar.gz | |
log_ref_write_1(): don't depend on logfile argument
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>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | refs/files-backend.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index f723834d9b..9c5e804191 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; |