sha1-file: avoid "sha1 file" for generic use in messages
These error messages say "sha1 file", which is vague and not common in user-facing documentation. Unlike the conversions from the previous commit, these do not always refer to loose objects. In finalize_object_file() we could be dealing with a packfile. Let's just say "unable to write file" instead; since we include the filename, the nature of the file is clear from the rest of the message. In force_object_loose(), we're calling into read_object(), which could actually be _any_ type of object. Just say "object". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jan 7, 2019 at 03:39 UTC
2c319886c04c5e77da55c66ee9e860b101e5af32
1 file changed
+2
-2
sha1-file.c
+2
-2
@@ -1521,7 +1521,7 @@ int finalize_object_file(const char *tmpfile, const char *filename)
1521
unlink_or_warn(tmpfile);
1522
if (ret) {
1523
if (ret != EEXIST) {
1524
- return error_errno(_("unable to write sha1 filename %s"), filename);
1524
+ return error_errno(_("unable to write file %s"), filename);
1525
}
1526
/* FIXME!!! Collision check here ? */
1527
}
@@ -1744,7 +1744,7 @@ int force_object_loose(const struct object_id *oid, time_t mtime)
1744
return 0;
1745
buf = read_object(oid, &type, &len);
1746
if (!buf)
1747
- return error(_("cannot read sha1_file for %s"), oid_to_hex(oid));
1747
+ return error(_("cannot read object for %s"), oid_to_hex(oid));
1748
hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(type), (uintmax_t)len) + 1;
1749
ret = write_loose_object(oid, hdr, hdrlen, buf, len, mtime);
1750
free(buf);