summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-12-11 18:40:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-12-11 18:40:55 (GMT)
commite0048d3e0d95dca049423b17b97e27fef1d0da5a (patch)
treee0bfd398f949ea7f0c1eb8fc91e25eb9eba38fac
parent7d722536dd86b5fbd0c0434bfcea5588132ee6ad (diff)
parent08a3651fe7f3163acbac461e0daf370329a1d332 (diff)
downloadgit-e0048d3e0d95dca049423b17b97e27fef1d0da5a.zip
git-e0048d3e0d95dca049423b17b97e27fef1d0da5a.tar.gz
git-e0048d3e0d95dca049423b17b97e27fef1d0da5a.tar.bz2
Merge branch 'sg/lock-file-commit-error'
Cosmetic improvement to lock-file error messages. * sg/lock-file-commit-error: Make error message after failing commit_lock_file() less confusing
-rw-r--r--config.c6
-rw-r--r--credential-store.c3
-rw-r--r--fast-import.c2
-rw-r--r--refs/files-backend.c2
4 files changed, 8 insertions, 5 deletions
diff --git a/config.c b/config.c
index 248a21a..86a5eb2 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 00aea3a..fc67d16 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 e3b421d..3c65edb 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/files-backend.c b/refs/files-backend.c
index 4db3e36..c648b5e 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3494,7 +3494,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);