Make error message after failing commit_lock_file() less confusing

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>
Signed-off-by: Jeff King <peff@peff.net>

diff --git a/config.c b/config.c
index 248a21ab94116fabba95e01a8571a458efa99f76..86a5eb2571fb282a1d7bad9e6d097b2374b550dc 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2144,7 +2144,8 @@ int git_config_set_multivar_in_file(const char *config_filename,
        }
 
        if (commit_lock_file(lock) < 0) {
        }
 
        if (commit_lock_file(lock) < 0) {

-               error("could not commit config file %s", config_filename);
+               error("could not write config file %s: %s", config_filename,
+                     strerror(errno));

                ret = CONFIG_NO_WRITE;
                lock = NULL;
                goto out_free;
                ret = CONFIG_NO_WRITE;
                lock = NULL;
                goto out_free;


@@ -2330,7 +2331,8 @@ int git_config_rename_section_in_file(const char *config_filename,
        fclose(config_file);
 unlock_and_out:
        if (commit_lock_file(lock) < 0)
        fclose(config_file);
 unlock_and_out:
        if (commit_lock_file(lock) < 0)

-               ret = error("could not commit config file %s", config_filename);
+               ret = error("could not write config file %s: %s",
+                           config_filename, strerror(errno));

 out:
        free(filename_buf);
        return ret;
 out:
        free(filename_buf);
        return ret;

diff --git a/credential-store.c b/credential-store.c
index 00aea3aa304f2731da070c447f694591b3021bc9..fc67d16c10882bf543bd521d2f6dfee8d3c4d213 100644 (file)
--- a/credential-store.c
+++ b/credential-store.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)
                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));

 }
 
 static void store_credential_file(const char *fn, struct credential *c)
 }
 
 static void store_credential_file(const char *fn, struct credential *c)

diff --git a/fast-import.c b/fast-import.c
index 6c7c3c9b669eb272f4da530aef459c9c39c4d294..b141535e11b0740e8382e23a3c749c252550b493 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1821,7 +1821,7 @@ static void dump_marks(void)
 
        dump_marks_helper(f, 0, marks);
        if (commit_lock_file(&mark_lock)) {
 
        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));
                return;
        }
                        export_marks_file, strerror(errno));
                return;
        }

diff --git a/refs.c b/refs.c
index 4e15f60d98ea8affdef226bce199935fa694b195..9ac9a674a5aa59ea329aae3262615452e40763a6 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -4643,7 +4643,7 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
                                        get_lock_file_path(lock->lk));
                        rollback_lock_file(&reflog_lock);
                } else if (commit_lock_file(&reflog_lock)) {
                                        get_lock_file_path(lock->lk));
                        rollback_lock_file(&reflog_lock);
                } else if (commit_lock_file(&reflog_lock)) {

-                       status |= error("unable to commit reflog '%s' (%s)",
+                       status |= error("unable to write reflog %s: %s",

                                        log_file, strerror(errno));
                } else if (update && commit_ref(lock)) {
                        status |= error("couldn't set %s", lock->ref_name);
                                        log_file, strerror(errno));
                } else if (update && commit_ref(lock)) {
                        status |= error("couldn't set %s", lock->ref_name);