projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'lt/tree' into jc/lt-tree-n-cache-tree
[git.git]
/
fsck-objects.c
diff --git
a/fsck-objects.c
b/fsck-objects.c
index
cc09143
..
42778e8
100644
(file)
--- a/
fsck-objects.c
+++ b/
fsck-objects.c
@@
-11,6
+11,7
@@
#include "cache-tree.h"
#define REACHABLE 0x0001
#include "cache-tree.h"
#define REACHABLE 0x0001
+#define SEEN 0x0002
static int show_root = 0;
static int show_tags = 0;
static int show_root = 0;
static int show_tags = 0;
@@
-161,7
+162,7
@@
static int fsck_tree(struct tree *item)
struct tree_entry_list *entry, *last;
last = NULL;
struct tree_entry_list *entry, *last;
last = NULL;
- for (entry =
item->entries
; entry; entry = entry->next) {
+ for (entry =
create_tree_entry_list(item)
; entry; entry = entry->next) {
if (strchr(entry->name, '/'))
has_full_path = 1;
has_zero_pad |= entry->zeropad;
if (strchr(entry->name, '/'))
has_full_path = 1;
has_zero_pad |= entry->zeropad;
@@
-198,17
+199,15
@@
static int fsck_tree(struct tree *item)
default:
break;
}
default:
break;
}
- free(last->name);
free(last);
}
last = entry;
}
free(last);
}
last = entry;
}
- if (last) {
- free(last->name);
+ if (last)
free(last);
free(last);
- }
- item->
entries
= NULL;
+ free(item->buffer);
+ item->
buffer
= NULL;
retval = 0;
if (has_full_path) {
retval = 0;
if (has_full_path) {
@@
-278,6
+277,9
@@
static int fsck_sha1(unsigned char *sha1)
struct object *obj = parse_object(sha1);
if (!obj)
return error("%s: object not found", sha1_to_hex(sha1));
struct object *obj = parse_object(sha1);
if (!obj)
return error("%s: object not found", sha1_to_hex(sha1));
+ if (obj->flags & SEEN)
+ return 0;
+ obj->flags |= SEEN;
if (obj->type == blob_type)
return 0;
if (obj->type == tree_type)
if (obj->type == blob_type)
return 0;
if (obj->type == tree_type)
@@
-446,6
+448,13
@@
static int fsck_cache_tree(struct cache_tree *it)
if (0 <= it->entry_count) {
struct object *obj = parse_object(it->sha1);
if (0 <= it->entry_count) {
struct object *obj = parse_object(it->sha1);
+ if (!obj) {
+ error("%s: invalid sha1 pointer in cache-tree",
+ sha1_to_hex(it->sha1));
+ return 1;
+ }
+ mark_reachable(obj, REACHABLE);
+ obj->used = 1;
if (obj->type != tree_type)
err |= objerror(obj, "non-tree in cache-tree");
}
if (obj->type != tree_type)
err |= objerror(obj, "non-tree in cache-tree");
}
@@
-458,6
+467,7
@@
int main(int argc, char **argv)
{
int i, heads;
{
int i, heads;
+ track_object_refs = 1;
setup_git_directory();
for (i = 1; i < argc; i++) {
setup_git_directory();
for (i = 1; i < argc; i++) {