2005-10-12 19:01:31 +00:00
|
|
|
#include "cache.h"
|
|
|
|
#include "delta.h"
|
|
|
|
#include "pack.h"
|
|
|
|
#include "csum-file.h"
|
2006-04-02 12:44:09 +00:00
|
|
|
#include "blob.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "tag.h"
|
|
|
|
#include "tree.h"
|
2007-04-18 18:27:45 +00:00
|
|
|
#include "progress.h"
|
2008-02-25 21:46:12 +00:00
|
|
|
#include "fsck.h"
|
2009-01-18 12:00:12 +00:00
|
|
|
#include "exec_cmd.h"
|
2005-10-12 19:01:31 +00:00
|
|
|
|
|
|
|
static const char index_pack_usage[] =
|
2010-10-08 17:31:17 +00:00
|
|
|
"git index-pack [-v] [-o <index-file>] [ --keep | --keep=<msg> ] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
|
2005-10-12 19:01:31 +00:00
|
|
|
|
|
|
|
struct object_entry
|
|
|
|
{
|
2007-06-01 19:18:05 +00:00
|
|
|
struct pack_idx_entry idx;
|
2006-10-20 18:45:21 +00:00
|
|
|
unsigned long size;
|
|
|
|
unsigned int hdr_size;
|
2005-10-12 19:01:31 +00:00
|
|
|
enum object_type type;
|
|
|
|
enum object_type real_type;
|
|
|
|
};
|
|
|
|
|
2006-09-21 04:08:33 +00:00
|
|
|
union delta_base {
|
|
|
|
unsigned char sha1[20];
|
2007-04-09 05:06:30 +00:00
|
|
|
off_t offset;
|
2006-09-21 04:08:33 +00:00
|
|
|
};
|
|
|
|
|
2008-07-14 02:07:44 +00:00
|
|
|
struct base_data {
|
2008-07-14 02:07:45 +00:00
|
|
|
struct base_data *base;
|
|
|
|
struct base_data *child;
|
2008-07-14 02:07:46 +00:00
|
|
|
struct object_entry *obj;
|
2008-07-14 02:07:44 +00:00
|
|
|
void *data;
|
|
|
|
unsigned long size;
|
|
|
|
};
|
|
|
|
|
2006-10-17 20:23:26 +00:00
|
|
|
/*
|
|
|
|
* Even if sizeof(union delta_base) == 24 on 64-bit archs, we really want
|
|
|
|
* to memcmp() only the first 20 bytes.
|
|
|
|
*/
|
|
|
|
#define UNION_BASE_SZ 20
|
|
|
|
|
2008-02-25 21:46:12 +00:00
|
|
|
#define FLAG_LINK (1u<<20)
|
|
|
|
#define FLAG_CHECKED (1u<<21)
|
|
|
|
|
2005-10-12 19:01:31 +00:00
|
|
|
struct delta_entry
|
|
|
|
{
|
2006-09-21 04:08:33 +00:00
|
|
|
union delta_base base;
|
2006-10-26 03:28:17 +00:00
|
|
|
int obj_no;
|
2005-10-12 19:01:31 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct object_entry *objects;
|
|
|
|
static struct delta_entry *deltas;
|
2008-07-14 02:07:45 +00:00
|
|
|
static struct base_data *base_cache;
|
2008-07-15 04:45:34 +00:00
|
|
|
static size_t base_cache_used;
|
2005-10-12 19:01:31 +00:00
|
|
|
static int nr_objects;
|
|
|
|
static int nr_deltas;
|
2006-10-26 03:28:17 +00:00
|
|
|
static int nr_resolved_deltas;
|
2005-10-12 19:01:31 +00:00
|
|
|
|
2006-10-23 18:50:18 +00:00
|
|
|
static int from_stdin;
|
2008-02-25 21:46:12 +00:00
|
|
|
static int strict;
|
2006-10-26 03:32:59 +00:00
|
|
|
static int verbose;
|
|
|
|
|
2007-10-30 18:57:32 +00:00
|
|
|
static struct progress *progress;
|
2006-10-23 18:50:18 +00:00
|
|
|
|
2006-10-20 18:45:21 +00:00
|
|
|
/* We always read in 4kB chunks. */
|
|
|
|
static unsigned char input_buffer[4096];
|
2007-04-09 05:06:30 +00:00
|
|
|
static unsigned int input_offset, input_len;
|
|
|
|
static off_t consumed_bytes;
|
2008-10-01 18:05:20 +00:00
|
|
|
static git_SHA_CTX input_ctx;
|
2007-04-09 05:06:32 +00:00
|
|
|
static uint32_t input_crc32;
|
2006-12-19 15:53:08 +00:00
|
|
|
static int input_fd, output_fd, pack_fd;
|
2006-10-20 18:45:21 +00:00
|
|
|
|
2008-02-25 21:46:12 +00:00
|
|
|
static int mark_link(struct object *obj, int type, void *data)
|
|
|
|
{
|
|
|
|
if (!obj)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (type != OBJ_ANY && obj->type != type)
|
|
|
|
die("object type mismatch at %s", sha1_to_hex(obj->sha1));
|
|
|
|
|
|
|
|
obj->flags |= FLAG_LINK;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The content of each linked object must have been checked
|
|
|
|
or it must be already present in the object database */
|
|
|
|
static void check_object(struct object *obj)
|
|
|
|
{
|
|
|
|
if (!obj)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!(obj->flags & FLAG_LINK))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!(obj->flags & FLAG_CHECKED)) {
|
|
|
|
unsigned long size;
|
|
|
|
int type = sha1_object_info(obj->sha1, &size);
|
|
|
|
if (type != obj->type || type <= 0)
|
|
|
|
die("object of unexpected type");
|
|
|
|
obj->flags |= FLAG_CHECKED;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void check_objects(void)
|
|
|
|
{
|
|
|
|
unsigned i, max;
|
|
|
|
|
|
|
|
max = get_max_object_index();
|
|
|
|
for (i = 0; i < max; i++)
|
|
|
|
check_object(get_indexed_object(i));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-26 03:28:17 +00:00
|
|
|
/* Discard current buffer used content. */
|
2006-11-18 12:07:06 +00:00
|
|
|
static void flush(void)
|
2006-10-26 03:28:17 +00:00
|
|
|
{
|
|
|
|
if (input_offset) {
|
|
|
|
if (output_fd >= 0)
|
|
|
|
write_or_die(output_fd, input_buffer, input_offset);
|
2008-10-01 18:05:20 +00:00
|
|
|
git_SHA1_Update(&input_ctx, input_buffer, input_offset);
|
2006-12-11 18:06:34 +00:00
|
|
|
memmove(input_buffer, input_buffer + input_offset, input_len);
|
2006-10-26 03:28:17 +00:00
|
|
|
input_offset = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-20 18:45:21 +00:00
|
|
|
/*
|
|
|
|
* Make sure at least "min" bytes are available in the buffer, and
|
|
|
|
* return the pointer to the buffer.
|
|
|
|
*/
|
2006-10-27 20:14:23 +00:00
|
|
|
static void *fill(int min)
|
2005-10-12 19:01:31 +00:00
|
|
|
{
|
2006-10-20 18:45:21 +00:00
|
|
|
if (min <= input_len)
|
|
|
|
return input_buffer + input_offset;
|
|
|
|
if (min > sizeof(input_buffer))
|
|
|
|
die("cannot fill %d bytes", min);
|
2006-10-26 03:28:17 +00:00
|
|
|
flush();
|
2006-10-20 18:45:21 +00:00
|
|
|
do {
|
2007-05-15 12:49:22 +00:00
|
|
|
ssize_t ret = xread(input_fd, input_buffer + input_len,
|
2006-10-20 18:45:21 +00:00
|
|
|
sizeof(input_buffer) - input_len);
|
|
|
|
if (ret <= 0) {
|
|
|
|
if (!ret)
|
|
|
|
die("early EOF");
|
2009-06-27 15:58:46 +00:00
|
|
|
die_errno("read error on input");
|
2006-10-20 18:45:21 +00:00
|
|
|
}
|
|
|
|
input_len += ret;
|
2007-11-05 03:15:41 +00:00
|
|
|
if (from_stdin)
|
|
|
|
display_throughput(progress, consumed_bytes + input_len);
|
2006-10-20 18:45:21 +00:00
|
|
|
} while (input_len < min);
|
|
|
|
return input_buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void use(int bytes)
|
|
|
|
{
|
|
|
|
if (bytes > input_len)
|
|
|
|
die("used more bytes than were available");
|
2007-04-09 05:06:32 +00:00
|
|
|
input_crc32 = crc32(input_crc32, input_buffer + input_offset, bytes);
|
2006-10-20 18:45:21 +00:00
|
|
|
input_len -= bytes;
|
|
|
|
input_offset += bytes;
|
2007-04-09 05:06:30 +00:00
|
|
|
|
|
|
|
/* make sure off_t is sufficiently large not to wrap */
|
2010-10-05 07:24:10 +00:00
|
|
|
if (signed_add_overflows(consumed_bytes, bytes))
|
2007-04-09 05:06:30 +00:00
|
|
|
die("pack too large for current definition of off_t");
|
2006-10-20 18:45:21 +00:00
|
|
|
consumed_bytes += bytes;
|
|
|
|
}
|
2005-10-12 19:01:31 +00:00
|
|
|
|
2010-01-22 15:55:19 +00:00
|
|
|
static const char *open_pack_file(const char *pack_name)
|
2006-10-20 18:45:21 +00:00
|
|
|
{
|
2006-10-23 18:50:18 +00:00
|
|
|
if (from_stdin) {
|
|
|
|
input_fd = 0;
|
|
|
|
if (!pack_name) {
|
|
|
|
static char tmpfile[PATH_MAX];
|
2009-02-25 07:11:29 +00:00
|
|
|
output_fd = odb_mkstemp(tmpfile, sizeof(tmpfile),
|
|
|
|
"pack/tmp_pack_XXXXXX");
|
2006-10-23 18:50:18 +00:00
|
|
|
pack_name = xstrdup(tmpfile);
|
|
|
|
} else
|
|
|
|
output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
|
|
|
|
if (output_fd < 0)
|
2009-06-27 15:58:46 +00:00
|
|
|
die_errno("unable to create '%s'", pack_name);
|
2006-12-19 15:53:08 +00:00
|
|
|
pack_fd = output_fd;
|
2006-10-23 18:50:18 +00:00
|
|
|
} else {
|
|
|
|
input_fd = open(pack_name, O_RDONLY);
|
|
|
|
if (input_fd < 0)
|
2009-06-27 15:58:46 +00:00
|
|
|
die_errno("cannot open packfile '%s'", pack_name);
|
2006-10-23 18:50:18 +00:00
|
|
|
output_fd = -1;
|
2006-12-19 15:53:08 +00:00
|
|
|
pack_fd = input_fd;
|
2006-10-23 18:50:18 +00:00
|
|
|
}
|
2008-10-01 18:05:20 +00:00
|
|
|
git_SHA1_Init(&input_ctx);
|
2006-10-23 18:50:18 +00:00
|
|
|
return pack_name;
|
2005-10-12 19:01:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void parse_pack_header(void)
|
|
|
|
{
|
2006-10-20 18:45:21 +00:00
|
|
|
struct pack_header *hdr = fill(sizeof(struct pack_header));
|
2005-10-12 19:01:31 +00:00
|
|
|
|
|
|
|
/* Header consistency check */
|
|
|
|
if (hdr->hdr_signature != htonl(PACK_SIGNATURE))
|
2006-10-23 18:50:18 +00:00
|
|
|
die("pack signature mismatch");
|
2006-02-09 22:50:04 +00:00
|
|
|
if (!pack_version_ok(hdr->hdr_version))
|
2008-07-03 15:52:09 +00:00
|
|
|
die("pack version %"PRIu32" unsupported",
|
|
|
|
ntohl(hdr->hdr_version));
|
2005-10-12 19:01:31 +00:00
|
|
|
|
|
|
|
nr_objects = ntohl(hdr->hdr_entries);
|
2006-10-20 18:45:21 +00:00
|
|
|
use(sizeof(struct pack_header));
|
2005-10-12 19:01:31 +00:00
|
|
|
}
|
|
|
|
|
2009-09-30 18:05:49 +00:00
|
|
|
static NORETURN void bad_object(unsigned long offset, const char *format,
|
|
|
|
...) __attribute__((format (printf, 2, 3)));
|
2005-10-12 19:01:31 +00:00
|
|
|
|
|
|
|
static void bad_object(unsigned long offset, const char *format, ...)
|
|
|
|
{
|
|
|
|
va_list params;
|
|
|
|
char buf[1024];
|
|
|
|
|
|
|
|
va_start(params, format);
|
|
|
|
vsnprintf(buf, sizeof(buf), format, params);
|
|
|
|
va_end(params);
|
2006-10-23 18:50:18 +00:00
|
|
|
die("pack has bad object at offset %lu: %s", offset, buf);
|
2005-10-12 19:01:31 +00:00
|
|
|
}
|
|
|
|
|
2008-10-17 19:57:58 +00:00
|
|
|
static void free_base_data(struct base_data *c)
|
|
|
|
{
|
|
|
|
if (c->data) {
|
|
|
|
free(c->data);
|
|
|
|
c->data = NULL;
|
|
|
|
base_cache_used -= c->size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-15 04:45:34 +00:00
|
|
|
static void prune_base_data(struct base_data *retain)
|
|
|
|
{
|
2009-03-15 21:01:20 +00:00
|
|
|
struct base_data *b;
|
2008-07-15 04:45:34 +00:00
|
|
|
for (b = base_cache;
|
|
|
|
base_cache_used > delta_base_cache_limit && b;
|
|
|
|
b = b->child) {
|
2008-10-17 19:57:58 +00:00
|
|
|
if (b->data && b != retain)
|
|
|
|
free_base_data(b);
|
2008-07-15 04:45:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-14 02:07:45 +00:00
|
|
|
static void link_base_data(struct base_data *base, struct base_data *c)
|
|
|
|
{
|
|
|
|
if (base)
|
|
|
|
base->child = c;
|
|
|
|
else
|
|
|
|
base_cache = c;
|
|
|
|
|
|
|
|
c->base = base;
|
|
|
|
c->child = NULL;
|
2008-10-17 19:57:57 +00:00
|
|
|
if (c->data)
|
|
|
|
base_cache_used += c->size;
|
2008-07-15 04:45:34 +00:00
|
|
|
prune_base_data(c);
|
2008-07-14 02:07:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void unlink_base_data(struct base_data *c)
|
|
|
|
{
|
|
|
|
struct base_data *base = c->base;
|
|
|
|
if (base)
|
|
|
|
base->child = NULL;
|
|
|
|
else
|
|
|
|
base_cache = NULL;
|
2008-10-17 19:57:58 +00:00
|
|
|
free_base_data(c);
|
2008-07-14 02:07:45 +00:00
|
|
|
}
|
|
|
|
|
2006-10-20 18:45:21 +00:00
|
|
|
static void *unpack_entry_data(unsigned long offset, unsigned long size)
|
2005-10-12 19:01:31 +00:00
|
|
|
{
|
2010-04-12 16:12:06 +00:00
|
|
|
int status;
|
2005-10-12 19:01:31 +00:00
|
|
|
z_stream stream;
|
|
|
|
void *buf = xmalloc(size);
|
|
|
|
|
|
|
|
memset(&stream, 0, sizeof(stream));
|
2010-04-12 16:12:06 +00:00
|
|
|
git_inflate_init(&stream);
|
2005-10-12 19:01:31 +00:00
|
|
|
stream.next_out = buf;
|
|
|
|
stream.avail_out = size;
|
|
|
|
|
2010-04-12 16:12:06 +00:00
|
|
|
do {
|
2006-10-20 18:45:21 +00:00
|
|
|
stream.next_in = fill(1);
|
|
|
|
stream.avail_in = input_len;
|
2010-04-12 16:12:06 +00:00
|
|
|
status = git_inflate(&stream, 0);
|
|
|
|
use(input_len - stream.avail_in);
|
|
|
|
} while (status == Z_OK);
|
|
|
|
if (stream.total_out != size || status != Z_STREAM_END)
|
|
|
|
bad_object(offset, "inflate returned %d", status);
|
2009-01-08 03:54:47 +00:00
|
|
|
git_inflate_end(&stream);
|
2005-10-12 19:01:31 +00:00
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
2006-10-20 18:45:21 +00:00
|
|
|
static void *unpack_raw_entry(struct object_entry *obj, union delta_base *delta_base)
|
2005-10-12 19:01:31 +00:00
|
|
|
{
|
Fix big left-shifts of unsigned char
Shifting 'unsigned char' or 'unsigned short' left can result in sign
extension errors, since the C integer promotion rules means that the
unsigned char/short will get implicitly promoted to a signed 'int' due to
the shift (or due to other operations).
This normally doesn't matter, but if you shift things up sufficiently, it
will now set the sign bit in 'int', and a subsequent cast to a bigger type
(eg 'long' or 'unsigned long') will now sign-extend the value despite the
original expression being unsigned.
One example of this would be something like
unsigned long size;
unsigned char c;
size += c << 24;
where despite all the variables being unsigned, 'c << 24' ends up being a
signed entity, and will get sign-extended when then doing the addition in
an 'unsigned long' type.
Since git uses 'unsigned char' pointers extensively, we actually have this
bug in a couple of places.
I may have missed some, but this is the result of looking at
git grep '[^0-9 ][ ]*<<[ ][a-z]' -- '*.c' '*.h'
git grep '<<[ ]*24'
which catches at least the common byte cases (shifting variables by a
variable amount, and shifting by 24 bits).
I also grepped for just 'unsigned char' variables in general, and
converted the ones that most obviously ended up getting implicitly cast
immediately anyway (eg hash_name(), encode_85()).
In addition to just avoiding 'unsigned char', this patch also tries to use
a common idiom for the delta header size thing. We had three different
variations on it: "& 0x7fUL" in one place (getting the sign extension
right), and "& ~0x80" and "& 0x7f" in two other places (not getting it
right). Apart from making them all just avoid using "unsigned char" at
all, I also unified them to then use a simple "& 0x7f".
I considered making a sparse extension which warns about doing implicit
casts from unsigned types to signed types, but it gets rather complex very
quickly, so this is just a hack.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-18 00:22:27 +00:00
|
|
|
unsigned char *p;
|
|
|
|
unsigned long size, c;
|
2007-04-09 05:06:30 +00:00
|
|
|
off_t base_offset;
|
2005-10-12 19:01:31 +00:00
|
|
|
unsigned shift;
|
2007-04-09 05:06:32 +00:00
|
|
|
void *data;
|
2005-10-12 19:01:31 +00:00
|
|
|
|
2007-06-01 19:18:05 +00:00
|
|
|
obj->idx.offset = consumed_bytes;
|
2007-04-09 05:06:32 +00:00
|
|
|
input_crc32 = crc32(0, Z_NULL, 0);
|
2006-10-20 18:45:21 +00:00
|
|
|
|
|
|
|
p = fill(1);
|
|
|
|
c = *p;
|
|
|
|
use(1);
|
|
|
|
obj->type = (c >> 4) & 7;
|
2005-10-12 19:01:31 +00:00
|
|
|
size = (c & 15);
|
|
|
|
shift = 4;
|
|
|
|
while (c & 0x80) {
|
2006-10-20 18:45:21 +00:00
|
|
|
p = fill(1);
|
|
|
|
c = *p;
|
|
|
|
use(1);
|
Fix big left-shifts of unsigned char
Shifting 'unsigned char' or 'unsigned short' left can result in sign
extension errors, since the C integer promotion rules means that the
unsigned char/short will get implicitly promoted to a signed 'int' due to
the shift (or due to other operations).
This normally doesn't matter, but if you shift things up sufficiently, it
will now set the sign bit in 'int', and a subsequent cast to a bigger type
(eg 'long' or 'unsigned long') will now sign-extend the value despite the
original expression being unsigned.
One example of this would be something like
unsigned long size;
unsigned char c;
size += c << 24;
where despite all the variables being unsigned, 'c << 24' ends up being a
signed entity, and will get sign-extended when then doing the addition in
an 'unsigned long' type.
Since git uses 'unsigned char' pointers extensively, we actually have this
bug in a couple of places.
I may have missed some, but this is the result of looking at
git grep '[^0-9 ][ ]*<<[ ][a-z]' -- '*.c' '*.h'
git grep '<<[ ]*24'
which catches at least the common byte cases (shifting variables by a
variable amount, and shifting by 24 bits).
I also grepped for just 'unsigned char' variables in general, and
converted the ones that most obviously ended up getting implicitly cast
immediately anyway (eg hash_name(), encode_85()).
In addition to just avoiding 'unsigned char', this patch also tries to use
a common idiom for the delta header size thing. We had three different
variations on it: "& 0x7fUL" in one place (getting the sign extension
right), and "& ~0x80" and "& 0x7f" in two other places (not getting it
right). Apart from making them all just avoid using "unsigned char" at
all, I also unified them to then use a simple "& 0x7f".
I considered making a sparse extension which warns about doing implicit
casts from unsigned types to signed types, but it gets rather complex very
quickly, so this is just a hack.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-18 00:22:27 +00:00
|
|
|
size += (c & 0x7f) << shift;
|
2005-10-12 19:01:31 +00:00
|
|
|
shift += 7;
|
|
|
|
}
|
2006-10-20 18:45:21 +00:00
|
|
|
obj->size = size;
|
2005-10-12 19:01:31 +00:00
|
|
|
|
2006-10-20 18:45:21 +00:00
|
|
|
switch (obj->type) {
|
2006-09-21 04:06:49 +00:00
|
|
|
case OBJ_REF_DELTA:
|
2006-10-20 18:45:21 +00:00
|
|
|
hashcpy(delta_base->sha1, fill(20));
|
|
|
|
use(20);
|
2006-09-21 04:08:33 +00:00
|
|
|
break;
|
|
|
|
case OBJ_OFS_DELTA:
|
|
|
|
memset(delta_base, 0, sizeof(*delta_base));
|
2006-10-20 18:45:21 +00:00
|
|
|
p = fill(1);
|
|
|
|
c = *p;
|
|
|
|
use(1);
|
2006-09-21 04:08:33 +00:00
|
|
|
base_offset = c & 127;
|
|
|
|
while (c & 128) {
|
|
|
|
base_offset += 1;
|
2007-04-09 05:06:29 +00:00
|
|
|
if (!base_offset || MSB(base_offset, 7))
|
2007-06-01 19:18:05 +00:00
|
|
|
bad_object(obj->idx.offset, "offset value overflow for delta base object");
|
2006-10-20 18:45:21 +00:00
|
|
|
p = fill(1);
|
|
|
|
c = *p;
|
|
|
|
use(1);
|
2006-09-21 04:08:33 +00:00
|
|
|
base_offset = (base_offset << 7) + (c & 127);
|
|
|
|
}
|
2007-06-01 19:18:05 +00:00
|
|
|
delta_base->offset = obj->idx.offset - base_offset;
|
2008-10-29 23:02:45 +00:00
|
|
|
if (delta_base->offset <= 0 || delta_base->offset >= obj->idx.offset)
|
2007-06-01 19:18:05 +00:00
|
|
|
bad_object(obj->idx.offset, "delta base offset is out of bound");
|
2006-09-21 04:08:33 +00:00
|
|
|
break;
|
2005-10-12 19:01:31 +00:00
|
|
|
case OBJ_COMMIT:
|
|
|
|
case OBJ_TREE:
|
|
|
|
case OBJ_BLOB:
|
|
|
|
case OBJ_TAG:
|
|
|
|
break;
|
|
|
|
default:
|
2007-06-01 19:18:05 +00:00
|
|
|
bad_object(obj->idx.offset, "unknown object type %d", obj->type);
|
2005-10-12 19:01:31 +00:00
|
|
|
}
|
2007-06-01 19:18:05 +00:00
|
|
|
obj->hdr_size = consumed_bytes - obj->idx.offset;
|
2006-10-20 18:45:21 +00:00
|
|
|
|
2007-06-01 19:18:05 +00:00
|
|
|
data = unpack_entry_data(obj->idx.offset, obj->size);
|
|
|
|
obj->idx.crc32 = input_crc32;
|
2007-04-09 05:06:32 +00:00
|
|
|
return data;
|
2006-10-20 18:45:21 +00:00
|
|
|
}
|
|
|
|
|
2006-10-27 20:14:23 +00:00
|
|
|
static void *get_data_from_pack(struct object_entry *obj)
|
2006-10-20 18:45:21 +00:00
|
|
|
{
|
2007-11-11 04:29:10 +00:00
|
|
|
off_t from = obj[0].idx.offset + obj[0].hdr_size;
|
2007-06-01 19:18:05 +00:00
|
|
|
unsigned long len = obj[1].idx.offset - from;
|
2010-04-12 16:11:07 +00:00
|
|
|
unsigned char *data, *inbuf;
|
2006-10-20 18:45:21 +00:00
|
|
|
z_stream stream;
|
2010-04-12 16:11:07 +00:00
|
|
|
int status;
|
2005-10-12 19:01:31 +00:00
|
|
|
|
2006-10-20 18:45:21 +00:00
|
|
|
data = xmalloc(obj->size);
|
2010-04-12 16:11:07 +00:00
|
|
|
inbuf = xmalloc((len < 64*1024) ? len : 64*1024);
|
|
|
|
|
2006-10-20 18:45:21 +00:00
|
|
|
memset(&stream, 0, sizeof(stream));
|
2010-04-12 16:11:07 +00:00
|
|
|
git_inflate_init(&stream);
|
2006-10-20 18:45:21 +00:00
|
|
|
stream.next_out = data;
|
|
|
|
stream.avail_out = obj->size;
|
2010-04-12 16:11:07 +00:00
|
|
|
|
|
|
|
do {
|
|
|
|
ssize_t n = (len < 64*1024) ? len : 64*1024;
|
|
|
|
n = pread(pack_fd, inbuf, n, from);
|
|
|
|
if (n < 0)
|
|
|
|
die_errno("cannot pread pack file");
|
|
|
|
if (!n)
|
|
|
|
die("premature end of pack file, %lu bytes missing", len);
|
|
|
|
from += n;
|
|
|
|
len -= n;
|
|
|
|
stream.next_in = inbuf;
|
|
|
|
stream.avail_in = n;
|
|
|
|
status = git_inflate(&stream, 0);
|
|
|
|
} while (len && status == Z_OK && !stream.avail_in);
|
|
|
|
|
|
|
|
/* This has been inflated OK when first encountered, so... */
|
|
|
|
if (status != Z_STREAM_END || stream.total_out != obj->size)
|
2006-10-20 18:45:21 +00:00
|
|
|
die("serious inflate inconsistency");
|
2010-04-12 16:11:07 +00:00
|
|
|
|
|
|
|
git_inflate_end(&stream);
|
|
|
|
free(inbuf);
|
2005-10-12 19:01:31 +00:00
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
2011-02-02 18:06:51 +00:00
|
|
|
static int compare_delta_bases(const union delta_base *base1,
|
|
|
|
const union delta_base *base2,
|
|
|
|
enum object_type type1,
|
|
|
|
enum object_type type2)
|
|
|
|
{
|
|
|
|
int cmp = type1 - type2;
|
|
|
|
if (cmp)
|
|
|
|
return cmp;
|
|
|
|
return memcmp(base1, base2, UNION_BASE_SZ);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int find_delta(const union delta_base *base, enum object_type type)
|
2005-10-12 19:01:31 +00:00
|
|
|
{
|
|
|
|
int first = 0, last = nr_deltas;
|
|
|
|
|
|
|
|
while (first < last) {
|
|
|
|
int next = (first + last) / 2;
|
|
|
|
struct delta_entry *delta = &deltas[next];
|
|
|
|
int cmp;
|
|
|
|
|
2011-02-02 18:06:51 +00:00
|
|
|
cmp = compare_delta_bases(base, &delta->base,
|
|
|
|
type, objects[delta->obj_no].type);
|
2005-10-12 19:01:31 +00:00
|
|
|
if (!cmp)
|
|
|
|
return next;
|
|
|
|
if (cmp < 0) {
|
|
|
|
last = next;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
first = next+1;
|
|
|
|
}
|
|
|
|
return -first-1;
|
|
|
|
}
|
|
|
|
|
2008-10-17 19:57:58 +00:00
|
|
|
static void find_delta_children(const union delta_base *base,
|
2011-02-02 18:06:51 +00:00
|
|
|
int *first_index, int *last_index,
|
|
|
|
enum object_type type)
|
2005-10-12 19:01:31 +00:00
|
|
|
{
|
2011-02-02 18:06:51 +00:00
|
|
|
int first = find_delta(base, type);
|
2005-10-12 19:01:31 +00:00
|
|
|
int last = first;
|
|
|
|
int end = nr_deltas - 1;
|
|
|
|
|
2008-10-17 19:57:58 +00:00
|
|
|
if (first < 0) {
|
|
|
|
*first_index = 0;
|
|
|
|
*last_index = -1;
|
|
|
|
return;
|
|
|
|
}
|
2006-10-17 20:23:26 +00:00
|
|
|
while (first > 0 && !memcmp(&deltas[first - 1].base, base, UNION_BASE_SZ))
|
2005-10-12 19:01:31 +00:00
|
|
|
--first;
|
2006-10-17 20:23:26 +00:00
|
|
|
while (last < end && !memcmp(&deltas[last + 1].base, base, UNION_BASE_SZ))
|
2005-10-12 19:01:31 +00:00
|
|
|
++last;
|
|
|
|
*first_index = first;
|
|
|
|
*last_index = last;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sha1_object(const void *data, unsigned long size,
|
2007-03-20 21:07:48 +00:00
|
|
|
enum object_type type, unsigned char *sha1)
|
2005-10-12 19:01:31 +00:00
|
|
|
{
|
2007-03-20 20:02:09 +00:00
|
|
|
hash_sha1_file(data, size, typename(type), sha1);
|
2007-03-20 21:07:48 +00:00
|
|
|
if (has_sha1_file(sha1)) {
|
2007-03-20 19:32:35 +00:00
|
|
|
void *has_data;
|
|
|
|
enum object_type has_type;
|
|
|
|
unsigned long has_size;
|
|
|
|
has_data = read_sha1_file(sha1, &has_type, &has_size);
|
|
|
|
if (!has_data)
|
|
|
|
die("cannot read existing object %s", sha1_to_hex(sha1));
|
|
|
|
if (size != has_size || type != has_type ||
|
|
|
|
memcmp(data, has_data, size) != 0)
|
|
|
|
die("SHA1 COLLISION FOUND WITH %s !", sha1_to_hex(sha1));
|
2007-04-03 16:33:46 +00:00
|
|
|
free(has_data);
|
2007-03-20 19:32:35 +00:00
|
|
|
}
|
2008-02-25 21:46:12 +00:00
|
|
|
if (strict) {
|
|
|
|
if (type == OBJ_BLOB) {
|
|
|
|
struct blob *blob = lookup_blob(sha1);
|
|
|
|
if (blob)
|
|
|
|
blob->object.flags |= FLAG_CHECKED;
|
|
|
|
else
|
|
|
|
die("invalid blob object %s", sha1_to_hex(sha1));
|
|
|
|
} else {
|
|
|
|
struct object *obj;
|
|
|
|
int eaten;
|
|
|
|
void *buf = (void *) data;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* we do not need to free the memory here, as the
|
|
|
|
* buf is deleted by the caller.
|
|
|
|
*/
|
|
|
|
obj = parse_object_buffer(sha1, type, size, buf, &eaten);
|
|
|
|
if (!obj)
|
|
|
|
die("invalid %s", typename(type));
|
|
|
|
if (fsck_object(obj, 1, fsck_error_function))
|
|
|
|
die("Error in object");
|
2009-06-18 17:28:43 +00:00
|
|
|
if (fsck_walk(obj, mark_link, NULL))
|
2008-02-25 21:46:12 +00:00
|
|
|
die("Not all child objects of %s are reachable", sha1_to_hex(obj->sha1));
|
|
|
|
|
|
|
|
if (obj->type == OBJ_TREE) {
|
|
|
|
struct tree *item = (struct tree *) obj;
|
|
|
|
item->buffer = NULL;
|
|
|
|
}
|
|
|
|
if (obj->type == OBJ_COMMIT) {
|
|
|
|
struct commit *commit = (struct commit *) obj;
|
|
|
|
commit->buffer = NULL;
|
|
|
|
}
|
|
|
|
obj->flags |= FLAG_CHECKED;
|
|
|
|
}
|
|
|
|
}
|
2005-10-12 19:01:31 +00:00
|
|
|
}
|
|
|
|
|
2008-07-15 04:45:34 +00:00
|
|
|
static void *get_base_data(struct base_data *c)
|
|
|
|
{
|
|
|
|
if (!c->data) {
|
|
|
|
struct object_entry *obj = c->obj;
|
|
|
|
|
|
|
|
if (obj->type == OBJ_REF_DELTA || obj->type == OBJ_OFS_DELTA) {
|
|
|
|
void *base = get_base_data(c->base);
|
|
|
|
void *raw = get_data_from_pack(obj);
|
|
|
|
c->data = patch_delta(
|
|
|
|
base, c->base->size,
|
|
|
|
raw, obj->size,
|
|
|
|
&c->size);
|
|
|
|
free(raw);
|
|
|
|
if (!c->data)
|
|
|
|
bad_object(obj->idx.offset, "failed to apply delta");
|
2008-10-17 19:57:57 +00:00
|
|
|
} else {
|
2008-07-15 04:45:34 +00:00
|
|
|
c->data = get_data_from_pack(obj);
|
2008-10-17 19:57:57 +00:00
|
|
|
c->size = obj->size;
|
|
|
|
}
|
2008-07-15 04:45:34 +00:00
|
|
|
|
|
|
|
base_cache_used += c->size;
|
|
|
|
prune_base_data(c);
|
|
|
|
}
|
|
|
|
return c->data;
|
|
|
|
}
|
|
|
|
|
2008-07-14 02:07:44 +00:00
|
|
|
static void resolve_delta(struct object_entry *delta_obj,
|
2008-10-17 19:57:57 +00:00
|
|
|
struct base_data *base, struct base_data *result)
|
2005-10-12 19:01:31 +00:00
|
|
|
{
|
2008-10-20 20:46:19 +00:00
|
|
|
void *base_data, *delta_data;
|
2005-10-12 19:01:31 +00:00
|
|
|
|
2008-10-20 20:46:19 +00:00
|
|
|
delta_obj->real_type = base->obj->real_type;
|
2006-10-26 03:28:17 +00:00
|
|
|
delta_data = get_data_from_pack(delta_obj);
|
2008-10-20 20:46:19 +00:00
|
|
|
base_data = get_base_data(base);
|
2008-10-17 19:57:57 +00:00
|
|
|
result->obj = delta_obj;
|
2008-10-20 20:46:19 +00:00
|
|
|
result->data = patch_delta(base_data, base->size,
|
|
|
|
delta_data, delta_obj->size, &result->size);
|
2005-10-12 19:01:31 +00:00
|
|
|
free(delta_data);
|
2008-10-17 19:57:57 +00:00
|
|
|
if (!result->data)
|
2007-06-01 19:18:05 +00:00
|
|
|
bad_object(delta_obj->idx.offset, "failed to apply delta");
|
2008-10-17 19:57:57 +00:00
|
|
|
sha1_object(result->data, result->size, delta_obj->real_type,
|
|
|
|
delta_obj->idx.sha1);
|
2006-10-26 03:28:17 +00:00
|
|
|
nr_resolved_deltas++;
|
2008-10-17 19:57:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void find_unresolved_deltas(struct base_data *base,
|
|
|
|
struct base_data *prev_base)
|
|
|
|
{
|
2008-10-17 19:57:58 +00:00
|
|
|
int i, ref_first, ref_last, ofs_first, ofs_last;
|
2008-10-17 19:57:57 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This is a recursive function. Those brackets should help reducing
|
|
|
|
* stack usage by limiting the scope of the delta_base union.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
union delta_base base_spec;
|
|
|
|
|
|
|
|
hashcpy(base_spec.sha1, base->obj->idx.sha1);
|
2011-02-02 18:06:51 +00:00
|
|
|
find_delta_children(&base_spec,
|
|
|
|
&ref_first, &ref_last, OBJ_REF_DELTA);
|
2006-09-21 04:08:33 +00:00
|
|
|
|
2008-10-17 19:57:57 +00:00
|
|
|
memset(&base_spec, 0, sizeof(base_spec));
|
|
|
|
base_spec.offset = base->obj->idx.offset;
|
2011-02-02 18:06:51 +00:00
|
|
|
find_delta_children(&base_spec,
|
|
|
|
&ofs_first, &ofs_last, OBJ_OFS_DELTA);
|
2008-10-17 19:57:57 +00:00
|
|
|
}
|
2008-07-14 02:07:45 +00:00
|
|
|
|
2008-10-23 19:05:59 +00:00
|
|
|
if (ref_last == -1 && ofs_last == -1) {
|
|
|
|
free(base->data);
|
2008-10-17 19:57:57 +00:00
|
|
|
return;
|
2008-10-23 19:05:59 +00:00
|
|
|
}
|
2006-09-21 04:08:33 +00:00
|
|
|
|
2008-10-17 19:57:57 +00:00
|
|
|
link_base_data(prev_base, base);
|
2008-07-14 02:07:45 +00:00
|
|
|
|
2008-10-17 19:57:58 +00:00
|
|
|
for (i = ref_first; i <= ref_last; i++) {
|
|
|
|
struct object_entry *child = objects + deltas[i].obj_no;
|
2011-02-02 18:06:51 +00:00
|
|
|
struct base_data result;
|
|
|
|
|
|
|
|
assert(child->real_type == OBJ_REF_DELTA);
|
|
|
|
resolve_delta(child, base, &result);
|
|
|
|
if (i == ref_last && ofs_last == -1)
|
|
|
|
free_base_data(base);
|
|
|
|
find_unresolved_deltas(&result, base);
|
2006-09-21 04:08:33 +00:00
|
|
|
}
|
|
|
|
|
2008-10-17 19:57:58 +00:00
|
|
|
for (i = ofs_first; i <= ofs_last; i++) {
|
|
|
|
struct object_entry *child = objects + deltas[i].obj_no;
|
2011-02-02 18:06:51 +00:00
|
|
|
struct base_data result;
|
|
|
|
|
|
|
|
assert(child->real_type == OBJ_OFS_DELTA);
|
|
|
|
resolve_delta(child, base, &result);
|
|
|
|
if (i == ofs_last)
|
|
|
|
free_base_data(base);
|
|
|
|
find_unresolved_deltas(&result, base);
|
2005-10-12 19:01:31 +00:00
|
|
|
}
|
2006-09-21 04:08:33 +00:00
|
|
|
|
2008-10-17 19:57:57 +00:00
|
|
|
unlink_base_data(base);
|
2005-10-12 19:01:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int compare_delta_entry(const void *a, const void *b)
|
|
|
|
{
|
|
|
|
const struct delta_entry *delta_a = a;
|
|
|
|
const struct delta_entry *delta_b = b;
|
2011-02-02 18:06:51 +00:00
|
|
|
|
|
|
|
/* group by type (ref vs ofs) and then by value (sha-1 or offset) */
|
|
|
|
return compare_delta_bases(&delta_a->base, &delta_b->base,
|
|
|
|
objects[delta_a->obj_no].type,
|
|
|
|
objects[delta_b->obj_no].type);
|
2005-10-12 19:01:31 +00:00
|
|
|
}
|
|
|
|
|
2006-10-20 18:45:21 +00:00
|
|
|
/* Parse all objects and return the pack content SHA1 hash */
|
|
|
|
static void parse_pack_objects(unsigned char *sha1)
|
2005-10-12 19:01:31 +00:00
|
|
|
{
|
2007-04-18 18:27:45 +00:00
|
|
|
int i;
|
2006-09-21 04:08:33 +00:00
|
|
|
struct delta_entry *delta = deltas;
|
2006-10-20 18:45:21 +00:00
|
|
|
struct stat st;
|
2005-10-12 19:01:31 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* First pass:
|
|
|
|
* - find locations of all objects;
|
|
|
|
* - calculate SHA1 of all non-delta objects;
|
2006-10-27 20:14:23 +00:00
|
|
|
* - remember base (SHA1 or offset) for all deltas.
|
2005-10-12 19:01:31 +00:00
|
|
|
*/
|
2007-04-20 18:10:07 +00:00
|
|
|
if (verbose)
|
2007-10-30 18:57:35 +00:00
|
|
|
progress = start_progress(
|
|
|
|
from_stdin ? "Receiving objects" : "Indexing objects",
|
|
|
|
nr_objects);
|
2005-10-12 19:01:31 +00:00
|
|
|
for (i = 0; i < nr_objects; i++) {
|
|
|
|
struct object_entry *obj = &objects[i];
|
2008-07-14 02:07:44 +00:00
|
|
|
void *data = unpack_raw_entry(obj, &delta->base);
|
2005-10-12 19:01:31 +00:00
|
|
|
obj->real_type = obj->type;
|
2006-09-21 04:08:33 +00:00
|
|
|
if (obj->type == OBJ_REF_DELTA || obj->type == OBJ_OFS_DELTA) {
|
|
|
|
nr_deltas++;
|
2006-10-26 03:28:17 +00:00
|
|
|
delta->obj_no = i;
|
2006-09-21 04:08:33 +00:00
|
|
|
delta++;
|
2005-10-12 19:01:31 +00:00
|
|
|
} else
|
2007-06-01 19:18:05 +00:00
|
|
|
sha1_object(data, obj->size, obj->type, obj->idx.sha1);
|
2005-10-12 19:01:31 +00:00
|
|
|
free(data);
|
2007-10-30 18:57:33 +00:00
|
|
|
display_progress(progress, i+1);
|
2005-10-12 19:01:31 +00:00
|
|
|
}
|
2007-06-01 19:18:05 +00:00
|
|
|
objects[i].idx.offset = consumed_bytes;
|
2007-10-30 18:57:33 +00:00
|
|
|
stop_progress(&progress);
|
2006-10-20 18:45:21 +00:00
|
|
|
|
|
|
|
/* Check pack integrity */
|
2006-10-26 03:28:17 +00:00
|
|
|
flush();
|
2008-10-01 18:05:20 +00:00
|
|
|
git_SHA1_Final(sha1, &input_ctx);
|
2006-10-20 18:45:21 +00:00
|
|
|
if (hashcmp(fill(20), sha1))
|
2006-10-23 18:50:18 +00:00
|
|
|
die("pack is corrupted (SHA1 mismatch)");
|
2006-10-26 03:31:53 +00:00
|
|
|
use(20);
|
2006-10-20 18:45:21 +00:00
|
|
|
|
|
|
|
/* If input_fd is a file, we should have reached its end now. */
|
|
|
|
if (fstat(input_fd, &st))
|
2009-06-27 15:58:46 +00:00
|
|
|
die_errno("cannot fstat packfile");
|
git-bundle: assorted fixes
This patch fixes issues mentioned by Junio, Nico and Simon:
- I forgot to convert the usage string when removing the "--" from
the subcommands,
- a style fix in the bundle_header,
- use xread() instead of read(),
- use write_or_die() instead of write(),
- make the bundle header extensible,
- fail if the whitespace after a sha1 of a reference is missing,
- close() the fds passed to a subprocess,
- in verify_bundle(), do not use "rev-list --stdin", but rather
pass the revs directly (avoiding a fork()),
- fix a corrupted comment in show_object(), and
- fix the size check in index_pack.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-22 18:14:14 +00:00
|
|
|
if (S_ISREG(st.st_mode) &&
|
|
|
|
lseek(input_fd, 0, SEEK_CUR) - input_len != st.st_size)
|
2006-10-23 18:50:18 +00:00
|
|
|
die("pack has junk at the end");
|
2005-10-12 19:01:31 +00:00
|
|
|
|
2006-10-26 03:32:59 +00:00
|
|
|
if (!nr_deltas)
|
|
|
|
return;
|
|
|
|
|
2006-09-21 04:08:33 +00:00
|
|
|
/* Sort deltas by base SHA1/offset for fast searching */
|
2005-10-12 19:01:31 +00:00
|
|
|
qsort(deltas, nr_deltas, sizeof(struct delta_entry),
|
|
|
|
compare_delta_entry);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Second pass:
|
|
|
|
* - for all non-delta objects, look if it is used as a base for
|
|
|
|
* deltas;
|
|
|
|
* - if used as a base, uncompress the object and apply all deltas,
|
|
|
|
* recursively checking if the resulting object is used as a base
|
|
|
|
* for some more deltas.
|
|
|
|
*/
|
2007-04-20 18:10:07 +00:00
|
|
|
if (verbose)
|
2007-10-30 18:57:32 +00:00
|
|
|
progress = start_progress("Resolving deltas", nr_deltas);
|
2005-10-12 19:01:31 +00:00
|
|
|
for (i = 0; i < nr_objects; i++) {
|
|
|
|
struct object_entry *obj = &objects[i];
|
2008-07-14 02:07:44 +00:00
|
|
|
struct base_data base_obj;
|
2005-10-12 19:01:31 +00:00
|
|
|
|
2006-09-21 04:08:33 +00:00
|
|
|
if (obj->type == OBJ_REF_DELTA || obj->type == OBJ_OFS_DELTA)
|
2005-10-12 19:01:31 +00:00
|
|
|
continue;
|
2008-07-14 02:07:46 +00:00
|
|
|
base_obj.obj = obj;
|
2008-10-17 19:57:57 +00:00
|
|
|
base_obj.data = NULL;
|
|
|
|
find_unresolved_deltas(&base_obj, NULL);
|
2007-10-30 18:57:33 +00:00
|
|
|
display_progress(progress, nr_resolved_deltas);
|
2005-10-12 19:01:31 +00:00
|
|
|
}
|
2006-10-26 03:28:17 +00:00
|
|
|
}
|
|
|
|
|
2008-08-29 20:08:01 +00:00
|
|
|
static int write_compressed(struct sha1file *f, void *in, unsigned int size)
|
2006-10-26 03:28:17 +00:00
|
|
|
{
|
|
|
|
z_stream stream;
|
2010-04-12 20:50:35 +00:00
|
|
|
int status;
|
|
|
|
unsigned char outbuf[4096];
|
2006-10-26 03:28:17 +00:00
|
|
|
|
|
|
|
memset(&stream, 0, sizeof(stream));
|
|
|
|
deflateInit(&stream, zlib_compression_level);
|
|
|
|
stream.next_in = in;
|
|
|
|
stream.avail_in = size;
|
|
|
|
|
2010-04-12 20:50:35 +00:00
|
|
|
do {
|
|
|
|
stream.next_out = outbuf;
|
|
|
|
stream.avail_out = sizeof(outbuf);
|
|
|
|
status = deflate(&stream, Z_FINISH);
|
|
|
|
sha1write(f, outbuf, sizeof(outbuf) - stream.avail_out);
|
|
|
|
} while (status == Z_OK);
|
|
|
|
|
|
|
|
if (status != Z_STREAM_END)
|
|
|
|
die("unable to deflate appended object (%d)", status);
|
2006-10-26 03:28:17 +00:00
|
|
|
size = stream.total_out;
|
2010-04-12 20:50:35 +00:00
|
|
|
deflateEnd(&stream);
|
2006-10-26 03:28:17 +00:00
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
2008-08-29 20:08:01 +00:00
|
|
|
static struct object_entry *append_obj_to_pack(struct sha1file *f,
|
2008-07-14 02:07:46 +00:00
|
|
|
const unsigned char *sha1, void *buf,
|
2006-10-26 03:28:17 +00:00
|
|
|
unsigned long size, enum object_type type)
|
|
|
|
{
|
|
|
|
struct object_entry *obj = &objects[nr_objects++];
|
|
|
|
unsigned char header[10];
|
|
|
|
unsigned long s = size;
|
|
|
|
int n = 0;
|
|
|
|
unsigned char c = (type << 4) | (s & 15);
|
|
|
|
s >>= 4;
|
|
|
|
while (s) {
|
|
|
|
header[n++] = c | 0x80;
|
|
|
|
c = s & 0x7f;
|
|
|
|
s >>= 7;
|
|
|
|
}
|
|
|
|
header[n++] = c;
|
2008-08-29 20:08:01 +00:00
|
|
|
crc32_begin(f);
|
|
|
|
sha1write(f, header, n);
|
2008-07-24 17:32:00 +00:00
|
|
|
obj[0].size = size;
|
|
|
|
obj[0].hdr_size = n;
|
|
|
|
obj[0].type = type;
|
|
|
|
obj[0].real_type = type;
|
2007-06-01 19:18:05 +00:00
|
|
|
obj[1].idx.offset = obj[0].idx.offset + n;
|
2008-08-29 20:08:01 +00:00
|
|
|
obj[1].idx.offset += write_compressed(f, buf, size);
|
|
|
|
obj[0].idx.crc32 = crc32_end(f);
|
2008-10-10 02:08:51 +00:00
|
|
|
sha1flush(f);
|
2007-06-01 19:18:05 +00:00
|
|
|
hashcpy(obj->idx.sha1, sha1);
|
2008-07-14 02:07:46 +00:00
|
|
|
return obj;
|
2006-10-26 03:28:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int delta_pos_compare(const void *_a, const void *_b)
|
|
|
|
{
|
|
|
|
struct delta_entry *a = *(struct delta_entry **)_a;
|
|
|
|
struct delta_entry *b = *(struct delta_entry **)_b;
|
|
|
|
return a->obj_no - b->obj_no;
|
|
|
|
}
|
2005-10-12 19:01:31 +00:00
|
|
|
|
2008-08-29 20:08:01 +00:00
|
|
|
static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved)
|
2006-10-26 03:28:17 +00:00
|
|
|
{
|
|
|
|
struct delta_entry **sorted_by_pos;
|
2007-04-18 18:27:45 +00:00
|
|
|
int i, n = 0;
|
2006-10-26 03:28:17 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Since many unresolved deltas may well be themselves base objects
|
|
|
|
* for more unresolved deltas, we really want to include the
|
|
|
|
* smallest number of base objects that would cover as much delta
|
|
|
|
* as possible by picking the
|
|
|
|
* trunc deltas first, allowing for other deltas to resolve without
|
|
|
|
* additional base objects. Since most base objects are to be found
|
|
|
|
* before deltas depending on them, a good heuristic is to start
|
|
|
|
* resolving deltas in the same order as their position in the pack.
|
|
|
|
*/
|
|
|
|
sorted_by_pos = xmalloc(nr_unresolved * sizeof(*sorted_by_pos));
|
2005-10-12 19:01:31 +00:00
|
|
|
for (i = 0; i < nr_deltas; i++) {
|
2006-10-26 03:28:17 +00:00
|
|
|
if (objects[deltas[i].obj_no].real_type != OBJ_REF_DELTA)
|
|
|
|
continue;
|
|
|
|
sorted_by_pos[n++] = &deltas[i];
|
2005-10-12 19:01:31 +00:00
|
|
|
}
|
2006-10-26 03:28:17 +00:00
|
|
|
qsort(sorted_by_pos, n, sizeof(*sorted_by_pos), delta_pos_compare);
|
|
|
|
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
struct delta_entry *d = sorted_by_pos[i];
|
2007-02-26 19:55:59 +00:00
|
|
|
enum object_type type;
|
2008-07-14 02:07:44 +00:00
|
|
|
struct base_data base_obj;
|
2006-10-26 03:28:17 +00:00
|
|
|
|
|
|
|
if (objects[d->obj_no].real_type != OBJ_REF_DELTA)
|
|
|
|
continue;
|
2008-07-14 02:07:44 +00:00
|
|
|
base_obj.data = read_sha1_file(d->base.sha1, &type, &base_obj.size);
|
|
|
|
if (!base_obj.data)
|
2006-10-26 03:28:17 +00:00
|
|
|
continue;
|
|
|
|
|
2008-07-14 02:07:46 +00:00
|
|
|
if (check_sha1_signature(d->base.sha1, base_obj.data,
|
|
|
|
base_obj.size, typename(type)))
|
|
|
|
die("local object %s is corrupt", sha1_to_hex(d->base.sha1));
|
2008-08-29 20:08:01 +00:00
|
|
|
base_obj.obj = append_obj_to_pack(f, d->base.sha1,
|
|
|
|
base_obj.data, base_obj.size, type);
|
2008-10-17 19:57:57 +00:00
|
|
|
find_unresolved_deltas(&base_obj, NULL);
|
2007-10-30 18:57:33 +00:00
|
|
|
display_progress(progress, nr_resolved_deltas);
|
2006-10-26 03:28:17 +00:00
|
|
|
}
|
|
|
|
free(sorted_by_pos);
|
|
|
|
}
|
|
|
|
|
2006-10-23 18:50:18 +00:00
|
|
|
static void final(const char *final_pack_name, const char *curr_pack_name,
|
|
|
|
const char *final_index_name, const char *curr_index_name,
|
2006-10-29 09:41:59 +00:00
|
|
|
const char *keep_name, const char *keep_msg,
|
2006-10-23 18:50:18 +00:00
|
|
|
unsigned char *sha1)
|
|
|
|
{
|
2007-03-07 01:44:17 +00:00
|
|
|
const char *report = "pack";
|
2006-10-23 18:50:18 +00:00
|
|
|
char name[PATH_MAX];
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!from_stdin) {
|
|
|
|
close(input_fd);
|
|
|
|
} else {
|
2008-05-30 15:42:16 +00:00
|
|
|
fsync_or_die(output_fd, curr_pack_name);
|
2006-10-23 18:50:18 +00:00
|
|
|
err = close(output_fd);
|
|
|
|
if (err)
|
2009-06-27 15:58:46 +00:00
|
|
|
die_errno("error while closing pack file");
|
2006-10-23 18:50:18 +00:00
|
|
|
}
|
|
|
|
|
2006-10-29 09:41:59 +00:00
|
|
|
if (keep_msg) {
|
|
|
|
int keep_fd, keep_msg_len = strlen(keep_msg);
|
2009-02-25 07:11:29 +00:00
|
|
|
|
|
|
|
if (!keep_name)
|
|
|
|
keep_fd = odb_pack_keep(name, sizeof(name), sha1);
|
|
|
|
else
|
|
|
|
keep_fd = open(keep_name, O_RDWR|O_CREAT|O_EXCL, 0600);
|
|
|
|
|
2006-11-01 22:06:24 +00:00
|
|
|
if (keep_fd < 0) {
|
|
|
|
if (errno != EEXIST)
|
2009-06-27 15:58:46 +00:00
|
|
|
die_errno("cannot write keep file '%s'",
|
|
|
|
keep_name);
|
2006-11-01 22:06:24 +00:00
|
|
|
} else {
|
|
|
|
if (keep_msg_len > 0) {
|
|
|
|
write_or_die(keep_fd, keep_msg, keep_msg_len);
|
|
|
|
write_or_die(keep_fd, "\n", 1);
|
|
|
|
}
|
2007-06-24 19:20:41 +00:00
|
|
|
if (close(keep_fd) != 0)
|
2009-06-27 15:58:46 +00:00
|
|
|
die_errno("cannot close written keep file '%s'",
|
|
|
|
keep_name);
|
2006-11-01 22:06:25 +00:00
|
|
|
report = "keep";
|
2006-10-29 09:41:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-23 18:50:18 +00:00
|
|
|
if (final_pack_name != curr_pack_name) {
|
|
|
|
if (!final_pack_name) {
|
|
|
|
snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
|
|
|
|
get_object_directory(), sha1_to_hex(sha1));
|
|
|
|
final_pack_name = name;
|
|
|
|
}
|
|
|
|
if (move_temp_to_file(curr_pack_name, final_pack_name))
|
|
|
|
die("cannot store pack file");
|
2009-03-26 15:16:47 +00:00
|
|
|
} else if (from_stdin)
|
2008-10-03 10:20:43 +00:00
|
|
|
chmod(final_pack_name, 0444);
|
2006-10-23 18:50:18 +00:00
|
|
|
|
|
|
|
if (final_index_name != curr_index_name) {
|
|
|
|
if (!final_index_name) {
|
|
|
|
snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
|
|
|
|
get_object_directory(), sha1_to_hex(sha1));
|
|
|
|
final_index_name = name;
|
|
|
|
}
|
|
|
|
if (move_temp_to_file(curr_index_name, final_index_name))
|
|
|
|
die("cannot store index file");
|
2009-03-26 15:16:47 +00:00
|
|
|
} else
|
|
|
|
chmod(final_index_name, 0444);
|
2006-11-01 22:06:25 +00:00
|
|
|
|
|
|
|
if (!from_stdin) {
|
|
|
|
printf("%s\n", sha1_to_hex(sha1));
|
|
|
|
} else {
|
|
|
|
char buf[48];
|
|
|
|
int len = snprintf(buf, sizeof(buf), "%s\t%s\n",
|
|
|
|
report, sha1_to_hex(sha1));
|
2007-01-11 21:15:51 +00:00
|
|
|
write_or_die(1, buf, len);
|
2006-11-01 22:06:25 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Let's just mimic git-unpack-objects here and write
|
|
|
|
* the last part of the input buffer to stdout.
|
|
|
|
*/
|
|
|
|
while (input_len) {
|
|
|
|
err = xwrite(1, input_buffer + input_offset, input_len);
|
|
|
|
if (err <= 0)
|
|
|
|
break;
|
|
|
|
input_len -= err;
|
|
|
|
input_offset += err;
|
|
|
|
}
|
|
|
|
}
|
2005-10-12 19:01:31 +00:00
|
|
|
}
|
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
static int git_index_pack_config(const char *k, const char *v, void *cb)
|
2007-11-02 03:26:04 +00:00
|
|
|
{
|
2011-02-25 23:43:25 +00:00
|
|
|
struct pack_idx_option *opts = cb;
|
|
|
|
|
2007-11-02 03:26:04 +00:00
|
|
|
if (!strcmp(k, "pack.indexversion")) {
|
2011-02-25 23:43:25 +00:00
|
|
|
opts->version = git_config_int(k, v);
|
|
|
|
if (opts->version > 2)
|
|
|
|
die("bad pack.indexversion=%"PRIu32, opts->version);
|
2007-11-02 03:26:04 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2008-05-14 17:46:53 +00:00
|
|
|
return git_default_config(k, v, cb);
|
2007-11-02 03:26:04 +00:00
|
|
|
}
|
|
|
|
|
2010-01-22 15:55:19 +00:00
|
|
|
int cmd_index_pack(int argc, const char **argv, const char *prefix)
|
2005-10-12 19:01:31 +00:00
|
|
|
{
|
2006-10-26 03:28:17 +00:00
|
|
|
int i, fix_thin_pack = 0;
|
2010-01-22 15:55:19 +00:00
|
|
|
const char *curr_pack, *curr_index;
|
|
|
|
const char *index_name = NULL, *pack_name = NULL;
|
2006-10-29 09:41:59 +00:00
|
|
|
const char *keep_name = NULL, *keep_msg = NULL;
|
|
|
|
char *index_name_buf = NULL, *keep_name_buf = NULL;
|
2007-06-01 19:18:05 +00:00
|
|
|
struct pack_idx_entry **idx_objects;
|
2011-02-25 23:43:25 +00:00
|
|
|
struct pack_idx_option opts;
|
2008-08-29 20:08:01 +00:00
|
|
|
unsigned char pack_sha1[20];
|
2005-10-12 19:01:31 +00:00
|
|
|
|
2009-11-09 15:05:01 +00:00
|
|
|
if (argc == 2 && !strcmp(argv[1], "-h"))
|
|
|
|
usage(index_pack_usage);
|
|
|
|
|
2010-08-12 14:18:12 +00:00
|
|
|
read_replace_refs = 0;
|
|
|
|
|
2011-02-25 23:43:25 +00:00
|
|
|
reset_pack_idx_option(&opts);
|
|
|
|
git_config(git_index_pack_config, &opts);
|
2010-07-24 11:30:49 +00:00
|
|
|
if (prefix && chdir(prefix))
|
|
|
|
die("Cannot come back to cwd");
|
2007-11-02 03:26:04 +00:00
|
|
|
|
2005-10-12 19:01:31 +00:00
|
|
|
for (i = 1; i < argc; i++) {
|
2010-01-22 15:55:19 +00:00
|
|
|
const char *arg = argv[i];
|
2005-10-12 19:01:31 +00:00
|
|
|
|
|
|
|
if (*arg == '-') {
|
2006-10-23 18:50:18 +00:00
|
|
|
if (!strcmp(arg, "--stdin")) {
|
|
|
|
from_stdin = 1;
|
2006-10-26 03:28:17 +00:00
|
|
|
} else if (!strcmp(arg, "--fix-thin")) {
|
|
|
|
fix_thin_pack = 1;
|
2008-02-25 21:46:12 +00:00
|
|
|
} else if (!strcmp(arg, "--strict")) {
|
|
|
|
strict = 1;
|
2006-10-29 09:41:59 +00:00
|
|
|
} else if (!strcmp(arg, "--keep")) {
|
|
|
|
keep_msg = "";
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 09:53:29 +00:00
|
|
|
} else if (!prefixcmp(arg, "--keep=")) {
|
2006-10-29 09:41:59 +00:00
|
|
|
keep_msg = arg + 7;
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 09:53:29 +00:00
|
|
|
} else if (!prefixcmp(arg, "--pack_header=")) {
|
2006-11-01 22:06:20 +00:00
|
|
|
struct pack_header *hdr;
|
|
|
|
char *c;
|
|
|
|
|
|
|
|
hdr = (struct pack_header *)input_buffer;
|
|
|
|
hdr->hdr_signature = htonl(PACK_SIGNATURE);
|
|
|
|
hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10));
|
|
|
|
if (*c != ',')
|
|
|
|
die("bad %s", arg);
|
|
|
|
hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10));
|
|
|
|
if (*c)
|
|
|
|
die("bad %s", arg);
|
|
|
|
input_len = sizeof(*hdr);
|
2006-10-26 03:32:59 +00:00
|
|
|
} else if (!strcmp(arg, "-v")) {
|
|
|
|
verbose = 1;
|
2006-10-23 18:50:18 +00:00
|
|
|
} else if (!strcmp(arg, "-o")) {
|
2005-10-12 19:01:31 +00:00
|
|
|
if (index_name || (i+1) >= argc)
|
|
|
|
usage(index_pack_usage);
|
|
|
|
index_name = argv[++i];
|
2007-04-09 21:32:03 +00:00
|
|
|
} else if (!prefixcmp(arg, "--index-version=")) {
|
|
|
|
char *c;
|
2011-02-25 23:43:25 +00:00
|
|
|
opts.version = strtoul(arg + 16, &c, 10);
|
|
|
|
if (opts.version > 2)
|
2007-04-09 21:32:03 +00:00
|
|
|
die("bad %s", arg);
|
|
|
|
if (*c == ',')
|
2011-02-25 23:43:25 +00:00
|
|
|
opts.off32_limit = strtoul(c+1, &c, 0);
|
|
|
|
if (*c || opts.off32_limit & 0x80000000)
|
2007-04-09 21:32:03 +00:00
|
|
|
die("bad %s", arg);
|
2005-10-12 19:01:31 +00:00
|
|
|
} else
|
|
|
|
usage(index_pack_usage);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pack_name)
|
|
|
|
usage(index_pack_usage);
|
|
|
|
pack_name = arg;
|
|
|
|
}
|
|
|
|
|
2006-10-23 18:50:18 +00:00
|
|
|
if (!pack_name && !from_stdin)
|
2005-10-12 19:01:31 +00:00
|
|
|
usage(index_pack_usage);
|
2006-10-26 03:28:17 +00:00
|
|
|
if (fix_thin_pack && !from_stdin)
|
|
|
|
die("--fix-thin cannot be used without --stdin");
|
2006-10-23 18:50:18 +00:00
|
|
|
if (!index_name && pack_name) {
|
2005-10-12 19:01:31 +00:00
|
|
|
int len = strlen(pack_name);
|
2006-08-11 12:01:45 +00:00
|
|
|
if (!has_extension(pack_name, ".pack"))
|
2005-10-12 19:01:31 +00:00
|
|
|
die("packfile name '%s' does not end with '.pack'",
|
|
|
|
pack_name);
|
2005-12-21 20:35:48 +00:00
|
|
|
index_name_buf = xmalloc(len);
|
2005-10-12 19:01:31 +00:00
|
|
|
memcpy(index_name_buf, pack_name, len - 5);
|
|
|
|
strcpy(index_name_buf + len - 5, ".idx");
|
|
|
|
index_name = index_name_buf;
|
|
|
|
}
|
2006-10-29 09:41:59 +00:00
|
|
|
if (keep_msg && !keep_name && pack_name) {
|
|
|
|
int len = strlen(pack_name);
|
|
|
|
if (!has_extension(pack_name, ".pack"))
|
|
|
|
die("packfile name '%s' does not end with '.pack'",
|
|
|
|
pack_name);
|
|
|
|
keep_name_buf = xmalloc(len);
|
|
|
|
memcpy(keep_name_buf, pack_name, len - 5);
|
|
|
|
strcpy(keep_name_buf + len - 5, ".keep");
|
|
|
|
keep_name = keep_name_buf;
|
|
|
|
}
|
2005-10-12 19:01:31 +00:00
|
|
|
|
2006-10-23 18:50:18 +00:00
|
|
|
curr_pack = open_pack_file(pack_name);
|
2005-10-12 19:01:31 +00:00
|
|
|
parse_pack_header();
|
2006-10-26 03:28:17 +00:00
|
|
|
objects = xmalloc((nr_objects + 1) * sizeof(struct object_entry));
|
|
|
|
deltas = xmalloc(nr_objects * sizeof(struct delta_entry));
|
2008-08-29 20:08:01 +00:00
|
|
|
parse_pack_objects(pack_sha1);
|
2007-04-18 18:27:45 +00:00
|
|
|
if (nr_deltas == nr_resolved_deltas) {
|
2007-10-30 18:57:33 +00:00
|
|
|
stop_progress(&progress);
|
2007-04-18 18:27:45 +00:00
|
|
|
/* Flush remaining pack final 20-byte SHA1. */
|
|
|
|
flush();
|
|
|
|
} else {
|
2006-10-26 03:28:17 +00:00
|
|
|
if (fix_thin_pack) {
|
2008-08-29 20:08:01 +00:00
|
|
|
struct sha1file *f;
|
|
|
|
unsigned char read_sha1[20], tail_sha1[20];
|
2007-11-08 20:45:41 +00:00
|
|
|
char msg[48];
|
2006-10-26 03:28:17 +00:00
|
|
|
int nr_unresolved = nr_deltas - nr_resolved_deltas;
|
2006-10-26 03:32:59 +00:00
|
|
|
int nr_objects_initial = nr_objects;
|
2006-10-26 03:28:17 +00:00
|
|
|
if (nr_unresolved <= 0)
|
|
|
|
die("confusion beyond insanity");
|
|
|
|
objects = xrealloc(objects,
|
|
|
|
(nr_objects + nr_unresolved + 1)
|
|
|
|
* sizeof(*objects));
|
2008-08-29 20:08:01 +00:00
|
|
|
f = sha1fd(output_fd, curr_pack);
|
|
|
|
fix_unresolved_deltas(f, nr_unresolved);
|
2007-11-08 20:45:41 +00:00
|
|
|
sprintf(msg, "completed with %d local objects",
|
|
|
|
nr_objects - nr_objects_initial);
|
|
|
|
stop_progress_msg(&progress, msg);
|
2008-08-29 20:08:01 +00:00
|
|
|
sha1close(f, tail_sha1, 0);
|
|
|
|
hashcpy(read_sha1, pack_sha1);
|
|
|
|
fixup_pack_header_footer(output_fd, pack_sha1,
|
2008-08-29 20:07:59 +00:00
|
|
|
curr_pack, nr_objects,
|
2008-08-29 20:08:01 +00:00
|
|
|
read_sha1, consumed_bytes-20);
|
|
|
|
if (hashcmp(read_sha1, tail_sha1) != 0)
|
|
|
|
die("Unexpected tail checksum for %s "
|
|
|
|
"(disk corruption?)", curr_pack);
|
2006-10-26 03:28:17 +00:00
|
|
|
}
|
|
|
|
if (nr_deltas != nr_resolved_deltas)
|
|
|
|
die("pack has %d unresolved deltas",
|
|
|
|
nr_deltas - nr_resolved_deltas);
|
|
|
|
}
|
2005-10-12 19:01:31 +00:00
|
|
|
free(deltas);
|
2008-02-25 21:46:12 +00:00
|
|
|
if (strict)
|
|
|
|
check_objects();
|
2007-06-01 19:18:05 +00:00
|
|
|
|
|
|
|
idx_objects = xmalloc((nr_objects) * sizeof(struct pack_idx_entry *));
|
|
|
|
for (i = 0; i < nr_objects; i++)
|
|
|
|
idx_objects[i] = &objects[i].idx;
|
2011-02-25 23:43:25 +00:00
|
|
|
curr_index = write_idx_file(index_name, idx_objects, nr_objects, &opts, pack_sha1);
|
2007-06-01 19:18:05 +00:00
|
|
|
free(idx_objects);
|
|
|
|
|
2006-10-29 09:41:59 +00:00
|
|
|
final(pack_name, curr_pack,
|
|
|
|
index_name, curr_index,
|
|
|
|
keep_name, keep_msg,
|
2008-08-29 20:08:01 +00:00
|
|
|
pack_sha1);
|
2005-10-12 19:01:31 +00:00
|
|
|
free(objects);
|
|
|
|
free(index_name_buf);
|
2006-10-29 09:41:59 +00:00
|
|
|
free(keep_name_buf);
|
2007-10-17 01:55:50 +00:00
|
|
|
if (pack_name == NULL)
|
2010-01-22 15:55:19 +00:00
|
|
|
free((void *) curr_pack);
|
2007-10-17 01:55:50 +00:00
|
|
|
if (index_name == NULL)
|
2010-01-22 15:55:19 +00:00
|
|
|
free((void *) curr_index);
|
2005-10-12 19:01:31 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|