Merge branch 'kl/pretty-doc-markup-fix'

diff --git a/object.c b/object.c
index 5dc5eec367354ae4817b813b181423e096179a8a..59ea24c4aab6e58ac64ef55598182da460acd6ad 100644 (file)
--- a/object.c
+++ b/object.c
@@ -264,7 +264,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
            (!obj && repo_has_object_file(r, oid) &&
             oid_object_info(r, oid, NULL) == OBJ_BLOB)) {
                if (check_object_signature(repl, NULL, 0, NULL) < 0) {
-                       error(_("sha1 mismatch %s"), oid_to_hex(oid));
+                       error(_("hash mismatch %s"), oid_to_hex(oid));
                        return NULL;
                }
                parse_blob_buffer(lookup_blob(r, oid), NULL, 0);
@@ -275,7 +275,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
        if (buffer) {
                if (check_object_signature(repl, buffer, size, type_name(type)) < 0) {
                        free(buffer);
-                       error(_("sha1 mismatch %s"), oid_to_hex(repl));
+                       error(_("hash mismatch %s"), oid_to_hex(repl));
                        return NULL;
                }