From f4609b896fac842433bd495c166d5987852a6a73 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 21 Nov 2020 19:20:35 +0100 Subject: merge(3p/git): Merge git subtree at v2.29.2 This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb --- third_party/git/archive.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'third_party/git/archive.h') diff --git a/third_party/git/archive.h b/third_party/git/archive.h index e60e3dd31c79..82b226011abb 100644 --- a/third_party/git/archive.h +++ b/third_party/git/archive.h @@ -8,6 +8,8 @@ struct repository; struct archiver_args { struct repository *repo; + const char *refname; + const char *prefix; const char *base; size_t baselen; struct tree *tree; @@ -19,6 +21,7 @@ struct archiver_args { unsigned int worktree_attributes : 1; unsigned int convert : 1; int compression_level; + struct string_list extra_files; }; /* main api */ @@ -48,12 +51,9 @@ void init_archivers(void); typedef int (*write_archive_entry_fn_t)(struct archiver_args *args, const struct object_id *oid, const char *path, size_t pathlen, - unsigned int mode); + unsigned int mode, + void *buffer, unsigned long size); int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry); -void *object_file_to_archive(const struct archiver_args *args, - const char *path, const struct object_id *oid, - unsigned int mode, enum object_type *type, - unsigned long *sizep); #endif /* ARCHIVE_H */ -- cgit 1.4.1