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

Add --verbose to git-archive

Browse Source 
And teach backends about it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 9e2c44a2893ae90944a0b7c9f40a9d22b759b5c0 commit)
This commit is contained in:
Junio C Hamano 2006-09-09 22:42:02 -07:00
parent 8142f603b9
commit e0ffb24877
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archive.h
View File

@ -10,6 +10,7 @@ struct archiver_args {
const unsigned char *commit_sha1; const unsigned char *commit_sha1;
time_t time; time_t time;
const char **pathspec; const char **pathspec;
unsigned int verbose : 1;
void *extra; void *extra;
}; };

8
builtin-archive.c
View File

@ -12,7 +12,7 @@
#include "pkt-line.h" #include "pkt-line.h"
static const char archive_usage[] = \ static const char archive_usage[] = \
"git-archive --format=<fmt> [--prefix=<prefix>/] [<extra>] <tree-ish> [path...]"; "git-archive --format=<fmt> [--prefix=<prefix>/] [--verbose] [<extra>] <tree-ish> [path...]";
struct archiver archivers[] = { struct archiver archivers[] = {
{ {
@ -148,6 +148,7 @@ int parse_archive_args(int argc, const char **argv, struct archiver *ar)
int extra_argc = 0; int extra_argc = 0;
const char *format = NULL; /* might want to default to "tar" */ const char *format = NULL; /* might want to default to "tar" */
const char *base = ""; const char *base = "";
int verbose = 0;
int i; int i;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
@ -158,6 +159,10 @@ int parse_archive_args(int argc, const char **argv, struct archiver *ar)
printf("%s\n", archivers[i].name); printf("%s\n", archivers[i].name);
exit(0); exit(0);
} }
if (!strcmp(arg, "--verbose") || !strcmp(arg, "-v")) {
verbose = 1;
continue;
}
if (!strncmp(arg, "--format=", 9)) { if (!strncmp(arg, "--format=", 9)) {
format = arg + 9; format = arg + 9;
continue; continue;
@ -192,6 +197,7 @@ int parse_archive_args(int argc, const char **argv, struct archiver *ar)
die("%s", default_parse_extra(ar, extra_argv)); die("%s", default_parse_extra(ar, extra_argv));
ar->args.extra = ar->parse_extra(extra_argc, extra_argv); ar->args.extra = ar->parse_extra(extra_argc, extra_argv);
} }
ar->args.verbose = verbose;
ar->args.base = base; ar->args.base = base;
return i; return i;

4
builtin-tar-tree.c
View File

@ -22,6 +22,7 @@ static unsigned long offset;
static time_t archive_time; static time_t archive_time;
static int tar_umask; static int tar_umask;
static int verbose;
/* writes out the whole block, but only if it is full */ /* writes out the whole block, but only if it is full */
static void write_if_needed(void) static void write_if_needed(void)
@ -169,6 +170,8 @@ static void write_entry(const unsigned char *sha1, struct strbuf *path,
mode = 0100666; mode = 0100666;
sprintf(header.name, "%s.paxheader", sha1_to_hex(sha1)); sprintf(header.name, "%s.paxheader", sha1_to_hex(sha1));
} else { } else {
if (verbose)
fprintf(stderr, "%.*s\n", path->len, path->buf);
if (S_ISDIR(mode)) { if (S_ISDIR(mode)) {
*header.typeflag = TYPEFLAG_DIR; *header.typeflag = TYPEFLAG_DIR;
mode = (mode | 0777) & ~tar_umask; mode = (mode | 0777) & ~tar_umask;
@ -385,6 +388,7 @@ int write_tar_archive(struct archiver_args *args)
git_config(git_tar_config); git_config(git_tar_config);
archive_time = args->time; archive_time = args->time;
verbose = args->verbose;
if (args->commit_sha1) if (args->commit_sha1)
write_global_extended_header(args->commit_sha1); write_global_extended_header(args->commit_sha1);

4
builtin-zip-tree.c
View File

@ -13,6 +13,7 @@
static const char zip_tree_usage[] = static const char zip_tree_usage[] =
"git-zip-tree [-0|...|-9] <tree-ish> [ <base> ]"; "git-zip-tree [-0|...|-9] <tree-ish> [ <base> ]";
static int verbose;
static int zip_date; static int zip_date;
static int zip_time; static int zip_time;
@ -164,6 +165,8 @@ static int write_zip_entry(const unsigned char *sha1,
crc = crc32(0, Z_NULL, 0); crc = crc32(0, Z_NULL, 0);
path = construct_path(base, baselen, filename, S_ISDIR(mode), &pathlen); path = construct_path(base, baselen, filename, S_ISDIR(mode), &pathlen);
if (verbose)
fprintf(stderr, "%s\n", path);
if (pathlen > 0xffff) { if (pathlen > 0xffff) {
error("path too long (%d chars, SHA1: %s): %s", pathlen, error("path too long (%d chars, SHA1: %s): %s", pathlen,
sha1_to_hex(sha1), path); sha1_to_hex(sha1), path);
@ -361,6 +364,7 @@ int write_zip_archive(struct archiver_args *args)
zip_dir = xmalloc(ZIP_DIRECTORY_MIN_SIZE); zip_dir = xmalloc(ZIP_DIRECTORY_MIN_SIZE);
zip_dir_size = ZIP_DIRECTORY_MIN_SIZE; zip_dir_size = ZIP_DIRECTORY_MIN_SIZE;
verbose = args->verbose;
if (args->base && plen > 0 && args->base[plen - 1] == '/') { if (args->base && plen > 0 && args->base[plen - 1] == '/') {
char *base = xstrdup(args->base); char *base = xstrdup(args->base);