From: Eric Sunshine <sunshine@sunshineco.com>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: Jeff King <peff@peff.net>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH] Make error message after failing commit_lock_file() less confusing
Date: Tue, 1 Dec 2015 23:28:09 -0500 [thread overview]
Message-ID: <CAPig+cROdVgf=EL3jKyyPpLiRA_JyHD8P336-YDCWhK8nGSQaQ@mail.gmail.com> (raw)
In-Reply-To: <1448883653-9140-1-git-send-email-szeder@ira.uka.de>
On Mon, Nov 30, 2015 at 6:40 AM, SZEDER Gábor <szeder@ira.uka.de> wrote:
> The error message after a failing commit_lock_file() call sometimes
> looks like this, causing confusion:
>
> $ git remote add remote git@server.com/repo.git
> error: could not commit config file .git/config
> # Huh?!
> # I didn't want to commit anything, especially not my config file!
>
> While in the narrow context of the lockfile module using the verb
> 'commit' in the error message makes perfect sense, in the broader
> context of git the word 'commit' already has a very specific meaning,
> hence the confusion.
>
> Reword these error messages to say "could not write" instead of "could
> not commit".
>
> While at it, include strerror in the error messages after writing the
> config file or the credential store fails to provide some information
> about the cause of the failure, and update the style of the error
> message after writing the reflog fails to match surrounding error
> messages (i.e. no '' around the pathname and no () around the error
> description).
>
> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
> ---
> diff --git a/config.c b/config.c
> @@ -64,7 +64,8 @@ static void rewrite_credential_file(const char *fn, struct credential *c,
> print_line(extra);
> parse_credential_file(fn, c, NULL, print_line);
> if (commit_lock_file(&credential_lock) < 0)
> - die_errno("unable to commit credential store");
> + die_errno("unable to write credential store: %s",
> + strerror(errno));
Hmm, this is already calling die_errno(), so adding another strerror()
to the mix seems superfluous.
> }
>
> static void store_credential_file(const char *fn, struct credential *c)
> diff --git a/fast-import.c b/fast-import.c
> @@ -1824,7 +1824,7 @@ static void dump_marks(void)
>
> dump_marks_helper(f, 0, marks);
> if (commit_lock_file(&mark_lock)) {
> - failure |= error("Unable to commit marks file %s: %s",
> + failure |= error("Unable to write file %s: %s",
> export_marks_file, strerror(errno));
Since you're already doing some normalization of the error messages
with this patch, do you want to drop capitalization on this one?
> return;
> }
next prev parent reply other threads:[~2015-12-02 4:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-30 11:40 [PATCH] Make error message after failing commit_lock_file() less confusing SZEDER Gábor
2015-12-01 23:17 ` Jeff King
2015-12-02 2:19 ` Junio C Hamano
2015-12-02 4:28 ` Eric Sunshine [this message]
2015-12-03 10:30 ` SZEDER Gábor
2015-12-03 10:31 ` [PATCH v2] " SZEDER Gábor
2015-12-16 11:22 ` [PATCH] credential-store: don't pass strerror to die_errno() SZEDER Gábor
2015-12-16 18:20 ` 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='CAPig+cROdVgf=EL3jKyyPpLiRA_JyHD8P336-YDCWhK8nGSQaQ@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=szeder@ira.uka.de \
/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).