summaryrefslogtreecommitdiff
path: root/refs
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-12-11 10:40:54 -0800
committerJunio C Hamano <gitster@pobox.com>2015-12-11 10:40:55 -0800
commite0048d3e0d95dca049423b17b97e27fef1d0da5a (patch)
treee0bfd398f949ea7f0c1eb8fc91e25eb9eba38fac /refs
parent7d722536dd86b5fbd0c0434bfcea5588132ee6ad (diff)
parent08a3651fe7f3163acbac461e0daf370329a1d332 (diff)
downloadgit-e0048d3e0d95dca049423b17b97e27fef1d0da5a.tar.gz
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
Diffstat (limited to 'refs')
-rw-r--r--refs/files-backend.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 4db3e36f89..c648b5e853 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);