2006-08-03 17:24:37 +02:00
|
|
|
#include "builtin.h"
|
2005-06-26 00:27:14 +02:00
|
|
|
#include "cache.h"
|
2017-06-14 20:07:36 +02:00
|
|
|
#include "config.h"
|
2005-06-26 00:59:31 +02:00
|
|
|
#include "object.h"
|
2005-06-26 13:29:18 +02:00
|
|
|
#include "delta.h"
|
2005-06-28 23:21:02 +02:00
|
|
|
#include "pack.h"
|
2006-04-02 14:44:09 +02:00
|
|
|
#include "blob.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "tag.h"
|
|
|
|
#include "tree.h"
|
2008-02-25 22:46:11 +01:00
|
|
|
#include "tree-walk.h"
|
2007-04-18 20:27:45 +02:00
|
|
|
#include "progress.h"
|
2008-02-25 22:46:10 +01:00
|
|
|
#include "decorate.h"
|
2008-02-25 22:46:11 +01:00
|
|
|
#include "fsck.h"
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2008-02-25 22:46:11 +01:00
|
|
|
static int dry_run, quiet, recover, has_errors, strict;
|
usage: do not insist that standard input must come from a file
The synopsys text and the usage string of subcommands that read list
of things from the standard input are often shown like this:
git gostak [--distim] < <list-of-doshes>
This is problematic in a number of ways:
* The way to use these commands is more often to feed them the
output from another command, not feed them from a file.
* Manual pages outside Git, commands that operate on the data read
from the standard input, e.g "sort", "grep", "sed", etc., are not
described with such a "< redirection-from-file" in their synopsys
text. Our doing so introduces inconsistency.
* We do not insist on where the output should go, by saying
git gostak [--distim] < <list-of-doshes> > <output>
* As it is our convention to enclose placeholders inside <braket>,
the redirection operator followed by a placeholder filename
becomes very hard to read, both in the documentation and in the
help text.
Let's clean them all up, after making sure that the documentation
clearly describes the modes that take information from the standard
input and what kind of things are expected on the input.
[jc: stole example for fmt-merge-msg from Jonathan]
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-10-16 20:27:42 +02:00
|
|
|
static const char unpack_usage[] = "git unpack-objects [-n] [-q] [-r] [--strict]";
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
/* We always read in 4kB chunks. */
|
|
|
|
static unsigned char buffer[4096];
|
2007-04-09 07:06:30 +02:00
|
|
|
static unsigned int offset, len;
|
|
|
|
static off_t consumed_bytes;
|
2016-08-24 20:41:56 +02:00
|
|
|
static off_t max_input_size;
|
2018-02-01 03:18:40 +01:00
|
|
|
static git_hash_ctx ctx;
|
2015-06-22 17:25:00 +02:00
|
|
|
static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2008-03-05 08:46:51 +01:00
|
|
|
/*
|
|
|
|
* When running under --strict mode, objects whose reachability are
|
|
|
|
* suspect are kept in core without getting written in the object
|
|
|
|
* store.
|
|
|
|
*/
|
2008-02-25 22:46:10 +01:00
|
|
|
struct obj_buffer {
|
|
|
|
char *buffer;
|
|
|
|
unsigned long size;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct decoration obj_decorate;
|
|
|
|
|
|
|
|
static struct obj_buffer *lookup_object_buffer(struct object *base)
|
|
|
|
{
|
|
|
|
return lookup_decoration(&obj_decorate, base);
|
|
|
|
}
|
|
|
|
|
2008-02-25 22:46:11 +01:00
|
|
|
static void add_object_buffer(struct object *object, char *buffer, unsigned long size)
|
|
|
|
{
|
|
|
|
struct obj_buffer *obj;
|
|
|
|
obj = xcalloc(1, sizeof(struct obj_buffer));
|
|
|
|
obj->buffer = buffer;
|
|
|
|
obj->size = size;
|
|
|
|
if (add_decoration(&obj_decorate, object, obj))
|
2015-11-10 03:22:28 +01:00
|
|
|
die("object %s tried to add buffer twice!", oid_to_hex(&object->oid));
|
2008-02-25 22:46:11 +01:00
|
|
|
}
|
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
/*
|
|
|
|
* Make sure at least "min" bytes are available in the buffer, and
|
|
|
|
* return the pointer to the buffer.
|
|
|
|
*/
|
2006-10-31 02:44:27 +01:00
|
|
|
static void *fill(int min)
|
2005-06-29 05:34:23 +02:00
|
|
|
{
|
|
|
|
if (min <= len)
|
|
|
|
return buffer + offset;
|
|
|
|
if (min > sizeof(buffer))
|
|
|
|
die("cannot fill %d bytes", min);
|
|
|
|
if (offset) {
|
2018-02-01 03:18:40 +01:00
|
|
|
the_hash_algo->update_fn(&ctx, buffer, offset);
|
2006-10-31 02:44:27 +01:00
|
|
|
memmove(buffer, buffer + offset, len);
|
2005-06-29 05:34:23 +02:00
|
|
|
offset = 0;
|
|
|
|
}
|
|
|
|
do {
|
2007-05-15 14:49:22 +02:00
|
|
|
ssize_t ret = xread(0, buffer + len, sizeof(buffer) - len);
|
2005-06-29 05:34:23 +02:00
|
|
|
if (ret <= 0) {
|
|
|
|
if (!ret)
|
|
|
|
die("early EOF");
|
2009-06-27 17:58:46 +02:00
|
|
|
die_errno("read error on input");
|
2005-06-29 05:34:23 +02:00
|
|
|
}
|
|
|
|
len += ret;
|
|
|
|
} while (len < min);
|
|
|
|
return buffer;
|
|
|
|
}
|
2005-06-26 00:59:31 +02:00
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
static void use(int bytes)
|
|
|
|
{
|
|
|
|
if (bytes > len)
|
|
|
|
die("used more bytes than were available");
|
|
|
|
len -= bytes;
|
|
|
|
offset += bytes;
|
2007-04-09 07:06:30 +02:00
|
|
|
|
|
|
|
/* make sure off_t is sufficiently large not to wrap */
|
2010-10-05 09:24:10 +02:00
|
|
|
if (signed_add_overflows(consumed_bytes, bytes))
|
2007-04-09 07:06:30 +02:00
|
|
|
die("pack too large for current definition of off_t");
|
2006-09-21 06:07:39 +02:00
|
|
|
consumed_bytes += bytes;
|
2016-08-24 20:41:56 +02:00
|
|
|
if (max_input_size && consumed_bytes > max_input_size)
|
|
|
|
die(_("pack exceeds maximum allowed size"));
|
2005-06-29 05:34:23 +02:00
|
|
|
}
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
static void *get_data(unsigned long size)
|
2005-06-26 00:27:14 +02:00
|
|
|
{
|
2011-06-10 20:52:15 +02:00
|
|
|
git_zstream stream;
|
2014-12-08 15:17:55 +01:00
|
|
|
void *buf = xmallocz(size);
|
2005-06-29 05:34:23 +02:00
|
|
|
|
|
|
|
memset(&stream, 0, sizeof(stream));
|
|
|
|
|
|
|
|
stream.next_out = buf;
|
|
|
|
stream.avail_out = size;
|
|
|
|
stream.next_in = fill(1);
|
|
|
|
stream.avail_in = len;
|
2009-01-08 04:54:47 +01:00
|
|
|
git_inflate_init(&stream);
|
2005-06-29 05:34:23 +02:00
|
|
|
|
|
|
|
for (;;) {
|
2009-01-08 04:54:47 +01:00
|
|
|
int ret = git_inflate(&stream, 0);
|
2005-06-29 05:34:23 +02:00
|
|
|
use(len - stream.avail_in);
|
|
|
|
if (stream.total_out == size && ret == Z_STREAM_END)
|
|
|
|
break;
|
2006-09-04 07:55:54 +02:00
|
|
|
if (ret != Z_OK) {
|
2012-04-30 02:28:45 +02:00
|
|
|
error("inflate returned %d", ret);
|
2017-06-16 01:15:46 +02:00
|
|
|
FREE_AND_NULL(buf);
|
2006-09-13 21:59:20 +02:00
|
|
|
if (!recover)
|
2006-09-04 07:55:54 +02:00
|
|
|
exit(1);
|
|
|
|
has_errors = 1;
|
|
|
|
break;
|
|
|
|
}
|
2005-06-29 05:34:23 +02:00
|
|
|
stream.next_in = fill(1);
|
|
|
|
stream.avail_in = len;
|
|
|
|
}
|
2009-01-08 04:54:47 +01:00
|
|
|
git_inflate_end(&stream);
|
2005-06-29 05:34:23 +02:00
|
|
|
return buf;
|
2005-06-26 00:27:14 +02:00
|
|
|
}
|
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
struct delta_info {
|
2017-05-07 00:10:12 +02:00
|
|
|
struct object_id base_oid;
|
2007-04-09 07:06:30 +02:00
|
|
|
unsigned nr;
|
|
|
|
off_t base_offset;
|
2005-06-29 05:34:23 +02:00
|
|
|
unsigned long size;
|
|
|
|
void *delta;
|
|
|
|
struct delta_info *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct delta_info *delta_list;
|
|
|
|
|
2017-05-07 00:10:12 +02:00
|
|
|
static void add_delta_to_list(unsigned nr, const struct object_id *base_oid,
|
2007-04-09 07:06:30 +02:00
|
|
|
off_t base_offset,
|
2006-09-21 06:07:39 +02:00
|
|
|
void *delta, unsigned long size)
|
2005-06-26 00:27:14 +02:00
|
|
|
{
|
2005-06-29 05:34:23 +02:00
|
|
|
struct delta_info *info = xmalloc(sizeof(*info));
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2017-05-07 00:10:12 +02:00
|
|
|
oidcpy(&info->base_oid, base_oid);
|
2006-09-21 06:07:39 +02:00
|
|
|
info->base_offset = base_offset;
|
2005-06-29 05:34:23 +02:00
|
|
|
info->size = size;
|
|
|
|
info->delta = delta;
|
2006-09-21 06:07:39 +02:00
|
|
|
info->nr = nr;
|
2005-06-29 05:34:23 +02:00
|
|
|
info->next = delta_list;
|
|
|
|
delta_list = info;
|
2005-06-26 00:27:14 +02:00
|
|
|
}
|
|
|
|
|
2006-09-21 06:07:39 +02:00
|
|
|
struct obj_info {
|
2007-04-09 07:06:30 +02:00
|
|
|
off_t offset;
|
2017-05-07 00:10:12 +02:00
|
|
|
struct object_id oid;
|
2008-02-25 22:46:11 +01:00
|
|
|
struct object *obj;
|
2006-09-21 06:07:39 +02:00
|
|
|
};
|
|
|
|
|
2018-03-06 11:16:14 +01:00
|
|
|
/* Remember to update object flag allocation in object.h */
|
2008-02-25 22:46:11 +01:00
|
|
|
#define FLAG_OPEN (1u<<20)
|
|
|
|
#define FLAG_WRITTEN (1u<<21)
|
|
|
|
|
2006-09-21 06:07:39 +02:00
|
|
|
static struct obj_info *obj_list;
|
2009-06-18 19:28:43 +02:00
|
|
|
static unsigned nr_objects;
|
2008-02-25 22:46:11 +01:00
|
|
|
|
2008-03-05 08:46:51 +01:00
|
|
|
/*
|
|
|
|
* Called only from check_object() after it verified this object
|
|
|
|
* is Ok.
|
|
|
|
*/
|
2014-09-10 15:52:51 +02:00
|
|
|
static void write_cached_object(struct object *obj, struct obj_buffer *obj_buf)
|
2008-02-25 22:46:11 +01:00
|
|
|
{
|
2017-05-07 00:10:12 +02:00
|
|
|
struct object_id oid;
|
2014-09-10 15:52:51 +02:00
|
|
|
|
2018-01-28 01:13:19 +01:00
|
|
|
if (write_object_file(obj_buf->buffer, obj_buf->size,
|
2018-03-06 23:54:07 +01:00
|
|
|
type_name(obj->type), &oid) < 0)
|
2015-11-10 03:22:28 +01:00
|
|
|
die("failed to write object %s", oid_to_hex(&obj->oid));
|
2008-02-25 22:46:11 +01:00
|
|
|
obj->flags |= FLAG_WRITTEN;
|
|
|
|
}
|
|
|
|
|
2008-03-05 08:46:51 +01:00
|
|
|
/*
|
|
|
|
* At the very end of the processing, write_rest() scans the objects
|
|
|
|
* that have reachability requirements and calls this function.
|
|
|
|
* Verify its reachability and validity recursively and write it out.
|
|
|
|
*/
|
2015-06-22 17:25:00 +02:00
|
|
|
static int check_object(struct object *obj, int type, void *data, struct fsck_options *options)
|
2008-02-25 22:46:11 +01:00
|
|
|
{
|
2014-09-10 15:52:51 +02:00
|
|
|
struct obj_buffer *obj_buf;
|
|
|
|
|
2008-02-25 22:46:11 +01:00
|
|
|
if (!obj)
|
2009-08-13 21:41:14 +02:00
|
|
|
return 1;
|
2008-02-25 22:46:11 +01:00
|
|
|
|
|
|
|
if (obj->flags & FLAG_WRITTEN)
|
2009-08-13 21:41:14 +02:00
|
|
|
return 0;
|
2008-02-25 22:46:11 +01:00
|
|
|
|
|
|
|
if (type != OBJ_ANY && obj->type != type)
|
|
|
|
die("object type mismatch");
|
|
|
|
|
|
|
|
if (!(obj->flags & FLAG_OPEN)) {
|
|
|
|
unsigned long size;
|
sha1_file: convert sha1_object_info* to object_id
Convert sha1_object_info and sha1_object_info_extended to take pointers
to struct object_id and rename them to use "oid" instead of "sha1" in
their names. Update the declaration and definition and apply the
following semantic patch, plus the standard object_id transforms:
@@
expression E1, E2;
@@
- sha1_object_info(E1.hash, E2)
+ oid_object_info(&E1, E2)
@@
expression E1, E2;
@@
- sha1_object_info(E1->hash, E2)
+ oid_object_info(E1, E2)
@@
expression E1, E2, E3;
@@
- sha1_object_info_extended(E1.hash, E2, E3)
+ oid_object_info_extended(&E1, E2, E3)
@@
expression E1, E2, E3;
@@
- sha1_object_info_extended(E1->hash, E2, E3)
+ oid_object_info_extended(E1, E2, E3)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-03-12 03:27:46 +01:00
|
|
|
int type = oid_object_info(&obj->oid, &size);
|
2008-02-25 22:46:11 +01:00
|
|
|
if (type != obj->type || type <= 0)
|
|
|
|
die("object of unexpected type");
|
|
|
|
obj->flags |= FLAG_WRITTEN;
|
2009-08-13 21:41:14 +02:00
|
|
|
return 0;
|
2008-02-25 22:46:11 +01:00
|
|
|
}
|
|
|
|
|
2014-09-10 15:52:51 +02:00
|
|
|
obj_buf = lookup_object_buffer(obj);
|
|
|
|
if (!obj_buf)
|
2015-11-10 03:22:28 +01:00
|
|
|
die("Whoops! Cannot find object '%s'", oid_to_hex(&obj->oid));
|
2015-06-22 17:25:00 +02:00
|
|
|
if (fsck_object(obj, obj_buf->buffer, obj_buf->size, &fsck_options))
|
2008-02-25 22:46:11 +01:00
|
|
|
die("Error in object");
|
2015-06-22 17:25:00 +02:00
|
|
|
fsck_options.walk = check_object;
|
|
|
|
if (fsck_walk(obj, NULL, &fsck_options))
|
2015-11-10 03:22:28 +01:00
|
|
|
die("Error on reachable objects of %s", oid_to_hex(&obj->oid));
|
2014-09-10 15:52:51 +02:00
|
|
|
write_cached_object(obj, obj_buf);
|
2009-08-13 21:41:14 +02:00
|
|
|
return 0;
|
2008-02-25 22:46:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void write_rest(void)
|
|
|
|
{
|
|
|
|
unsigned i;
|
2009-08-13 21:41:14 +02:00
|
|
|
for (i = 0; i < nr_objects; i++) {
|
|
|
|
if (obj_list[i].obj)
|
2015-06-22 17:25:00 +02:00
|
|
|
check_object(obj_list[i].obj, OBJ_ANY, NULL, NULL);
|
2009-08-13 21:41:14 +02:00
|
|
|
}
|
2008-02-25 22:46:11 +01:00
|
|
|
}
|
2005-06-29 05:34:23 +02:00
|
|
|
|
2007-02-26 20:55:59 +01:00
|
|
|
static void added_object(unsigned nr, enum object_type type,
|
|
|
|
void *data, unsigned long size);
|
2006-09-21 06:07:39 +02:00
|
|
|
|
2008-03-05 08:46:51 +01:00
|
|
|
/*
|
|
|
|
* Write out nr-th object from the list, now we know the contents
|
|
|
|
* of it. Under --strict, this buffers structured objects in-core,
|
|
|
|
* to be checked at the end.
|
|
|
|
*/
|
2007-02-26 20:55:59 +01:00
|
|
|
static void write_object(unsigned nr, enum object_type type,
|
|
|
|
void *buf, unsigned long size)
|
2005-06-29 18:38:02 +02:00
|
|
|
{
|
2008-02-25 22:46:11 +01:00
|
|
|
if (!strict) {
|
2018-03-06 23:54:07 +01:00
|
|
|
if (write_object_file(buf, size, type_name(type),
|
2018-01-28 01:13:19 +01:00
|
|
|
&obj_list[nr].oid) < 0)
|
2008-02-25 22:46:11 +01:00
|
|
|
die("failed to write object");
|
2008-03-05 08:46:51 +01:00
|
|
|
added_object(nr, type, buf, size);
|
2008-02-25 22:46:11 +01:00
|
|
|
free(buf);
|
2008-03-05 08:46:51 +01:00
|
|
|
obj_list[nr].obj = NULL;
|
2008-02-25 22:46:11 +01:00
|
|
|
} else if (type == OBJ_BLOB) {
|
|
|
|
struct blob *blob;
|
2018-03-06 23:54:07 +01:00
|
|
|
if (write_object_file(buf, size, type_name(type),
|
2018-01-28 01:13:19 +01:00
|
|
|
&obj_list[nr].oid) < 0)
|
2008-02-25 22:46:11 +01:00
|
|
|
die("failed to write object");
|
2008-03-05 08:46:51 +01:00
|
|
|
added_object(nr, type, buf, size);
|
2008-02-25 22:46:11 +01:00
|
|
|
free(buf);
|
|
|
|
|
2017-05-07 00:10:14 +02:00
|
|
|
blob = lookup_blob(&obj_list[nr].oid);
|
2008-02-25 22:46:11 +01:00
|
|
|
if (blob)
|
|
|
|
blob->object.flags |= FLAG_WRITTEN;
|
|
|
|
else
|
|
|
|
die("invalid blob object");
|
2008-03-05 08:46:51 +01:00
|
|
|
obj_list[nr].obj = NULL;
|
2008-02-25 22:46:11 +01:00
|
|
|
} else {
|
|
|
|
struct object *obj;
|
|
|
|
int eaten;
|
2018-03-06 23:54:07 +01:00
|
|
|
hash_object_file(buf, size, type_name(type), &obj_list[nr].oid);
|
2008-03-05 08:46:51 +01:00
|
|
|
added_object(nr, type, buf, size);
|
object: convert parse_object* to take struct object_id
Make parse_object, parse_object_or_die, and parse_object_buffer take a
pointer to struct object_id. Remove the temporary variables inserted
earlier, since they are no longer necessary. Transform all of the
callers using the following semantic patch:
@@
expression E1;
@@
- parse_object(E1.hash)
+ parse_object(&E1)
@@
expression E1;
@@
- parse_object(E1->hash)
+ parse_object(E1)
@@
expression E1, E2;
@@
- parse_object_or_die(E1.hash, E2)
+ parse_object_or_die(&E1, E2)
@@
expression E1, E2;
@@
- parse_object_or_die(E1->hash, E2)
+ parse_object_or_die(E1, E2)
@@
expression E1, E2, E3, E4, E5;
@@
- parse_object_buffer(E1.hash, E2, E3, E4, E5)
+ parse_object_buffer(&E1, E2, E3, E4, E5)
@@
expression E1, E2, E3, E4, E5;
@@
- parse_object_buffer(E1->hash, E2, E3, E4, E5)
+ parse_object_buffer(E1, E2, E3, E4, E5)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-07 00:10:38 +02:00
|
|
|
obj = parse_object_buffer(&obj_list[nr].oid, type, size, buf,
|
|
|
|
&eaten);
|
2008-02-25 22:46:11 +01:00
|
|
|
if (!obj)
|
2018-02-14 19:59:24 +01:00
|
|
|
die("invalid %s", type_name(type));
|
2008-02-25 22:46:11 +01:00
|
|
|
add_object_buffer(obj, buf, size);
|
|
|
|
obj->flags |= FLAG_OPEN;
|
|
|
|
obj_list[nr].obj = obj;
|
|
|
|
}
|
2005-06-29 18:38:02 +02:00
|
|
|
}
|
|
|
|
|
2007-02-26 20:55:59 +01:00
|
|
|
static void resolve_delta(unsigned nr, enum object_type type,
|
2006-09-04 07:55:54 +02:00
|
|
|
void *base, unsigned long base_size,
|
|
|
|
void *delta, unsigned long delta_size)
|
2005-06-26 00:27:14 +02:00
|
|
|
{
|
2005-06-29 05:34:23 +02:00
|
|
|
void *result;
|
|
|
|
unsigned long result_size;
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
result = patch_delta(base, base_size,
|
|
|
|
delta, delta_size,
|
|
|
|
&result_size);
|
|
|
|
if (!result)
|
|
|
|
die("failed to apply delta");
|
|
|
|
free(delta);
|
2007-02-26 20:55:59 +01:00
|
|
|
write_object(nr, type, result, result_size);
|
2005-06-26 00:27:14 +02:00
|
|
|
}
|
|
|
|
|
2008-03-05 08:46:51 +01:00
|
|
|
/*
|
|
|
|
* We now know the contents of an object (which is nr-th in the pack);
|
|
|
|
* resolve all the deltified objects that are based on it.
|
|
|
|
*/
|
2007-02-26 20:55:59 +01:00
|
|
|
static void added_object(unsigned nr, enum object_type type,
|
|
|
|
void *data, unsigned long size)
|
2005-06-26 00:59:31 +02:00
|
|
|
{
|
2005-06-29 05:34:23 +02:00
|
|
|
struct delta_info **p = &delta_list;
|
|
|
|
struct delta_info *info;
|
|
|
|
|
|
|
|
while ((info = *p) != NULL) {
|
2017-05-07 00:10:12 +02:00
|
|
|
if (!oidcmp(&info->base_oid, &obj_list[nr].oid) ||
|
2006-09-21 06:07:39 +02:00
|
|
|
info->base_offset == obj_list[nr].offset) {
|
2005-06-29 05:34:23 +02:00
|
|
|
*p = info->next;
|
|
|
|
p = &delta_list;
|
2006-09-21 06:07:39 +02:00
|
|
|
resolve_delta(info->nr, type, data, size,
|
|
|
|
info->delta, info->size);
|
2005-06-29 05:34:23 +02:00
|
|
|
free(info);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
p = &info->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-02-26 20:55:59 +01:00
|
|
|
static void unpack_non_delta_entry(enum object_type type, unsigned long size,
|
2006-09-21 06:07:39 +02:00
|
|
|
unsigned nr)
|
2005-06-29 05:34:23 +02:00
|
|
|
{
|
|
|
|
void *buf = get_data(size);
|
2005-06-26 13:29:18 +02:00
|
|
|
|
2006-09-04 07:55:54 +02:00
|
|
|
if (!dry_run && buf)
|
2007-02-26 20:55:59 +01:00
|
|
|
write_object(nr, type, buf, size);
|
2008-02-25 22:46:11 +01:00
|
|
|
else
|
|
|
|
free(buf);
|
2005-06-26 13:29:18 +02:00
|
|
|
}
|
|
|
|
|
2017-05-07 00:10:12 +02:00
|
|
|
static int resolve_against_held(unsigned nr, const struct object_id *base,
|
2008-03-05 08:46:51 +01:00
|
|
|
void *delta_data, unsigned long delta_size)
|
|
|
|
{
|
|
|
|
struct object *obj;
|
|
|
|
struct obj_buffer *obj_buffer;
|
2017-05-07 00:10:12 +02:00
|
|
|
obj = lookup_object(base->hash);
|
2008-03-05 08:46:51 +01:00
|
|
|
if (!obj)
|
|
|
|
return 0;
|
|
|
|
obj_buffer = lookup_object_buffer(obj);
|
|
|
|
if (!obj_buffer)
|
|
|
|
return 0;
|
|
|
|
resolve_delta(nr, obj->type, obj_buffer->buffer,
|
|
|
|
obj_buffer->size, delta_data, delta_size);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-02-26 20:55:59 +01:00
|
|
|
static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
|
2006-09-21 06:07:39 +02:00
|
|
|
unsigned nr)
|
2005-06-26 13:29:18 +02:00
|
|
|
{
|
2005-06-29 05:34:23 +02:00
|
|
|
void *delta_data, *base;
|
|
|
|
unsigned long base_size;
|
2017-05-07 00:10:12 +02:00
|
|
|
struct object_id base_oid;
|
2005-06-26 13:29:18 +02:00
|
|
|
|
2007-02-26 20:55:59 +01:00
|
|
|
if (type == OBJ_REF_DELTA) {
|
2018-02-01 03:18:40 +01:00
|
|
|
hashcpy(base_oid.hash, fill(the_hash_algo->rawsz));
|
|
|
|
use(the_hash_algo->rawsz);
|
2006-09-21 06:07:39 +02:00
|
|
|
delta_data = get_data(delta_size);
|
|
|
|
if (dry_run || !delta_data) {
|
|
|
|
free(delta_data);
|
|
|
|
return;
|
|
|
|
}
|
2017-05-07 00:10:12 +02:00
|
|
|
if (has_object_file(&base_oid))
|
2008-03-05 08:46:51 +01:00
|
|
|
; /* Ok we have this one */
|
2017-05-07 00:10:12 +02:00
|
|
|
else if (resolve_against_held(nr, &base_oid,
|
2008-03-05 08:46:51 +01:00
|
|
|
delta_data, delta_size))
|
|
|
|
return; /* we are done */
|
|
|
|
else {
|
|
|
|
/* cannot resolve yet --- queue it */
|
2017-05-07 00:10:12 +02:00
|
|
|
oidclr(&obj_list[nr].oid);
|
|
|
|
add_delta_to_list(nr, &base_oid, 0, delta_data, delta_size);
|
2006-09-21 06:07:39 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
unsigned base_found = 0;
|
|
|
|
unsigned char *pack, c;
|
2007-04-09 07:06:30 +02:00
|
|
|
off_t base_offset;
|
2006-09-21 06:07:39 +02:00
|
|
|
unsigned lo, mid, hi;
|
2005-06-26 17:40:08 +02:00
|
|
|
|
2006-09-21 06:07:39 +02:00
|
|
|
pack = fill(1);
|
|
|
|
c = *pack;
|
|
|
|
use(1);
|
|
|
|
base_offset = c & 127;
|
|
|
|
while (c & 128) {
|
|
|
|
base_offset += 1;
|
2007-04-09 07:06:29 +02:00
|
|
|
if (!base_offset || MSB(base_offset, 7))
|
2006-09-21 06:07:39 +02:00
|
|
|
die("offset value overflow for delta base object");
|
|
|
|
pack = fill(1);
|
|
|
|
c = *pack;
|
|
|
|
use(1);
|
|
|
|
base_offset = (base_offset << 7) + (c & 127);
|
|
|
|
}
|
|
|
|
base_offset = obj_list[nr].offset - base_offset;
|
2008-10-30 00:02:45 +01:00
|
|
|
if (base_offset <= 0 || base_offset >= obj_list[nr].offset)
|
|
|
|
die("offset value out of bound for delta base object");
|
2005-06-26 13:29:18 +02:00
|
|
|
|
2006-09-21 06:07:39 +02:00
|
|
|
delta_data = get_data(delta_size);
|
|
|
|
if (dry_run || !delta_data) {
|
|
|
|
free(delta_data);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
lo = 0;
|
|
|
|
hi = nr;
|
|
|
|
while (lo < hi) {
|
2017-10-08 20:29:37 +02:00
|
|
|
mid = lo + (hi - lo) / 2;
|
2006-09-21 06:07:39 +02:00
|
|
|
if (base_offset < obj_list[mid].offset) {
|
|
|
|
hi = mid;
|
|
|
|
} else if (base_offset > obj_list[mid].offset) {
|
|
|
|
lo = mid + 1;
|
|
|
|
} else {
|
2017-05-07 00:10:12 +02:00
|
|
|
oidcpy(&base_oid, &obj_list[mid].oid);
|
|
|
|
base_found = !is_null_oid(&base_oid);
|
2006-09-21 06:07:39 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!base_found) {
|
2008-03-05 08:46:51 +01:00
|
|
|
/*
|
|
|
|
* The delta base object is itself a delta that
|
|
|
|
* has not been resolved yet.
|
|
|
|
*/
|
2017-05-07 00:10:12 +02:00
|
|
|
oidclr(&obj_list[nr].oid);
|
|
|
|
add_delta_to_list(nr, &null_oid, base_offset, delta_data, delta_size);
|
2006-09-21 06:07:39 +02:00
|
|
|
return;
|
2008-02-25 22:46:10 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-07 00:10:12 +02:00
|
|
|
if (resolve_against_held(nr, &base_oid, delta_data, delta_size))
|
2008-03-05 08:46:51 +01:00
|
|
|
return;
|
2006-09-21 06:07:39 +02:00
|
|
|
|
sha1_file: convert read_sha1_file to struct object_id
Convert read_sha1_file to take a pointer to struct object_id and rename
it read_object_file. Do the same for read_sha1_file_extended.
Convert one use in grep.c to use the new function without any other code
change, since the pointer being passed is a void pointer that is already
initialized with a pointer to struct object_id. Update the declaration
and definitions of the modified functions, and apply the following
semantic patch to convert the remaining callers:
@@
expression E1, E2, E3;
@@
- read_sha1_file(E1.hash, E2, E3)
+ read_object_file(&E1, E2, E3)
@@
expression E1, E2, E3;
@@
- read_sha1_file(E1->hash, E2, E3)
+ read_object_file(E1, E2, E3)
@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1.hash, E2, E3, E4)
+ read_object_file_extended(&E1, E2, E3, E4)
@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1->hash, E2, E3, E4)
+ read_object_file_extended(E1, E2, E3, E4)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-03-12 03:27:53 +01:00
|
|
|
base = read_object_file(&base_oid, &type, &base_size);
|
2006-09-04 07:55:54 +02:00
|
|
|
if (!base) {
|
|
|
|
error("failed to read delta-pack base object %s",
|
2017-05-07 00:10:12 +02:00
|
|
|
oid_to_hex(&base_oid));
|
2006-09-13 21:59:20 +02:00
|
|
|
if (!recover)
|
2006-09-04 07:55:54 +02:00
|
|
|
exit(1);
|
|
|
|
has_errors = 1;
|
|
|
|
return;
|
|
|
|
}
|
2006-09-21 06:07:39 +02:00
|
|
|
resolve_delta(nr, type, base, base_size, delta_data, delta_size);
|
2005-08-03 14:11:00 +02:00
|
|
|
free(base);
|
2005-06-26 13:29:18 +02:00
|
|
|
}
|
|
|
|
|
2007-04-18 20:27:45 +02:00
|
|
|
static void unpack_one(unsigned nr)
|
2005-06-26 13:29:18 +02:00
|
|
|
{
|
2005-06-29 07:15:57 +02:00
|
|
|
unsigned shift;
|
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 02:22:27 +02:00
|
|
|
unsigned char *pack;
|
|
|
|
unsigned long size, c;
|
2005-06-29 05:34:23 +02:00
|
|
|
enum object_type type;
|
2005-06-26 00:59:31 +02:00
|
|
|
|
2006-09-21 06:07:39 +02:00
|
|
|
obj_list[nr].offset = consumed_bytes;
|
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
pack = fill(1);
|
|
|
|
c = *pack;
|
|
|
|
use(1);
|
2005-06-28 23:21:02 +02:00
|
|
|
type = (c >> 4) & 7;
|
|
|
|
size = (c & 15);
|
2005-06-29 07:15:57 +02:00
|
|
|
shift = 4;
|
2005-06-28 23:21:02 +02:00
|
|
|
while (c & 0x80) {
|
2005-06-29 05:34:23 +02:00
|
|
|
pack = fill(1);
|
2006-09-21 06:07:39 +02:00
|
|
|
c = *pack;
|
2005-06-29 05:34:23 +02:00
|
|
|
use(1);
|
2005-06-29 07:15:57 +02:00
|
|
|
size += (c & 0x7f) << shift;
|
|
|
|
shift += 7;
|
2005-06-28 23:21:02 +02:00
|
|
|
}
|
2007-04-18 20:27:45 +02:00
|
|
|
|
2005-06-28 23:21:02 +02:00
|
|
|
switch (type) {
|
|
|
|
case OBJ_COMMIT:
|
|
|
|
case OBJ_TREE:
|
|
|
|
case OBJ_BLOB:
|
|
|
|
case OBJ_TAG:
|
2006-09-21 06:07:39 +02:00
|
|
|
unpack_non_delta_entry(type, size, nr);
|
2005-06-28 23:21:02 +02:00
|
|
|
return;
|
2006-09-21 06:06:49 +02:00
|
|
|
case OBJ_REF_DELTA:
|
2006-09-21 06:07:39 +02:00
|
|
|
case OBJ_OFS_DELTA:
|
|
|
|
unpack_delta_entry(type, size, nr);
|
2005-06-28 23:21:02 +02:00
|
|
|
return;
|
2005-06-29 05:34:23 +02:00
|
|
|
default:
|
2006-09-04 07:55:54 +02:00
|
|
|
error("bad object type %d", type);
|
|
|
|
has_errors = 1;
|
2006-09-13 21:59:20 +02:00
|
|
|
if (recover)
|
2006-09-04 07:55:54 +02:00
|
|
|
return;
|
|
|
|
exit(1);
|
2005-06-26 00:59:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void unpack_all(void)
|
|
|
|
{
|
2005-06-29 05:34:23 +02:00
|
|
|
int i;
|
2007-10-30 19:57:32 +01:00
|
|
|
struct progress *progress = NULL;
|
2005-06-29 05:34:23 +02:00
|
|
|
struct pack_header *hdr = fill(sizeof(struct pack_header));
|
2008-02-25 22:46:11 +01:00
|
|
|
|
|
|
|
nr_objects = ntohl(hdr->hdr_entries);
|
2005-06-29 05:34:23 +02:00
|
|
|
|
|
|
|
if (ntohl(hdr->hdr_signature) != PACK_SIGNATURE)
|
|
|
|
die("bad pack file");
|
2006-02-09 23:50:04 +01:00
|
|
|
if (!pack_version_ok(hdr->hdr_version))
|
2008-07-03 17:52:09 +02:00
|
|
|
die("unknown pack file version %"PRIu32,
|
|
|
|
ntohl(hdr->hdr_version));
|
2007-04-18 20:27:45 +02:00
|
|
|
use(sizeof(struct pack_header));
|
2005-06-29 05:34:23 +02:00
|
|
|
|
2007-04-20 20:10:07 +02:00
|
|
|
if (!quiet)
|
2014-02-21 13:50:18 +01:00
|
|
|
progress = start_progress(_("Unpacking objects"), nr_objects);
|
2008-10-07 01:39:10 +02:00
|
|
|
obj_list = xcalloc(nr_objects, sizeof(*obj_list));
|
2007-04-18 20:27:45 +02:00
|
|
|
for (i = 0; i < nr_objects; i++) {
|
|
|
|
unpack_one(i);
|
2007-10-30 19:57:33 +01:00
|
|
|
display_progress(progress, i + 1);
|
2007-04-18 20:27:45 +02:00
|
|
|
}
|
2007-10-30 19:57:33 +01:00
|
|
|
stop_progress(&progress);
|
2007-04-18 20:27:45 +02:00
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
if (delta_list)
|
|
|
|
die("unresolved deltas left after unpacking");
|
2005-06-26 00:59:31 +02:00
|
|
|
}
|
|
|
|
|
2006-08-03 17:24:37 +02:00
|
|
|
int cmd_unpack_objects(int argc, const char **argv, const char *prefix)
|
2005-06-26 00:27:14 +02:00
|
|
|
{
|
|
|
|
int i;
|
2017-05-07 00:10:12 +02:00
|
|
|
struct object_id oid;
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2014-02-18 12:24:55 +01:00
|
|
|
check_replace_refs = 0;
|
2009-01-23 10:07:46 +01:00
|
|
|
|
2008-05-14 19:46:53 +02:00
|
|
|
git_config(git_default_config, NULL);
|
2005-11-26 09:50:02 +01:00
|
|
|
|
2006-01-07 03:53:16 +01:00
|
|
|
quiet = !isatty(2);
|
|
|
|
|
2005-06-26 00:27:14 +02:00
|
|
|
for (i = 1 ; i < argc; i++) {
|
|
|
|
const char *arg = argv[i];
|
|
|
|
|
|
|
|
if (*arg == '-') {
|
2005-06-26 00:59:31 +02:00
|
|
|
if (!strcmp(arg, "-n")) {
|
|
|
|
dry_run = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-07-09 19:43:02 +02:00
|
|
|
if (!strcmp(arg, "-q")) {
|
|
|
|
quiet = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2006-09-04 07:55:54 +02:00
|
|
|
if (!strcmp(arg, "-r")) {
|
2006-09-13 21:59:20 +02:00
|
|
|
recover = 1;
|
2006-09-04 07:55:54 +02:00
|
|
|
continue;
|
|
|
|
}
|
2008-02-25 22:46:11 +01:00
|
|
|
if (!strcmp(arg, "--strict")) {
|
|
|
|
strict = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2015-06-22 17:25:31 +02:00
|
|
|
if (skip_prefix(arg, "--strict=", &arg)) {
|
|
|
|
strict = 1;
|
|
|
|
fsck_set_msg_types(&fsck_options, arg);
|
|
|
|
continue;
|
|
|
|
}
|
2013-11-30 21:55:40 +01:00
|
|
|
if (starts_with(arg, "--pack_header=")) {
|
2006-11-01 23:06:20 +01:00
|
|
|
struct pack_header *hdr;
|
|
|
|
char *c;
|
|
|
|
|
|
|
|
hdr = (struct pack_header *)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);
|
|
|
|
len = sizeof(*hdr);
|
|
|
|
continue;
|
|
|
|
}
|
2016-08-24 20:41:56 +02:00
|
|
|
if (skip_prefix(arg, "--max-input-size=", &arg)) {
|
|
|
|
max_input_size = strtoumax(arg, NULL, 10);
|
|
|
|
continue;
|
|
|
|
}
|
2005-06-26 00:27:14 +02:00
|
|
|
usage(unpack_usage);
|
|
|
|
}
|
2005-06-29 05:34:23 +02:00
|
|
|
|
|
|
|
/* We don't take any non-flag arguments now.. Maybe some day */
|
2005-06-26 00:27:14 +02:00
|
|
|
usage(unpack_usage);
|
2005-06-29 05:34:23 +02:00
|
|
|
}
|
2018-02-01 03:18:40 +01:00
|
|
|
the_hash_algo->init_fn(&ctx);
|
2005-06-26 00:59:31 +02:00
|
|
|
unpack_all();
|
2018-02-01 03:18:40 +01:00
|
|
|
the_hash_algo->update_fn(&ctx, buffer, offset);
|
|
|
|
the_hash_algo->final_fn(oid.hash, &ctx);
|
2008-02-25 22:46:11 +01:00
|
|
|
if (strict)
|
|
|
|
write_rest();
|
2018-02-01 03:18:40 +01:00
|
|
|
if (hashcmp(fill(the_hash_algo->rawsz), oid.hash))
|
2005-06-29 05:34:23 +02:00
|
|
|
die("final sha1 did not match");
|
2018-02-01 03:18:40 +01:00
|
|
|
use(the_hash_algo->rawsz);
|
2005-06-29 05:34:23 +02:00
|
|
|
|
|
|
|
/* Write the last part of the buffer to stdout */
|
|
|
|
while (len) {
|
2005-12-20 01:18:28 +01:00
|
|
|
int ret = xwrite(1, buffer + offset, len);
|
|
|
|
if (ret <= 0)
|
2005-06-29 05:34:23 +02:00
|
|
|
break;
|
|
|
|
len -= ret;
|
|
|
|
offset += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* All done */
|
2006-09-04 07:55:54 +02:00
|
|
|
return has_errors;
|
2005-06-26 00:27:14 +02:00
|
|
|
}
|