SZEDER GáborThe 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> ---
The error message is of course bikeshedable. Some callers of commit_lock_file() say something like "could not move updated whatever file <path> into place: <strerror>" on error. While it's truer to the meaning of the original error message and conveys more exactly what went wrong (i.e. the actual writing had already finished at that point, it's the move that failed), I think those details are not necessary and the short and simple "could not write" is better.
config.c | 6 ++++-- credential-store.c | 3 ++- fast-import.c | 2 +- refs.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-)
Show changes to 4 files +8 −5
config.c, credential-store.c, fast-import.c, refs.c
diff --git a/config.c b/config.c index 248a21ab94..86a5eb2571 100644 --- 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) { - 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; @@ -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) - 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; diff --git a/credential-store.c b/credential-store.c index 00aea3aa30..fc67d16c10 100644 --- 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) - 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) diff --git a/fast-import.c b/fast-import.c index e3b421d514..3c65edb5c4 100644 --- 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)); return; } diff --git a/refs.c b/refs.c index 132eff52ca..b1c7b229b7 100644 --- a/refs.c +++ b/refs.c @@ -4684,7 +4684,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)) { - 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);
-- 2.6.3.420.g7bbb372
