mirror of
https://github.com/git/git.git
synced 2024-05-14 16:16:13 +02:00
00436bf1b1
Initialize archivers as soon as possible when running git-archive.
Various non-obvious behavior depends on having the archivers
initialized, such as determining the desired archival format from the
provided filename.
Since 08716b3c11 ("archive: refactor file extension format-guessing",
2011-06-21), archive_format_from_filename() has used the registered
archivers to match filenames (provided via --output) to archival
formats. However, when git-archive is executed with --remote, format
detection happens before the archivers have been registered. This causes
archives from remotes to always be generated as TAR files, regardless of
the actual filename (unless an explicit --format is provided).
This patch fixes that behavior; archival format is determined properly
from the output filename, even when --remote is used.
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
60 lines
1.5 KiB
C
60 lines
1.5 KiB
C
#ifndef ARCHIVE_H
|
|
#define ARCHIVE_H
|
|
|
|
#include "cache.h"
|
|
#include "pathspec.h"
|
|
|
|
struct repository;
|
|
|
|
struct archiver_args {
|
|
struct repository *repo;
|
|
const char *base;
|
|
size_t baselen;
|
|
struct tree *tree;
|
|
const unsigned char *commit_sha1;
|
|
const struct commit *commit;
|
|
timestamp_t time;
|
|
struct pathspec pathspec;
|
|
unsigned int verbose : 1;
|
|
unsigned int worktree_attributes : 1;
|
|
unsigned int convert : 1;
|
|
int compression_level;
|
|
};
|
|
|
|
/* main api */
|
|
|
|
extern int write_archive(int argc, const char **argv, const char *prefix,
|
|
struct repository *repo,
|
|
const char *name_hint, int remote);
|
|
|
|
const char *archive_format_from_filename(const char *filename);
|
|
|
|
/* archive backend stuff */
|
|
|
|
#define ARCHIVER_WANT_COMPRESSION_LEVELS 1
|
|
#define ARCHIVER_REMOTE 2
|
|
struct archiver {
|
|
const char *name;
|
|
int (*write_archive)(const struct archiver *, struct archiver_args *);
|
|
unsigned flags;
|
|
void *data;
|
|
};
|
|
extern void register_archiver(struct archiver *);
|
|
|
|
extern void init_tar_archiver(void);
|
|
extern void init_zip_archiver(void);
|
|
extern 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);
|
|
|
|
extern int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);
|
|
extern 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 */
|