2007-07-14 23:14:45 +00:00
|
|
|
#include "builtin.h"
|
2005-04-30 16:59:31 +00:00
|
|
|
#include "cache.h"
|
2005-04-18 18:39:48 +00:00
|
|
|
#include "commit.h"
|
|
|
|
#include "tree.h"
|
|
|
|
#include "blob.h"
|
2005-04-28 14:46:33 +00:00
|
|
|
#include "tag.h"
|
2005-07-03 17:01:38 +00:00
|
|
|
#include "refs.h"
|
2005-06-29 09:51:27 +00:00
|
|
|
#include "pack.h"
|
2006-04-25 23:37:08 +00:00
|
|
|
#include "cache-tree.h"
|
2006-05-29 19:19:02 +00:00
|
|
|
#include "tree-walk.h"
|
2008-02-25 21:46:05 +00:00
|
|
|
#include "fsck.h"
|
2007-10-15 20:34:05 +00:00
|
|
|
#include "parse-options.h"
|
2009-01-10 12:07:50 +00:00
|
|
|
#include "dir.h"
|
2011-11-07 02:59:26 +00:00
|
|
|
#include "progress.h"
|
2012-03-07 10:54:20 +00:00
|
|
|
#include "streaming.h"
|
2005-04-18 18:39:48 +00:00
|
|
|
|
|
|
|
#define REACHABLE 0x0001
|
2006-05-29 19:18:33 +00:00
|
|
|
#define SEEN 0x0002
|
2013-06-05 22:37:39 +00:00
|
|
|
#define HAS_OBJ 0x0004
|
2005-04-13 16:57:30 +00:00
|
|
|
|
2006-08-15 17:23:48 +00:00
|
|
|
static int show_root;
|
|
|
|
static int show_tags;
|
|
|
|
static int show_unreachable;
|
2007-04-04 14:46:14 +00:00
|
|
|
static int include_reflogs = 1;
|
2009-10-20 18:46:55 +00:00
|
|
|
static int check_full = 1;
|
2006-08-15 17:23:48 +00:00
|
|
|
static int check_strict;
|
|
|
|
static int keep_cache_objects;
|
2005-04-13 16:57:30 +00:00
|
|
|
static unsigned char head_sha1[20];
|
2009-01-30 08:33:00 +00:00
|
|
|
static const char *head_points_at;
|
2007-03-05 08:22:06 +00:00
|
|
|
static int errors_found;
|
2007-07-03 00:33:54 +00:00
|
|
|
static int write_lost_and_found;
|
2007-06-05 02:44:00 +00:00
|
|
|
static int verbose;
|
2011-11-07 02:59:26 +00:00
|
|
|
static int show_progress = -1;
|
2012-02-28 22:55:39 +00:00
|
|
|
static int show_dangling = 1;
|
2007-03-05 08:22:06 +00:00
|
|
|
#define ERROR_OBJECT 01
|
|
|
|
#define ERROR_REACHABLE 02
|
2011-11-07 02:59:23 +00:00
|
|
|
#define ERROR_PACK 04
|
2005-04-13 16:57:30 +00:00
|
|
|
|
2006-02-26 15:13:46 +00:00
|
|
|
#ifdef NO_D_INO_IN_DIRENT
|
2006-01-20 01:13:51 +00:00
|
|
|
#define SORT_DIRENT 0
|
|
|
|
#define DIRENT_SORT_HINT(de) 0
|
|
|
|
#else
|
|
|
|
#define SORT_DIRENT 1
|
|
|
|
#define DIRENT_SORT_HINT(de) ((de)->d_ino)
|
|
|
|
#endif
|
2005-09-20 18:56:05 +00:00
|
|
|
|
|
|
|
static void objreport(struct object *obj, const char *severity,
|
|
|
|
const char *err, va_list params)
|
|
|
|
{
|
|
|
|
fprintf(stderr, "%s in %s %s: ",
|
Shrink "struct object" a bit
This shrinks "struct object" by a small amount, by getting rid of the
"struct type *" pointer and replacing it with a 3-bit bitfield instead.
In addition, we merge the bitfields and the "flags" field, which
incidentally should also remove a useless 4-byte padding from the object
when in 64-bit mode.
Now, our "struct object" is still too damn large, but it's now less
obviously bloated, and of the remaining fields, only the "util" (which is
not used by most things) is clearly something that should be eventually
discarded.
This shrinks the "git-rev-list --all" memory use by about 2.5% on the
kernel archive (and, perhaps more importantly, on the larger mozilla
archive). That may not sound like much, but I suspect it's more on a
64-bit platform.
There are other remaining inefficiencies (the parent lists, for example,
probably have horrible malloc overhead), but this was pretty obvious.
Most of the patch is just changing the comparison of the "type" pointer
from one of the constant string pointers to the appropriate new TYPE_xxx
small integer constant.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-14 23:45:13 +00:00
|
|
|
severity, typename(obj->type), sha1_to_hex(obj->sha1));
|
2005-09-20 18:56:05 +00:00
|
|
|
vfprintf(stderr, err, params);
|
|
|
|
fputs("\n", stderr);
|
|
|
|
}
|
|
|
|
|
2009-11-14 21:33:13 +00:00
|
|
|
__attribute__((format (printf, 2, 3)))
|
2005-09-28 12:04:54 +00:00
|
|
|
static int objerror(struct object *obj, const char *err, ...)
|
2005-09-20 18:56:05 +00:00
|
|
|
{
|
|
|
|
va_list params;
|
|
|
|
va_start(params, err);
|
2007-03-05 08:22:06 +00:00
|
|
|
errors_found |= ERROR_OBJECT;
|
2005-09-20 18:56:05 +00:00
|
|
|
objreport(obj, "error", err, params);
|
|
|
|
va_end(params);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-11-14 21:33:13 +00:00
|
|
|
__attribute__((format (printf, 3, 4)))
|
2008-02-25 21:46:08 +00:00
|
|
|
static int fsck_error_func(struct object *obj, int type, const char *err, ...)
|
2005-09-20 18:56:05 +00:00
|
|
|
{
|
|
|
|
va_list params;
|
|
|
|
va_start(params, err);
|
2008-02-25 21:46:08 +00:00
|
|
|
objreport(obj, (type == FSCK_WARN) ? "warning" : "error", err, params);
|
2005-09-20 18:56:05 +00:00
|
|
|
va_end(params);
|
2008-02-25 21:46:08 +00:00
|
|
|
return (type == FSCK_WARN) ? 0 : 1;
|
2005-09-20 18:56:05 +00:00
|
|
|
}
|
|
|
|
|
2008-12-11 03:44:37 +00:00
|
|
|
static struct object_array pending;
|
|
|
|
|
2008-02-25 21:46:05 +00:00
|
|
|
static int mark_object(struct object *obj, int type, void *data)
|
|
|
|
{
|
|
|
|
struct object *parent = data;
|
|
|
|
|
2011-01-26 20:46:55 +00:00
|
|
|
/*
|
|
|
|
* The only case data is NULL or type is OBJ_ANY is when
|
|
|
|
* mark_object_reachable() calls us. All the callers of
|
|
|
|
* that function has non-NULL obj hence ...
|
|
|
|
*/
|
2008-02-25 21:46:05 +00:00
|
|
|
if (!obj) {
|
2011-01-26 20:46:55 +00:00
|
|
|
/* ... these references to parent->fld are safe here */
|
2008-02-25 21:46:05 +00:00
|
|
|
printf("broken link from %7s %s\n",
|
|
|
|
typename(parent->type), sha1_to_hex(parent->sha1));
|
|
|
|
printf("broken link from %7s %s\n",
|
|
|
|
(type == OBJ_ANY ? "unknown" : typename(type)), "unknown");
|
|
|
|
errors_found |= ERROR_REACHABLE;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type != OBJ_ANY && obj->type != type)
|
2011-01-26 20:46:55 +00:00
|
|
|
/* ... and the reference to parent is safe here */
|
2008-02-25 21:46:05 +00:00
|
|
|
objerror(parent, "wrong object type in link");
|
|
|
|
|
|
|
|
if (obj->flags & REACHABLE)
|
|
|
|
return 0;
|
|
|
|
obj->flags |= REACHABLE;
|
2013-06-05 22:37:39 +00:00
|
|
|
if (!(obj->flags & HAS_OBJ)) {
|
2008-02-25 21:46:05 +00:00
|
|
|
if (parent && !has_sha1_file(obj->sha1)) {
|
|
|
|
printf("broken link from %7s %s\n",
|
|
|
|
typename(parent->type), sha1_to_hex(parent->sha1));
|
|
|
|
printf(" to %7s %s\n",
|
|
|
|
typename(obj->type), sha1_to_hex(obj->sha1));
|
|
|
|
errors_found |= ERROR_REACHABLE;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2008-12-11 03:44:37 +00:00
|
|
|
add_object_array(obj, (void *) parent, &pending);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mark_object_reachable(struct object *obj)
|
|
|
|
{
|
2009-06-18 17:28:43 +00:00
|
|
|
mark_object(obj, OBJ_ANY, NULL);
|
2008-12-11 03:44:37 +00:00
|
|
|
}
|
|
|
|
|
2011-01-26 20:46:55 +00:00
|
|
|
static int traverse_one_object(struct object *obj)
|
2008-12-11 03:44:37 +00:00
|
|
|
{
|
|
|
|
int result;
|
|
|
|
struct tree *tree = NULL;
|
|
|
|
|
2008-02-25 21:46:05 +00:00
|
|
|
if (obj->type == OBJ_TREE) {
|
|
|
|
tree = (struct tree *)obj;
|
|
|
|
if (parse_tree(tree) < 0)
|
|
|
|
return 1; /* error already displayed */
|
|
|
|
}
|
|
|
|
result = fsck_walk(obj, mark_object, obj);
|
2013-06-05 22:37:39 +00:00
|
|
|
if (tree)
|
|
|
|
free_tree_buffer(tree);
|
2008-02-25 21:46:05 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2008-12-11 03:44:37 +00:00
|
|
|
static int traverse_reachable(void)
|
2008-02-25 21:46:05 +00:00
|
|
|
{
|
2011-11-07 02:59:26 +00:00
|
|
|
struct progress *progress = NULL;
|
|
|
|
unsigned int nr = 0;
|
2008-12-11 03:44:37 +00:00
|
|
|
int result = 0;
|
2011-11-07 02:59:26 +00:00
|
|
|
if (show_progress)
|
|
|
|
progress = start_progress_delay("Checking connectivity", 0, 0, 2);
|
2008-12-11 03:44:37 +00:00
|
|
|
while (pending.nr) {
|
|
|
|
struct object_array_entry *entry;
|
2011-03-22 12:50:08 +00:00
|
|
|
struct object *obj;
|
2008-12-11 03:44:37 +00:00
|
|
|
|
|
|
|
entry = pending.objects + --pending.nr;
|
|
|
|
obj = entry->item;
|
2011-01-26 20:46:55 +00:00
|
|
|
result |= traverse_one_object(obj);
|
2011-11-07 02:59:26 +00:00
|
|
|
display_progress(progress, ++nr);
|
2008-12-11 03:44:37 +00:00
|
|
|
}
|
2011-11-07 02:59:26 +00:00
|
|
|
stop_progress(&progress);
|
2008-12-11 03:44:37 +00:00
|
|
|
return !!result;
|
2008-02-25 21:46:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int mark_used(struct object *obj, int type, void *data)
|
|
|
|
{
|
|
|
|
if (!obj)
|
|
|
|
return 1;
|
|
|
|
obj->used = 1;
|
|
|
|
return 0;
|
2005-09-20 18:56:05 +00:00
|
|
|
}
|
|
|
|
|
2007-01-22 06:26:41 +00:00
|
|
|
/*
|
|
|
|
* Check a single reachable object
|
|
|
|
*/
|
|
|
|
static void check_reachable_object(struct object *obj)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* We obviously want the object to be parsed,
|
|
|
|
* except if it was in a pack-file and we didn't
|
|
|
|
* do a full fsck
|
|
|
|
*/
|
2013-06-05 22:37:39 +00:00
|
|
|
if (!(obj->flags & HAS_OBJ)) {
|
2009-02-28 07:15:53 +00:00
|
|
|
if (has_sha1_pack(obj->sha1))
|
2007-01-22 06:26:41 +00:00
|
|
|
return; /* it is in pack - forget about it */
|
|
|
|
printf("missing %s %s\n", typename(obj->type), sha1_to_hex(obj->sha1));
|
2007-03-05 08:22:06 +00:00
|
|
|
errors_found |= ERROR_REACHABLE;
|
2007-01-22 06:26:41 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check a single unreachable object
|
|
|
|
*/
|
|
|
|
static void check_unreachable_object(struct object *obj)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Missing unreachable object? Ignore it. It's not like
|
|
|
|
* we miss it (since it can't be reached), nor do we want
|
|
|
|
* to complain about it being unreachable (since it does
|
|
|
|
* not exist).
|
|
|
|
*/
|
|
|
|
if (!obj->parsed)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Unreachable object that exists? Show it if asked to,
|
|
|
|
* since this is something that is prunable.
|
|
|
|
*/
|
|
|
|
if (show_unreachable) {
|
|
|
|
printf("unreachable %s %s\n", typename(obj->type), sha1_to_hex(obj->sha1));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "!used" means that nothing at all points to it, including
|
2007-02-04 04:49:16 +00:00
|
|
|
* other unreachable objects. In other words, it's the "tip"
|
2007-01-22 06:26:41 +00:00
|
|
|
* of some set of unreachable objects, usually a commit that
|
|
|
|
* got dropped.
|
|
|
|
*
|
|
|
|
* Such starting points are more interesting than some random
|
|
|
|
* set of unreachable objects, so we show them even if the user
|
|
|
|
* hasn't asked for _all_ unreachable objects. If you have
|
|
|
|
* deleted a branch by mistake, this is a prime candidate to
|
|
|
|
* start looking at, for example.
|
|
|
|
*/
|
|
|
|
if (!obj->used) {
|
2012-02-28 22:55:39 +00:00
|
|
|
if (show_dangling)
|
|
|
|
printf("dangling %s %s\n", typename(obj->type),
|
|
|
|
sha1_to_hex(obj->sha1));
|
2007-07-03 00:33:54 +00:00
|
|
|
if (write_lost_and_found) {
|
|
|
|
char *filename = git_path("lost-found/%s/%s",
|
|
|
|
obj->type == OBJ_COMMIT ? "commit" : "other",
|
|
|
|
sha1_to_hex(obj->sha1));
|
|
|
|
FILE *f;
|
|
|
|
|
|
|
|
if (safe_create_leading_directories(filename)) {
|
|
|
|
error("Could not create lost-found");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!(f = fopen(filename, "w")))
|
2009-06-27 15:58:47 +00:00
|
|
|
die_errno("Could not open '%s'", filename);
|
2007-07-22 20:20:26 +00:00
|
|
|
if (obj->type == OBJ_BLOB) {
|
2012-03-07 10:54:20 +00:00
|
|
|
if (stream_blob_to_fd(fileno(f), obj->sha1, NULL, 1))
|
2011-09-12 01:03:38 +00:00
|
|
|
die_errno("Could not write '%s'", filename);
|
2007-07-22 20:20:26 +00:00
|
|
|
} else
|
|
|
|
fprintf(f, "%s\n", sha1_to_hex(obj->sha1));
|
2008-12-05 00:35:48 +00:00
|
|
|
if (fclose(f))
|
2009-06-27 15:58:46 +00:00
|
|
|
die_errno("Could not finish '%s'",
|
|
|
|
filename);
|
2007-07-03 00:33:54 +00:00
|
|
|
}
|
2007-01-22 06:26:41 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Otherwise? It's there, it's unreachable, and some other unreachable
|
|
|
|
* object points to it. Ignore it - it's not interesting, and we showed
|
|
|
|
* all the interesting cases above.
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
|
|
|
|
static void check_object(struct object *obj)
|
|
|
|
{
|
2007-06-05 02:44:00 +00:00
|
|
|
if (verbose)
|
|
|
|
fprintf(stderr, "Checking %s\n", sha1_to_hex(obj->sha1));
|
|
|
|
|
2007-01-22 06:26:41 +00:00
|
|
|
if (obj->flags & REACHABLE)
|
|
|
|
check_reachable_object(obj);
|
|
|
|
else
|
|
|
|
check_unreachable_object(obj);
|
|
|
|
}
|
2005-09-20 18:56:05 +00:00
|
|
|
|
2005-04-11 06:13:09 +00:00
|
|
|
static void check_connectivity(void)
|
|
|
|
{
|
2006-06-30 04:38:55 +00:00
|
|
|
int i, max;
|
2005-04-11 06:13:09 +00:00
|
|
|
|
2008-12-11 03:44:37 +00:00
|
|
|
/* Traverse the pending reachable objects */
|
|
|
|
traverse_reachable();
|
|
|
|
|
2005-04-11 06:13:09 +00:00
|
|
|
/* Look up all the requirements, warn about missing objects.. */
|
2006-06-30 04:38:55 +00:00
|
|
|
max = get_max_object_index();
|
2007-06-05 02:44:00 +00:00
|
|
|
if (verbose)
|
|
|
|
fprintf(stderr, "Checking connectivity (%d objects)\n", max);
|
|
|
|
|
2006-06-30 04:38:55 +00:00
|
|
|
for (i = 0; i < max; i++) {
|
|
|
|
struct object *obj = get_indexed_object(i);
|
2005-04-11 06:13:09 +00:00
|
|
|
|
2007-01-22 06:26:41 +00:00
|
|
|
if (obj)
|
|
|
|
check_object(obj);
|
2005-04-11 06:13:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-11-07 02:59:25 +00:00
|
|
|
static int fsck_obj(struct object *obj)
|
2005-05-02 23:13:18 +00:00
|
|
|
{
|
2008-02-25 21:46:08 +00:00
|
|
|
if (obj->flags & SEEN)
|
2005-05-02 23:13:18 +00:00
|
|
|
return 0;
|
2008-02-25 21:46:08 +00:00
|
|
|
obj->flags |= SEEN;
|
2005-05-02 23:13:18 +00:00
|
|
|
|
2007-06-05 02:44:00 +00:00
|
|
|
if (verbose)
|
2008-02-25 21:46:08 +00:00
|
|
|
fprintf(stderr, "Checking %s %s\n",
|
|
|
|
typename(obj->type), sha1_to_hex(obj->sha1));
|
2005-05-05 23:18:48 +00:00
|
|
|
|
2009-06-18 17:28:43 +00:00
|
|
|
if (fsck_walk(obj, mark_used, NULL))
|
2008-02-25 21:46:08 +00:00
|
|
|
objerror(obj, "broken links");
|
|
|
|
if (fsck_object(obj, check_strict, fsck_error_func))
|
|
|
|
return -1;
|
2005-05-02 23:13:18 +00:00
|
|
|
|
2008-02-25 21:46:08 +00:00
|
|
|
if (obj->type == OBJ_TREE) {
|
|
|
|
struct tree *item = (struct tree *) obj;
|
2005-05-02 23:13:18 +00:00
|
|
|
|
2013-06-05 22:37:39 +00:00
|
|
|
free_tree_buffer(item);
|
2005-04-09 00:11:14 +00:00
|
|
|
}
|
|
|
|
|
2008-02-25 21:46:08 +00:00
|
|
|
if (obj->type == OBJ_COMMIT) {
|
|
|
|
struct commit *commit = (struct commit *) obj;
|
2005-07-27 22:16:03 +00:00
|
|
|
|
2008-02-25 21:46:08 +00:00
|
|
|
free(commit->buffer);
|
|
|
|
commit->buffer = NULL;
|
2005-04-24 21:10:55 +00:00
|
|
|
|
2008-02-25 21:46:08 +00:00
|
|
|
if (!commit->parents && show_root)
|
|
|
|
printf("root %s\n", sha1_to_hex(commit->object.sha1));
|
|
|
|
}
|
2005-05-03 14:57:56 +00:00
|
|
|
|
2008-02-25 21:46:08 +00:00
|
|
|
if (obj->type == OBJ_TAG) {
|
|
|
|
struct tag *tag = (struct tag *) obj;
|
2007-06-05 02:44:00 +00:00
|
|
|
|
2008-02-25 21:46:08 +00:00
|
|
|
if (show_tags && tag->tagged) {
|
|
|
|
printf("tagged %s %s", typename(tag->tagged->type), sha1_to_hex(tag->tagged->sha1));
|
|
|
|
printf(" (%s) in %s\n", tag->tag, sha1_to_hex(tag->object.sha1));
|
|
|
|
}
|
2005-05-03 14:57:56 +00:00
|
|
|
}
|
2005-04-25 23:31:13 +00:00
|
|
|
|
2005-04-18 18:39:48 +00:00
|
|
|
return 0;
|
2005-04-08 22:02:42 +00:00
|
|
|
}
|
|
|
|
|
2011-11-07 02:59:25 +00:00
|
|
|
static int fsck_sha1(const unsigned char *sha1)
|
|
|
|
{
|
|
|
|
struct object *obj = parse_object(sha1);
|
|
|
|
if (!obj) {
|
|
|
|
errors_found |= ERROR_OBJECT;
|
|
|
|
return error("%s: object corrupt or missing",
|
|
|
|
sha1_to_hex(sha1));
|
|
|
|
}
|
2013-06-05 22:37:39 +00:00
|
|
|
obj->flags |= HAS_OBJ;
|
2011-11-07 02:59:25 +00:00
|
|
|
return fsck_obj(obj);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int fsck_obj_buffer(const unsigned char *sha1, enum object_type type,
|
|
|
|
unsigned long size, void *buffer, int *eaten)
|
|
|
|
{
|
|
|
|
struct object *obj;
|
|
|
|
obj = parse_object_buffer(sha1, type, size, buffer, eaten);
|
|
|
|
if (!obj) {
|
|
|
|
errors_found |= ERROR_OBJECT;
|
|
|
|
return error("%s: object corrupt or missing", sha1_to_hex(sha1));
|
|
|
|
}
|
2013-06-05 22:37:39 +00:00
|
|
|
obj->flags = HAS_OBJ;
|
2011-11-07 02:59:25 +00:00
|
|
|
return fsck_obj(obj);
|
|
|
|
}
|
|
|
|
|
2005-05-02 16:06:33 +00:00
|
|
|
/*
|
|
|
|
* This is the sorting chunk size: make it reasonably
|
|
|
|
* big so that we can sort well..
|
|
|
|
*/
|
|
|
|
#define MAX_SHA1_ENTRIES (1024)
|
|
|
|
|
|
|
|
struct sha1_entry {
|
|
|
|
unsigned long ino;
|
2005-04-08 22:02:42 +00:00
|
|
|
unsigned char sha1[20];
|
2005-05-02 16:06:33 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct {
|
|
|
|
unsigned long nr;
|
|
|
|
struct sha1_entry *entry[MAX_SHA1_ENTRIES];
|
|
|
|
} sha1_list;
|
|
|
|
|
|
|
|
static int ino_compare(const void *_a, const void *_b)
|
|
|
|
{
|
|
|
|
const struct sha1_entry *a = _a, *b = _b;
|
|
|
|
unsigned long ino1 = a->ino, ino2 = b->ino;
|
|
|
|
return ino1 < ino2 ? -1 : ino1 > ino2 ? 1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void fsck_sha1_list(void)
|
|
|
|
{
|
|
|
|
int i, nr = sha1_list.nr;
|
|
|
|
|
2006-01-20 01:13:51 +00:00
|
|
|
if (SORT_DIRENT)
|
|
|
|
qsort(sha1_list.entry, nr,
|
|
|
|
sizeof(struct sha1_entry *), ino_compare);
|
2005-05-02 16:06:33 +00:00
|
|
|
for (i = 0; i < nr; i++) {
|
|
|
|
struct sha1_entry *entry = sha1_list.entry[i];
|
|
|
|
unsigned char *sha1 = entry->sha1;
|
|
|
|
|
|
|
|
sha1_list.entry[i] = NULL;
|
2005-09-20 18:56:05 +00:00
|
|
|
fsck_sha1(sha1);
|
2005-05-02 16:06:33 +00:00
|
|
|
free(entry);
|
2005-04-08 22:02:42 +00:00
|
|
|
}
|
2005-05-02 16:06:33 +00:00
|
|
|
sha1_list.nr = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void add_sha1_list(unsigned char *sha1, unsigned long ino)
|
|
|
|
{
|
|
|
|
struct sha1_entry *entry = xmalloc(sizeof(*entry));
|
|
|
|
int nr;
|
|
|
|
|
|
|
|
entry->ino = ino;
|
2006-08-23 06:49:00 +00:00
|
|
|
hashcpy(entry->sha1, sha1);
|
2005-05-02 16:06:33 +00:00
|
|
|
nr = sha1_list.nr;
|
|
|
|
if (nr == MAX_SHA1_ENTRIES) {
|
|
|
|
fsck_sha1_list();
|
|
|
|
nr = 0;
|
|
|
|
}
|
|
|
|
sha1_list.entry[nr] = entry;
|
|
|
|
sha1_list.nr = ++nr;
|
2005-04-08 22:02:42 +00:00
|
|
|
}
|
|
|
|
|
2011-01-26 21:01:54 +00:00
|
|
|
static inline int is_loose_object_file(struct dirent *de,
|
|
|
|
char *name, unsigned char *sha1)
|
|
|
|
{
|
|
|
|
if (strlen(de->d_name) != 38)
|
|
|
|
return 0;
|
|
|
|
memcpy(name + 2, de->d_name, 39);
|
|
|
|
return !get_sha1_hex(name, sha1);
|
|
|
|
}
|
|
|
|
|
2006-08-14 20:36:18 +00:00
|
|
|
static void fsck_dir(int i, char *path)
|
2005-04-08 22:02:42 +00:00
|
|
|
{
|
|
|
|
DIR *dir = opendir(path);
|
|
|
|
struct dirent *de;
|
2011-01-26 21:01:54 +00:00
|
|
|
char name[100];
|
2005-04-08 22:02:42 +00:00
|
|
|
|
Create object subdirectories on demand
This makes it possible to have a "sparse" git object subdirectory
structure, something that has become much more attractive now that people
use pack-files all the time.
As a result of pack-files, a git object directory doesn't necessarily have
any individual objects lying around, and in that case it's just wasting
space to keep the empty first-level object directories around: on many
filesystems the 256 empty directories will be aboue 1MB of diskspace.
Even more importantly, after you re-pack a project that _used_ to be
unpacked, you could be left with huge directories that no longer contain
anything, but that waste space and take time to look through.
With this change, "git prune-packed" can just do an rmdir() on the
directories, and they'll get removed if empty, and re-created on demand.
This patch also tries to fix up "write_sha1_from_fd()" to use the new
common infrastructure for creating the object files, closing a hole where
we might otherwise leave half-written objects in the object database.
[jc: I unoptimized the part that really removes the fan-out directories
to ease transition. init-db still wastes 1MB of diskspace to hold 256
empty fan-outs, and prune-packed rmdir()'s the grown but empty directories,
but runs mkdir() immediately after that -- reducing the saving from 150KB
to 146KB. These parts will be re-introduced when everybody has the
on-demand capability.]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-08 22:54:01 +00:00
|
|
|
if (!dir)
|
2006-08-14 20:36:18 +00:00
|
|
|
return;
|
2005-04-08 22:02:42 +00:00
|
|
|
|
2007-06-05 02:44:00 +00:00
|
|
|
if (verbose)
|
|
|
|
fprintf(stderr, "Checking directory %s\n", path);
|
|
|
|
|
2011-01-26 21:01:54 +00:00
|
|
|
sprintf(name, "%02x", i);
|
2005-04-08 22:02:42 +00:00
|
|
|
while ((de = readdir(dir)) != NULL) {
|
2005-05-02 16:06:33 +00:00
|
|
|
unsigned char sha1[20];
|
2005-04-08 22:02:42 +00:00
|
|
|
|
2009-01-10 12:07:50 +00:00
|
|
|
if (is_dot_or_dotdot(de->d_name))
|
2005-04-08 22:02:42 +00:00
|
|
|
continue;
|
2011-01-26 21:01:54 +00:00
|
|
|
if (is_loose_object_file(de, name, sha1)) {
|
2006-01-20 01:13:51 +00:00
|
|
|
add_sha1_list(sha1, DIRENT_SORT_HINT(de));
|
2005-05-02 16:06:33 +00:00
|
|
|
continue;
|
2005-04-08 22:02:42 +00:00
|
|
|
}
|
2008-08-05 18:01:50 +00:00
|
|
|
if (!prefixcmp(de->d_name, "tmp_obj_"))
|
2008-07-27 02:33:00 +00:00
|
|
|
continue;
|
2005-04-08 22:02:42 +00:00
|
|
|
fprintf(stderr, "bad sha1 file: %s/%s\n", path, de->d_name);
|
|
|
|
}
|
|
|
|
closedir(dir);
|
|
|
|
}
|
|
|
|
|
2006-08-15 17:23:48 +00:00
|
|
|
static int default_refs;
|
2005-07-03 17:01:38 +00:00
|
|
|
|
2007-01-08 00:59:54 +00:00
|
|
|
static int fsck_handle_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
|
|
|
|
const char *email, unsigned long timestamp, int tz,
|
|
|
|
const char *message, void *cb_data)
|
2006-12-18 09:36:16 +00:00
|
|
|
{
|
|
|
|
struct object *obj;
|
|
|
|
|
2007-06-05 02:44:00 +00:00
|
|
|
if (verbose)
|
|
|
|
fprintf(stderr, "Checking reflog %s->%s\n",
|
|
|
|
sha1_to_hex(osha1), sha1_to_hex(nsha1));
|
|
|
|
|
2006-12-18 09:36:16 +00:00
|
|
|
if (!is_null_sha1(osha1)) {
|
|
|
|
obj = lookup_object(osha1);
|
|
|
|
if (obj) {
|
|
|
|
obj->used = 1;
|
2008-02-25 21:46:05 +00:00
|
|
|
mark_object_reachable(obj);
|
2006-12-18 09:36:16 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
obj = lookup_object(nsha1);
|
|
|
|
if (obj) {
|
|
|
|
obj->used = 1;
|
2008-02-25 21:46:05 +00:00
|
|
|
mark_object_reachable(obj);
|
2006-12-18 09:36:16 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-02-03 18:25:43 +00:00
|
|
|
static int fsck_handle_reflog(const char *logname, const unsigned char *sha1, int flag, void *cb_data)
|
|
|
|
{
|
|
|
|
for_each_reflog_ent(logname, fsck_handle_reflog_ent, NULL);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-01-16 00:34:17 +00:00
|
|
|
static int is_branch(const char *refname)
|
|
|
|
{
|
|
|
|
return !strcmp(refname, "HEAD") || !prefixcmp(refname, "refs/heads/");
|
|
|
|
}
|
|
|
|
|
2006-09-21 05:02:01 +00:00
|
|
|
static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
|
2005-05-18 17:16:14 +00:00
|
|
|
{
|
|
|
|
struct object *obj;
|
|
|
|
|
2008-01-16 00:34:17 +00:00
|
|
|
obj = parse_object(sha1);
|
2005-06-28 21:58:33 +00:00
|
|
|
if (!obj) {
|
2005-07-03 17:01:38 +00:00
|
|
|
error("%s: invalid sha1 pointer %s", refname, sha1_to_hex(sha1));
|
|
|
|
/* We'll continue with the rest despite the error.. */
|
|
|
|
return 0;
|
2005-06-28 21:58:33 +00:00
|
|
|
}
|
2008-01-16 00:34:17 +00:00
|
|
|
if (obj->type != OBJ_COMMIT && is_branch(refname))
|
|
|
|
error("%s: not a commit", refname);
|
2005-07-03 17:01:38 +00:00
|
|
|
default_refs++;
|
2005-05-18 17:16:14 +00:00
|
|
|
obj->used = 1;
|
2008-02-25 21:46:05 +00:00
|
|
|
mark_object_reachable(obj);
|
2006-12-18 09:36:16 +00:00
|
|
|
|
2005-05-20 14:49:17 +00:00
|
|
|
return 0;
|
2005-05-18 17:16:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void get_default_heads(void)
|
|
|
|
{
|
2009-01-30 08:33:00 +00:00
|
|
|
if (head_points_at && !is_null_sha1(head_sha1))
|
|
|
|
fsck_handle_ref("HEAD", head_sha1, 0, NULL);
|
2006-09-21 04:47:42 +00:00
|
|
|
for_each_ref(fsck_handle_ref, NULL);
|
2007-04-04 14:46:14 +00:00
|
|
|
if (include_reflogs)
|
|
|
|
for_each_reflog(fsck_handle_reflog, NULL);
|
2006-08-29 18:47:30 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Not having any default heads isn't really fatal, but
|
|
|
|
* it does mean that "--unreachable" no longer makes any
|
|
|
|
* sense (since in this case everything will obviously
|
|
|
|
* be unreachable by definition.
|
|
|
|
*
|
|
|
|
* Showing dangling objects is valid, though (as those
|
|
|
|
* dangling objects are likely lost heads).
|
|
|
|
*
|
|
|
|
* So we just print a warning about it, and clear the
|
|
|
|
* "show_unreachable" flag.
|
|
|
|
*/
|
|
|
|
if (!default_refs) {
|
2007-04-11 08:28:43 +00:00
|
|
|
fprintf(stderr, "notice: No default references\n");
|
2006-08-29 18:47:30 +00:00
|
|
|
show_unreachable = 0;
|
|
|
|
}
|
2005-05-18 17:16:14 +00:00
|
|
|
}
|
|
|
|
|
2005-06-28 21:58:33 +00:00
|
|
|
static void fsck_object_dir(const char *path)
|
|
|
|
{
|
|
|
|
int i;
|
2011-11-07 02:59:26 +00:00
|
|
|
struct progress *progress = NULL;
|
2007-06-05 02:44:00 +00:00
|
|
|
|
|
|
|
if (verbose)
|
|
|
|
fprintf(stderr, "Checking object directory\n");
|
|
|
|
|
2011-11-07 02:59:26 +00:00
|
|
|
if (show_progress)
|
|
|
|
progress = start_progress("Checking object directories", 256);
|
2005-06-28 21:58:33 +00:00
|
|
|
for (i = 0; i < 256; i++) {
|
|
|
|
static char dir[4096];
|
|
|
|
sprintf(dir, "%s/%02x", path, i);
|
|
|
|
fsck_dir(i, dir);
|
2011-11-07 02:59:26 +00:00
|
|
|
display_progress(progress, i+1);
|
2005-06-28 21:58:33 +00:00
|
|
|
}
|
2011-11-07 02:59:26 +00:00
|
|
|
stop_progress(&progress);
|
2005-06-28 21:58:33 +00:00
|
|
|
fsck_sha1_list();
|
|
|
|
}
|
|
|
|
|
2005-07-03 17:40:38 +00:00
|
|
|
static int fsck_head_link(void)
|
|
|
|
{
|
2006-09-21 05:02:01 +00:00
|
|
|
int flag;
|
2007-04-11 08:28:43 +00:00
|
|
|
int null_is_error = 0;
|
|
|
|
|
2007-06-05 02:44:00 +00:00
|
|
|
if (verbose)
|
|
|
|
fprintf(stderr, "Checking HEAD link\n");
|
|
|
|
|
2011-12-12 11:20:32 +00:00
|
|
|
head_points_at = resolve_ref_unsafe("HEAD", head_sha1, 0, &flag);
|
2007-04-11 08:28:43 +00:00
|
|
|
if (!head_points_at)
|
|
|
|
return error("Invalid HEAD");
|
|
|
|
if (!strcmp(head_points_at, "HEAD"))
|
|
|
|
/* detached HEAD */
|
|
|
|
null_is_error = 1;
|
|
|
|
else if (prefixcmp(head_points_at, "refs/heads/"))
|
2005-09-30 21:26:57 +00:00
|
|
|
return error("HEAD points to something strange (%s)",
|
2006-09-18 08:08:00 +00:00
|
|
|
head_points_at);
|
2009-01-30 08:33:00 +00:00
|
|
|
if (is_null_sha1(head_sha1)) {
|
2007-04-11 08:28:43 +00:00
|
|
|
if (null_is_error)
|
|
|
|
return error("HEAD: detached HEAD points at nothing");
|
|
|
|
fprintf(stderr, "notice: HEAD points to an unborn branch (%s)\n",
|
|
|
|
head_points_at + 11);
|
|
|
|
}
|
2005-07-03 17:40:38 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-04-25 23:37:08 +00:00
|
|
|
static int fsck_cache_tree(struct cache_tree *it)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int err = 0;
|
|
|
|
|
2007-06-05 02:44:00 +00:00
|
|
|
if (verbose)
|
|
|
|
fprintf(stderr, "Checking cache tree\n");
|
|
|
|
|
2006-04-25 23:37:08 +00:00
|
|
|
if (0 <= it->entry_count) {
|
|
|
|
struct object *obj = parse_object(it->sha1);
|
2006-05-04 04:17:45 +00:00
|
|
|
if (!obj) {
|
|
|
|
error("%s: invalid sha1 pointer in cache-tree",
|
|
|
|
sha1_to_hex(it->sha1));
|
|
|
|
return 1;
|
|
|
|
}
|
2006-05-02 05:15:54 +00:00
|
|
|
obj->used = 1;
|
2011-01-26 20:46:55 +00:00
|
|
|
mark_object_reachable(obj);
|
2006-07-12 03:45:31 +00:00
|
|
|
if (obj->type != OBJ_TREE)
|
2006-04-25 23:37:08 +00:00
|
|
|
err |= objerror(obj, "non-tree in cache-tree");
|
|
|
|
}
|
|
|
|
for (i = 0; i < it->subtree_nr; i++)
|
|
|
|
err |= fsck_cache_tree(it->down[i]->cache_tree);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2007-10-15 20:34:05 +00:00
|
|
|
static char const * const fsck_usage[] = {
|
2012-08-20 12:32:13 +00:00
|
|
|
N_("git fsck [options] [<object>...]"),
|
2007-10-15 20:34:05 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct option fsck_opts[] = {
|
2012-08-20 12:32:13 +00:00
|
|
|
OPT__VERBOSE(&verbose, N_("be verbose")),
|
|
|
|
OPT_BOOLEAN(0, "unreachable", &show_unreachable, N_("show unreachable objects")),
|
|
|
|
OPT_BOOL(0, "dangling", &show_dangling, N_("show dangling objects")),
|
|
|
|
OPT_BOOLEAN(0, "tags", &show_tags, N_("report tags")),
|
|
|
|
OPT_BOOLEAN(0, "root", &show_root, N_("report root nodes")),
|
|
|
|
OPT_BOOLEAN(0, "cache", &keep_cache_objects, N_("make index objects head nodes")),
|
|
|
|
OPT_BOOLEAN(0, "reflogs", &include_reflogs, N_("make reflogs head nodes (default)")),
|
|
|
|
OPT_BOOLEAN(0, "full", &check_full, N_("also consider packs and alternate objects")),
|
|
|
|
OPT_BOOLEAN(0, "strict", &check_strict, N_("enable more strict checking")),
|
2007-10-15 20:34:05 +00:00
|
|
|
OPT_BOOLEAN(0, "lost-found", &write_lost_and_found,
|
2012-08-20 12:32:13 +00:00
|
|
|
N_("write dangling objects in .git/lost-found")),
|
|
|
|
OPT_BOOL(0, "progress", &show_progress, N_("show progress")),
|
2007-10-15 20:34:05 +00:00
|
|
|
OPT_END(),
|
|
|
|
};
|
2007-03-05 08:22:06 +00:00
|
|
|
|
2007-07-14 23:14:45 +00:00
|
|
|
int cmd_fsck(int argc, const char **argv, const char *prefix)
|
2005-04-08 22:02:42 +00:00
|
|
|
{
|
2005-04-13 23:42:09 +00:00
|
|
|
int i, heads;
|
2009-01-30 08:50:54 +00:00
|
|
|
struct alternate_object_database *alt;
|
2005-04-08 22:02:42 +00:00
|
|
|
|
2007-03-05 08:22:06 +00:00
|
|
|
errors_found = 0;
|
2009-01-23 09:07:46 +00:00
|
|
|
read_replace_refs = 0;
|
2005-11-26 07:52:04 +00:00
|
|
|
|
2009-05-23 18:53:12 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, fsck_opts, fsck_usage, 0);
|
2011-11-07 02:59:26 +00:00
|
|
|
|
|
|
|
if (show_progress == -1)
|
|
|
|
show_progress = isatty(2);
|
|
|
|
if (verbose)
|
|
|
|
show_progress = 0;
|
|
|
|
|
2007-10-15 20:34:05 +00:00
|
|
|
if (write_lost_and_found) {
|
|
|
|
check_full = 1;
|
|
|
|
include_reflogs = 0;
|
2005-04-25 23:31:13 +00:00
|
|
|
}
|
|
|
|
|
2005-07-03 17:40:38 +00:00
|
|
|
fsck_head_link();
|
2005-06-28 21:58:33 +00:00
|
|
|
fsck_object_dir(get_object_directory());
|
2009-01-30 08:50:54 +00:00
|
|
|
|
|
|
|
prepare_alt_odb();
|
|
|
|
for (alt = alt_odb_list; alt; alt = alt->next) {
|
|
|
|
char namebuf[PATH_MAX];
|
|
|
|
int namelen = alt->name - alt->base;
|
|
|
|
memcpy(namebuf, alt->base, namelen);
|
|
|
|
namebuf[namelen - 1] = 0;
|
|
|
|
fsck_object_dir(namebuf);
|
|
|
|
}
|
|
|
|
|
2005-06-28 21:58:33 +00:00
|
|
|
if (check_full) {
|
|
|
|
struct packed_git *p;
|
2011-11-07 02:59:26 +00:00
|
|
|
uint32_t total = 0, count = 0;
|
|
|
|
struct progress *progress = NULL;
|
2009-01-30 08:50:54 +00:00
|
|
|
|
2005-06-28 21:58:33 +00:00
|
|
|
prepare_packed_git();
|
2011-11-07 02:59:26 +00:00
|
|
|
|
|
|
|
if (show_progress) {
|
|
|
|
for (p = packed_git; p; p = p->next) {
|
|
|
|
if (open_pack_index(p))
|
|
|
|
continue;
|
|
|
|
total += p->num_objects;
|
|
|
|
}
|
|
|
|
|
|
|
|
progress = start_progress("Checking objects", total);
|
|
|
|
}
|
|
|
|
for (p = packed_git; p; p = p->next) {
|
2005-06-29 09:51:27 +00:00
|
|
|
/* verify gives error messages itself */
|
2011-11-07 02:59:26 +00:00
|
|
|
if (verify_pack(p, fsck_obj_buffer,
|
|
|
|
progress, count))
|
2011-11-07 02:59:23 +00:00
|
|
|
errors_found |= ERROR_PACK;
|
2011-11-07 02:59:26 +00:00
|
|
|
count += p->num_objects;
|
|
|
|
}
|
|
|
|
stop_progress(&progress);
|
2005-04-13 23:42:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
heads = 0;
|
2009-01-18 03:46:09 +00:00
|
|
|
for (i = 0; i < argc; i++) {
|
2007-06-07 07:04:01 +00:00
|
|
|
const char *arg = argv[i];
|
2009-01-30 08:33:00 +00:00
|
|
|
unsigned char sha1[20];
|
|
|
|
if (!get_sha1(arg, sha1)) {
|
|
|
|
struct object *obj = lookup_object(sha1);
|
2005-04-30 03:00:40 +00:00
|
|
|
|
2005-05-05 00:03:09 +00:00
|
|
|
/* Error is printed by lookup_object(). */
|
|
|
|
if (!obj)
|
2005-04-30 03:00:40 +00:00
|
|
|
continue;
|
|
|
|
|
2005-04-18 18:39:48 +00:00
|
|
|
obj->used = 1;
|
2008-02-25 21:46:05 +00:00
|
|
|
mark_object_reachable(obj);
|
2005-04-13 23:42:09 +00:00
|
|
|
heads++;
|
2005-04-13 16:57:30 +00:00
|
|
|
continue;
|
|
|
|
}
|
2005-09-20 18:56:05 +00:00
|
|
|
error("invalid parameter: expected sha1, got '%s'", arg);
|
2005-04-13 16:57:30 +00:00
|
|
|
}
|
|
|
|
|
2005-05-18 17:16:14 +00:00
|
|
|
/*
|
2005-05-20 20:59:17 +00:00
|
|
|
* If we've not been given any explicit head information, do the
|
2005-05-18 17:19:59 +00:00
|
|
|
* default ones from .git/refs. We also consider the index file
|
|
|
|
* in this case (ie this implies --cache).
|
2005-05-18 17:16:14 +00:00
|
|
|
*/
|
2005-05-18 17:19:59 +00:00
|
|
|
if (!heads) {
|
2005-05-18 17:16:14 +00:00
|
|
|
get_default_heads();
|
|
|
|
keep_cache_objects = 1;
|
|
|
|
}
|
|
|
|
|
2005-05-04 08:33:33 +00:00
|
|
|
if (keep_cache_objects) {
|
|
|
|
read_cache();
|
|
|
|
for (i = 0; i < active_nr; i++) {
|
2007-04-10 04:15:29 +00:00
|
|
|
unsigned int mode;
|
|
|
|
struct blob *blob;
|
2005-05-04 08:33:33 +00:00
|
|
|
struct object *obj;
|
2007-04-10 04:15:29 +00:00
|
|
|
|
2008-01-15 00:03:17 +00:00
|
|
|
mode = active_cache[i]->ce_mode;
|
2007-05-21 20:08:28 +00:00
|
|
|
if (S_ISGITLINK(mode))
|
2007-04-10 04:15:29 +00:00
|
|
|
continue;
|
|
|
|
blob = lookup_blob(active_cache[i]->sha1);
|
2005-05-04 08:33:33 +00:00
|
|
|
if (!blob)
|
|
|
|
continue;
|
|
|
|
obj = &blob->object;
|
|
|
|
obj->used = 1;
|
2008-02-25 21:46:05 +00:00
|
|
|
mark_object_reachable(obj);
|
2005-05-04 08:33:33 +00:00
|
|
|
}
|
2006-04-25 23:37:08 +00:00
|
|
|
if (active_cache_tree)
|
|
|
|
fsck_cache_tree(active_cache_tree);
|
2005-05-04 08:33:33 +00:00
|
|
|
}
|
|
|
|
|
2005-04-11 06:13:09 +00:00
|
|
|
check_connectivity();
|
2007-03-05 08:22:06 +00:00
|
|
|
return errors_found;
|
2005-04-08 22:02:42 +00:00
|
|
|
}
|