projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xdiff: post-process hunks to make them consistent.
[git.git]
/
fsck-objects.c
diff --git
a/fsck-objects.c
b/fsck-objects.c
index
9950be2
..
59b2590
100644
(file)
--- a/
fsck-objects.c
+++ b/
fsck-objects.c
@@
-14,13
+14,12
@@
static int show_root = 0;
static int show_tags = 0;
static int show_unreachable = 0;
static int show_root = 0;
static int show_tags = 0;
static int show_unreachable = 0;
-static int standalone = 0;
static int check_full = 0;
static int check_strict = 0;
static int check_full = 0;
static int check_strict = 0;
-static int keep_cache_objects = 0;
+static int keep_cache_objects = 0;
static unsigned char head_sha1[20];
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,11
+60,14
@@
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 (!obj->parsed) {
- if (
!standalone &&
has_sha1_file(obj->sha1))
+ if (has_sha1_file(obj->sha1))
; /* it is in pack */
else
printf("missing %s %s\n",
; /* it is in pack */
else
printf("missing %s %s\n",
@@
-79,7
+81,7
@@
static void check_connectivity(void)
for (j = 0; j < refs->count; j++) {
struct object *ref = refs->ref[j];
if (ref->parsed ||
for (j = 0; j < refs->count; j++) {
struct object *ref = refs->ref[j];
if (ref->parsed ||
- (
!standalone &&
has_sha1_file(ref->sha1)))
+ (has_sha1_file(ref->sha1)))
continue;
printf("broken link from %7s %s\n",
obj->type, sha1_to_hex(obj->sha1));
continue;
printf("broken link from %7s %s\n",
obj->type, sha1_to_hex(obj->sha1));
@@
-387,7
+389,7
@@
static int fsck_handle_ref(const char *refname, const unsigned char *sha1)
obj = lookup_object(sha1);
if (!obj) {
obj = lookup_object(sha1);
if (!obj) {
- if (
!standalone &&
has_sha1_file(sha1)) {
+ if (has_sha1_file(sha1)) {
default_refs++;
return 0; /* it is in a pack */
}
default_refs++;
return 0; /* it is in a pack */
}
@@
-461,10
+463,6
@@
int main(int argc, char **argv)
keep_cache_objects = 1;
continue;
}
keep_cache_objects = 1;
continue;
}
- if (!strcmp(arg, "--standalone")) {
- standalone = 1;
- continue;
- }
if (!strcmp(arg, "--full")) {
check_full = 1;
continue;
if (!strcmp(arg, "--full")) {
check_full = 1;
continue;
@@
-474,14
+472,9
@@
int main(int argc, char **argv)
continue;
}
if (*arg == '-')
continue;
}
if (*arg == '-')
- usage("git-fsck-objects [--tags] [--root] [[--unreachable] [--cache] [--
standalone | --
full] [--strict] <head-sha1>*]");
+ usage("git-fsck-objects [--tags] [--root] [[--unreachable] [--cache] [--full] [--strict] <head-sha1>*]");
}
}
- if (standalone && check_full)
- die("Only one of --standalone or --full can be used.");
- if (standalone)
- putenv("GIT_ALTERNATE_OBJECT_DIRECTORIES=");
-
fsck_head_link();
fsck_object_dir(get_object_directory());
if (check_full) {
fsck_head_link();
fsck_object_dir(get_object_directory());
if (check_full) {