Split up unpack_sha1_file() some more