undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sha1-file: prefer "loose object file" to "sha1 file" in messages

Browse Source 
When we're reporting an error for a loose object, let's use that term.
It's more consistent with other parts of Git, and it is future-proof
against changes to the hash function.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2019-01-07 03:39:24 -05:00 committed by Junio C Hamano
parent 5d3679ee02
commit 760113574f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sha1-file.c
View File

@ -1552,9 +1552,9 @@ int hash_object_file(const void *buf, unsigned long len, const char *type,
static void close_loose_object(int fd)
{
if (fsync_object_files)
fsync_or_die(fd, "sha1 file");
fsync_or_die(fd, "loose object file");
if (close(fd) != 0)
die_errno(_("error when closing sha1 file"));
die_errno(_("error when closing loose object file"));
}
/* Size of directory component, including the ending '/' */
@ -1645,7 +1645,7 @@ static int write_loose_object(const struct object_id *oid, char *hdr,
ret = git_deflate(&stream, Z_FINISH);
the_hash_algo->update_fn(&c, in0, stream.next_in - in0);
if (write_buffer(fd, compressed, stream.next_out - compressed) < 0)
die(_("unable to write sha1 file"));
die(_("unable to write loose object file"));
stream.next_out = compressed;
stream.avail_out = sizeof(compressed);
} while (ret == Z_OK);