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
This commit is contained in:
@ -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);
|
||||
|
Reference in New Issue
Block a user