aboutsummaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-12-11 11:14:18 -0800
committerJunio C Hamano <gitster@pobox.com>2015-12-11 11:14:18 -0800
commitabca668a93f0039c8c3fe81a6625fcdf81c35bdf (patch)
tree4c76311689c4e2f16694cf4cf2f7ee29cd4b54a8 /refs.c
parent76058817e80725a2fd1f4935289f663b7aefc024 (diff)
parent08a3651fe7f3163acbac461e0daf370329a1d332 (diff)
downloadgit-abca668a93f0039c8c3fe81a6625fcdf81c35bdf.tar.gz
git-abca668a93f0039c8c3fe81a6625fcdf81c35bdf.tar.xz
Merge branch 'sg/lock-file-commit-error' into maint
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.c')
-rw-r--r--refs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/refs.c b/refs.c
index 4e15f60d9..9ac9a674a 100644
--- 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)) {
- 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);