From: Michael Haggerty <mhagger@alum.mit.edu>
To: David Turner <dturner@twopensource.com>, git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: Re: [PATCH v9 1/7] refs.c: add err arguments to reflog functions
Date: Tue, 21 Jul 2015 12:50:02 -0700 [thread overview]
Message-ID: <55AEA26A.6050800@alum.mit.edu> (raw)
In-Reply-To: <1437493504-3699-2-git-send-email-dturner@twopensource.com>
There's one last error formatting niggle below.
On 07/21/2015 08:44 AM, David Turner wrote:
> Add an err argument to log_ref_setup that can explain the reason
> for a failure. This then eliminates the need to manage errno through
> this function since we can just add strerror(errno) to the err string
> when meaningful. No callers relied on errno from this function for
> anything else than the error message.
>
> Also add err arguments to private functions write_ref_to_lockfile,
> log_ref_write_1, commit_ref_update. This again eliminates the need to
> manage errno in these functions.
>
> Some error messages are slightly reordered.
>
> Update of a patch by Ronnie Sahlberg.
>
> Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
> Signed-off-by: David Turner <dturner@twopensource.com>
> ---
> builtin/checkout.c | 8 ++--
> refs.c | 129 ++++++++++++++++++++++++++++++-----------------------
> refs.h | 4 +-
> 3 files changed, 81 insertions(+), 60 deletions(-)
>
> [...]
> diff --git a/refs.c b/refs.c
> index fb568d7..f090720 100644
> --- a/refs.c
> +++ b/refs.c
> [...]
> @@ -3288,12 +3288,17 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
> * necessary, using the specified lockmsg (which can be NULL).
> */
> static int commit_ref_update(struct ref_lock *lock,
> - const unsigned char *sha1, const char *logmsg)
> + const unsigned char *sha1, const char *logmsg,
> + struct strbuf *err)
> {
> clear_loose_ref_cache(&ref_cache);
> - if (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg) < 0 ||
> + if (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, err) < 0 ||
> (strcmp(lock->ref_name, lock->orig_ref_name) &&
> - log_ref_write(lock->orig_ref_name, lock->old_oid.hash, sha1, logmsg) < 0)) {
> + log_ref_write(lock->orig_ref_name, lock->old_oid.hash, sha1, logmsg, err) < 0)) {
> + char *old_msg = strbuf_detach(err, NULL);
> + strbuf_addf(err, "Cannot update the ref '%s': '%s'",
> + lock->ref_name, old_msg);
The above error message has unnecessary quotes around old_msg.
> + free(old_msg);
> unlock_ref(lock);
> return -1;
> }
> [...]
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
next prev parent reply other threads:[~2015-07-21 19:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-21 15:44 [PATCH v9 0/7] refs backend preamble David Turner
2015-07-21 15:44 ` [PATCH v9 1/7] refs.c: add err arguments to reflog functions David Turner
2015-07-21 19:50 ` Michael Haggerty [this message]
2015-07-21 15:44 ` [PATCH v9 2/7] refs: Break out check for reflog autocreation David Turner
2015-07-21 15:45 ` [PATCH v9 3/7] refs: new public ref function: safe_create_reflog David Turner
2015-07-21 19:57 ` Michael Haggerty
2015-07-21 15:45 ` [PATCH v9 4/7] git-reflog: add exists command David Turner
2015-07-21 19:51 ` Michael Haggerty
2015-07-21 15:45 ` [PATCH v9 5/7] refs: add REF_FORCE_CREATE_REFLOG flag David Turner
2015-07-21 15:45 ` [PATCH v9 6/7] update-ref and tag: add --create-reflog arg David Turner
2015-07-21 16:42 ` Junio C Hamano
2015-07-21 20:02 ` Michael Haggerty
2015-07-21 20:06 ` Michael Haggerty
2015-07-21 15:45 ` [PATCH v9 7/7] git-stash: use update-ref --create-reflog instead of creating files David Turner
2015-07-21 20:20 ` [PATCH v9 0/7] refs backend preamble Michael Haggerty
2015-07-21 20:43 ` David Turner
2015-07-21 20:49 ` Junio C Hamano
2015-07-21 21:05 ` David Turner
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=55AEA26A.6050800@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=sahlberg@google.com \
/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).