H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-03-15 04:52:19 +00:00
Code Releases Activity

archive: convert sha1_file_to_archive to struct object_id

Browse Source 
Convert this function to take a pointer to struct object_id and rename
it object_file_to_archive.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2018-03-12 02:27:36 +00:00 committed by Junio C Hamano
parent 015ff4f822
commit e5ec981a4b
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archive-tar.c
View File

@ -281,7 +281,7 @@ static int write_tar_entry(struct archiver_args *args,
buffer = NULL; buffer = NULL;
else if (S_ISLNK(mode) || S_ISREG(mode)) { else if (S_ISLNK(mode) || S_ISREG(mode)) {
enum object_type type; enum object_type type;
buffer = sha1_file_to_archive(args, path, oid->hash, old_mode, &type, &size); buffer = object_file_to_archive(args, path, oid, old_mode, &type, &size);
if (!buffer) if (!buffer)
return error("cannot read %s", oid_to_hex(oid)); return error("cannot read %s", oid_to_hex(oid));
} else { } else {

2
archive-zip.c
View File

@ -344,7 +344,7 @@ static int write_zip_entry(struct archiver_args *args,
flags |= ZIP_STREAM; flags |= ZIP_STREAM;
out = buffer = NULL; out = buffer = NULL;
} else { } else {
buffer = sha1_file_to_archive(args, path, oid->hash, mode, buffer = object_file_to_archive(args, path, oid, mode,
&type, &size); &type, &size);
if (!buffer) if (!buffer)
return error("cannot read %s", return error("cannot read %s",

6
archive.c
View File

@ -63,8 +63,8 @@ static void format_subst(const struct commit *commit,
free(to_free); free(to_free);
} }
void *sha1_file_to_archive(const struct archiver_args *args, void *object_file_to_archive(const struct archiver_args *args,
const char *path, const unsigned char *sha1, const char *path, const struct object_id *oid,
unsigned int mode, enum object_type *type, unsigned int mode, enum object_type *type,
unsigned long *sizep) unsigned long *sizep)
{ {
@ -72,7 +72,7 @@ void *sha1_file_to_archive(const struct archiver_args *args,
const struct commit *commit = args->convert ? args->commit : NULL; const struct commit *commit = args->convert ? args->commit : NULL;
path += args->baselen; path += args->baselen;
buffer = read_sha1_file(sha1, type, sizep); buffer = read_sha1_file(oid->hash, type, sizep);
if (buffer && S_ISREG(mode)) { if (buffer && S_ISREG(mode)) {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
size_t size = 0; size_t size = 0;

4
archive.h
View File

@ -39,8 +39,8 @@ extern int write_archive_entries(struct archiver_args *args, write_archive_entry
extern int write_archive(int argc, const char **argv, const char *prefix, const char *name_hint, int remote); extern int write_archive(int argc, const char **argv, const char *prefix, const char *name_hint, int remote);
const char *archive_format_from_filename(const char *filename); const char *archive_format_from_filename(const char *filename);
extern void *sha1_file_to_archive(const struct archiver_args *args, extern void *object_file_to_archive(const struct archiver_args *args,
const char *path, const unsigned char *sha1, const char *path, const struct object_id *oid,
unsigned int mode, enum object_type *type, unsigned int mode, enum object_type *type,
unsigned long *sizep); unsigned long *sizep);