Skip to content

Commit

Permalink
git-pack-objects: add "--stdout" flag to write the pack file to stdout
Browse files Browse the repository at this point in the history
This also suppresses creation of the index file.
  • Loading branch information
Linus Torvalds committed Jun 28, 2005
1 parent 4397f01 commit d22b929
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions pack-objects.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "delta.h"
#include "csum-file.h"

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

/*
* The object type is a single-character shorthand:
Expand Down Expand Up @@ -87,10 +87,14 @@ static unsigned long write_object(struct sha1file *f, struct object_entry *entry
static void write_pack_file(void)
{
int i;
struct sha1file *f = sha1create("%s.%s", base_name, "pack");
struct sha1file *f;
unsigned long offset = 0;
unsigned long mb;

if (!base_name)
f = sha1fd(1, "<stdout>");
else
f = sha1create("%s.%s", base_name, "pack");
for (i = 0; i < nr_objects; i++) {
struct object_entry *entry = objects + i;
entry->offset = offset;
Expand Down Expand Up @@ -334,7 +338,7 @@ static void find_deltas(struct object_entry **list, int window, int depth)
int main(int argc, char **argv)
{
char line[PATH_MAX + 20];
int window = 10, depth = 10;
int window = 10, depth = 10, pack_to_stdout = 0;
int i;

for (i = 1; i < argc; i++) {
Expand All @@ -355,14 +359,18 @@ int main(int argc, char **argv)
usage(pack_usage);
continue;
}
if (!strcmp("--stdout", arg)) {
pack_to_stdout = 1;
continue;
}
usage(pack_usage);
}
if (base_name)
usage(pack_usage);
base_name = arg;
}

if (!base_name)
if (pack_to_stdout != !base_name)
usage(pack_usage);

while (fgets(line, sizeof(line), stdin) != NULL) {
Expand All @@ -384,14 +392,15 @@ int main(int argc, char **argv)
}
get_object_details();

printf("Packing %d objects\n", nr_objects);
fprintf(stderr, "Packing %d objects\n", nr_objects);

sorted_by_sha = create_sorted_list(sha1_sort);
sorted_by_type = create_sorted_list(type_size_sort);
if (window && depth)
find_deltas(sorted_by_type, window+1, depth);

write_pack_file();
write_index_file();
if (!pack_to_stdout)
write_index_file();
return 0;
}

0 comments on commit d22b929

Please sign in to comment.