From: Junio C Hamano <gitster@pobox.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
David Turner <novalis@novalis.org>
Subject: Re: [PATCH v3 10/23] log_ref_write(): inline function
Date: Sat, 31 Dec 2016 18:09:33 -0800 [thread overview]
Message-ID: <xmqqzijb4jky.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <dba3d081c32854593d8113f9cd604a9891748bcd.1483153436.git.mhagger@alum.mit.edu> (Michael Haggerty's message of "Sat, 31 Dec 2016 04:12:50 +0100")
Michael Haggerty <mhagger@alum.mit.edu> writes:
> This function doesn't do anything beyond call files_log_ref_write(), so
s/call/&ing/; I think.
> replace it with the latter at its call sites.
>
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
> ---
> refs/files-backend.c | 24 ++++++++++--------------
> 1 file changed, 10 insertions(+), 14 deletions(-)
>
> diff --git a/refs/files-backend.c b/refs/files-backend.c
> index 49a119c..fd8a751 100644
> --- a/refs/files-backend.c
> +++ b/refs/files-backend.c
> @@ -2832,14 +2832,6 @@ static int log_ref_write_1(const char *refname, const unsigned char *old_sha1,
> return 0;
> }
>
> -static int log_ref_write(const char *refname, const unsigned char *old_sha1,
> - const unsigned char *new_sha1, const char *msg,
> - int flags, struct strbuf *err)
> -{
> - return files_log_ref_write(refname, old_sha1, new_sha1, msg, flags,
> - err);
> -}
> -
> int files_log_ref_write(const char *refname, const unsigned char *old_sha1,
> const unsigned char *new_sha1, const char *msg,
> int flags, struct strbuf *err)
> @@ -2903,7 +2895,8 @@ static int commit_ref_update(struct files_ref_store *refs,
> assert_main_repository(&refs->base, "commit_ref_update");
>
> clear_loose_ref_cache(refs);
> - if (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, 0, err)) {
> + if (files_log_ref_write(lock->ref_name, lock->old_oid.hash, sha1,
> + logmsg, 0, err)) {
> char *old_msg = strbuf_detach(err, NULL);
> strbuf_addf(err, "cannot update the ref '%s': %s",
> lock->ref_name, old_msg);
> @@ -2934,7 +2927,7 @@ static int commit_ref_update(struct files_ref_store *refs,
> if (head_ref && (head_flag & REF_ISSYMREF) &&
> !strcmp(head_ref, lock->ref_name)) {
> struct strbuf log_err = STRBUF_INIT;
> - if (log_ref_write("HEAD", lock->old_oid.hash, sha1,
> + if (files_log_ref_write("HEAD", lock->old_oid.hash, sha1,
> logmsg, 0, &log_err)) {
> error("%s", log_err.buf);
> strbuf_release(&log_err);
> @@ -2973,7 +2966,8 @@ static void update_symref_reflog(struct ref_lock *lock, const char *refname,
> struct strbuf err = STRBUF_INIT;
> unsigned char new_sha1[20];
> if (logmsg && !read_ref(target, new_sha1) &&
> - log_ref_write(refname, lock->old_oid.hash, new_sha1, logmsg, 0, &err)) {
> + files_log_ref_write(refname, lock->old_oid.hash, new_sha1,
> + logmsg, 0, &err)) {
> error("%s", err.buf);
> strbuf_release(&err);
> }
> @@ -3748,9 +3742,11 @@ static int files_transaction_commit(struct ref_store *ref_store,
>
> if (update->flags & REF_NEEDS_COMMIT ||
> update->flags & REF_LOG_ONLY) {
> - if (log_ref_write(lock->ref_name, lock->old_oid.hash,
> - update->new_sha1,
> - update->msg, update->flags, err)) {
> + if (files_log_ref_write(lock->ref_name,
> + lock->old_oid.hash,
> + update->new_sha1,
> + update->msg, update->flags,
> + err)) {
> char *old_msg = strbuf_detach(err, NULL);
>
> strbuf_addf(err, "cannot update the ref '%s': %s",
next prev parent reply other threads:[~2017-01-01 2:09 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-31 3:12 [PATCH v3 00/23] Delete directories left empty after ref deletion Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 01/23] files_rename_ref(): tidy up whitespace Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 02/23] t5505: use "for-each-ref" to test for the non-existence of references Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 03/23] safe_create_leading_directories_const(): preserve errno Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 04/23] safe_create_leading_directories(): set errno on SCLD_EXISTS Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 05/23] raceproof_create_file(): new function Michael Haggerty
2016-12-31 6:11 ` Jeff King
2016-12-31 7:42 ` Michael Haggerty
2017-01-01 2:07 ` Junio C Hamano
2016-12-31 3:12 ` [PATCH v3 06/23] lock_ref_sha1_basic(): inline constant Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 07/23] lock_ref_sha1_basic(): use raceproof_create_file() Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 08/23] rename_tmp_log(): " Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 09/23] rename_tmp_log(): improve error reporting Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 10/23] log_ref_write(): inline function Michael Haggerty
2017-01-01 2:09 ` Junio C Hamano [this message]
2017-01-01 8:41 ` Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 11/23] log_ref_setup(): separate code for create vs non-create Michael Haggerty
2016-12-31 6:26 ` Jeff King
2016-12-31 7:52 ` Michael Haggerty
2017-01-01 3:28 ` Junio C Hamano
2017-01-01 8:45 ` Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 12/23] log_ref_setup(): improve robustness against races Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 13/23] log_ref_setup(): pass the open file descriptor back to the caller Michael Haggerty
2016-12-31 6:32 ` Jeff King
2016-12-31 7:58 ` Michael Haggerty
2016-12-31 17:58 ` Jeff King
2017-01-01 10:36 ` Junio C Hamano
2016-12-31 3:12 ` [PATCH v3 14/23] log_ref_write_1(): don't depend on logfile argument Michael Haggerty
2016-12-31 6:35 ` Jeff King
2016-12-31 8:01 ` Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 15/23] log_ref_setup(): manage the name of the reflog file internally Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 16/23] log_ref_write_1(): inline function Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 17/23] delete_ref_loose(): derive loose reference path from lock Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 18/23] delete_ref_loose(): inline function Michael Haggerty
2016-12-31 3:12 ` [PATCH v3 19/23] try_remove_empty_parents(): rename parameter "name" -> "refname" Michael Haggerty
2016-12-31 3:13 ` [PATCH v3 20/23] try_remove_empty_parents(): don't trash argument contents Michael Haggerty
2016-12-31 6:40 ` Jeff King
2017-01-02 16:27 ` Michael Haggerty
2017-01-02 17:10 ` Jeff King
2016-12-31 3:13 ` [PATCH v3 21/23] try_remove_empty_parents(): don't accommodate consecutive slashes Michael Haggerty
2017-01-01 2:30 ` Junio C Hamano
2017-01-01 5:59 ` Jeff King
2017-01-02 18:06 ` Michael Haggerty
2017-01-02 18:26 ` Jeff King
2016-12-31 3:13 ` [PATCH v3 22/23] try_remove_empty_parents(): teach to remove parents of reflogs, too Michael Haggerty
2016-12-31 3:13 ` [PATCH v3 23/23] files_transaction_commit(): clean up empty directories Michael Haggerty
2016-12-31 6:47 ` [PATCH v3 00/23] Delete directories left empty after ref deletion Jeff King
2017-01-01 2:32 ` Junio C Hamano
2017-01-01 9:24 ` Jacob Keller
2017-01-01 9:26 ` Jacob Keller
2017-01-01 12:43 ` Philip Oakley
2017-01-01 20:36 ` Jacob Keller
2017-01-02 4:19 ` Jeff King
2017-01-02 18:14 ` Michael Haggerty
2017-01-02 18:54 ` Jacob Keller
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzijb4jky.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=novalis@novalis.org \
--cc=peff@peff.net \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.