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/rev-list' into next
[git.git]
/
fsck-objects.c
diff --git
a/fsck-objects.c
b/fsck-objects.c
index
9950be2
..
4ddd676
100644
(file)
--- a/
fsck-objects.c
+++ b/
fsck-objects.c
@@
-20,7
+20,7
@@
static int check_strict = 0;
static int keep_cache_objects = 0;
static unsigned char head_sha1[20];
static int keep_cache_objects = 0;
static unsigned char head_sha1[20];
-#if NO_D_INO_IN_DIRENT
+#if
def
NO_D_INO_IN_DIRENT
#define SORT_DIRENT 0
#define DIRENT_SORT_HINT(de) 0
#else
#define SORT_DIRENT 0
#define DIRENT_SORT_HINT(de) 0
#else
@@
-61,9
+61,12
@@
static void check_connectivity(void)
int i;
/* Look up all the requirements, warn about missing objects.. */
int i;
/* Look up all the requirements, warn about missing objects.. */
- for (i = 0; i <
nr_obj
s; i++) {
+ for (i = 0; i <
obj_alloc
s; i++) {
struct object *obj = objs[i];
struct object *obj = objs[i];
+ if (!obj)
+ continue;
+
if (!obj->parsed) {
if (!standalone && has_sha1_file(obj->sha1))
; /* it is in pack */
if (!obj->parsed) {
if (!standalone && has_sha1_file(obj->sha1))
; /* it is in pack */