Browse Source

Make pack-objects chattier.

You could give -q to squelch it, but currently no tool does it.
This would make 'git clone host:repo here' over ssh not silent
again.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 19 years ago
parent
commit
024701f1d8
  1. 10
      pack-objects.c

10
pack-objects.c

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
#include "csum-file.h"
#include <sys/time.h>

static const char pack_usage[] = "git-pack-objects [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
static const char pack_usage[] = "git-pack-objects [-q] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";

struct object_entry {
unsigned char sha1[20];
@ -27,7 +27,7 @@ static struct object_entry *objects = NULL; @@ -27,7 +27,7 @@ static struct object_entry *objects = NULL;
static int nr_objects = 0, nr_alloc = 0;
static const char *base_name;
static unsigned char pack_file_sha1[20];
static int progress = 0;
static int progress = 1;

static void *delta_against(void *buf, unsigned long size, struct object_entry *entry)
{
@ -520,6 +520,10 @@ int main(int argc, char **argv) @@ -520,6 +520,10 @@ int main(int argc, char **argv)
usage(pack_usage);
continue;
}
if (!strcmp("-q", arg)) {
progress = 0;
continue;
}
if (!strcmp("--stdout", arg)) {
pack_to_stdout = 1;
continue;
@ -534,8 +538,6 @@ int main(int argc, char **argv) @@ -534,8 +538,6 @@ int main(int argc, char **argv)
if (pack_to_stdout != !base_name)
usage(pack_usage);

progress = isatty(2);

prepare_packed_git();
if (progress) {
fprintf(stderr, "Generating pack...\n");

Loading…
Cancel
Save