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

Make pack-objects chattier.

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2006-02-12 13:01:54 -08:00
parent 0dbc4e89bb
commit 024701f1d8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pack-objects.c
View File

@ -5,7 +5,7 @@
#include "csum-file.h" #include "csum-file.h"
#include <sys/time.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 { struct object_entry {
unsigned char sha1[20]; unsigned char sha1[20];
@ -27,7 +27,7 @@ static struct object_entry *objects = NULL;
static int nr_objects = 0, nr_alloc = 0; static int nr_objects = 0, nr_alloc = 0;
static const char *base_name; static const char *base_name;
static unsigned char pack_file_sha1[20]; 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) static void *delta_against(void *buf, unsigned long size, struct object_entry *entry)
{ {
@ -520,6 +520,10 @@ int main(int argc, char **argv)
usage(pack_usage); usage(pack_usage);
continue; continue;
} }
if (!strcmp("-q", arg)) {
progress = 0;
continue;
}
if (!strcmp("--stdout", arg)) { if (!strcmp("--stdout", arg)) {
pack_to_stdout = 1; pack_to_stdout = 1;
continue; continue;
@ -534,8 +538,6 @@ int main(int argc, char **argv)
if (pack_to_stdout != !base_name) if (pack_to_stdout != !base_name)
usage(pack_usage); usage(pack_usage);
progress = isatty(2);
prepare_packed_git(); prepare_packed_git();
if (progress) { if (progress) {
fprintf(stderr, "Generating pack...\n"); fprintf(stderr, "Generating pack...\n");