зеркало из https://github.com/microsoft/git.git
Make 'fsck' able to take an arbitrary number of parents on the
command line. "arbitrary" is a bit wrong, since it is limited by the argument size limit (128kB or so), but let's see if anybody ever cares. Arguably you should prune your tree before you have a few thousand dangling heads in your archive. We can fix it by passing in a file listing if we ever care.
This commit is contained in:
Родитель
2845dbe4a4
Коммит
bcee6fd8e7
43
fsck-cache.c
43
fsck-cache.c
|
@ -19,7 +19,6 @@
|
||||||
#define REACHABLE 0x40000
|
#define REACHABLE 0x40000
|
||||||
|
|
||||||
static int show_unreachable = 0;
|
static int show_unreachable = 0;
|
||||||
static int head_supplied = 0;
|
|
||||||
static unsigned char head_sha1[20];
|
static unsigned char head_sha1[20];
|
||||||
|
|
||||||
struct parent {
|
struct parent {
|
||||||
|
@ -122,9 +121,6 @@ static void check_connectivity(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (head_supplied)
|
|
||||||
mark_reachable(lookup_rev(head_sha1));
|
|
||||||
|
|
||||||
/* Look up all the requirements, warn about missing objects.. */
|
/* Look up all the requirements, warn about missing objects.. */
|
||||||
for (i = 0; i < nr_revs; i++) {
|
for (i = 0; i < nr_revs; i++) {
|
||||||
struct revision *rev = revs[i];
|
struct revision *rev = revs[i];
|
||||||
|
@ -282,29 +278,38 @@ static int fsck_dir(int i, char *path)
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int i;
|
int i, heads;
|
||||||
char *sha1_dir;
|
char *sha1_dir;
|
||||||
|
|
||||||
for (i = 1; i < argc; i++) {
|
|
||||||
if (!strcmp(argv[i], "--unreachable")) {
|
|
||||||
show_unreachable = 1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (!get_sha1_hex(argv[i], head_sha1)) {
|
|
||||||
head_supplied = 1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
usage("fsck-cache [[--unreachable] <head-sha1>]");
|
|
||||||
}
|
|
||||||
if (show_unreachable && !head_supplied)
|
|
||||||
usage("unable to do reachability checks without a head");
|
|
||||||
|
|
||||||
sha1_dir = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;
|
sha1_dir = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;
|
||||||
for (i = 0; i < 256; i++) {
|
for (i = 0; i < 256; i++) {
|
||||||
static char dir[4096];
|
static char dir[4096];
|
||||||
sprintf(dir, "%s/%02x", sha1_dir, i);
|
sprintf(dir, "%s/%02x", sha1_dir, i);
|
||||||
fsck_dir(i, dir);
|
fsck_dir(i, dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
heads = 0;
|
||||||
|
for (i = 1; i < argc; i++) {
|
||||||
|
if (!strcmp(argv[i], "--unreachable")) {
|
||||||
|
show_unreachable = 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!get_sha1_hex(argv[i], head_sha1)) {
|
||||||
|
mark_reachable(lookup_rev(head_sha1));
|
||||||
|
heads++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
error("fsck-cache [[--unreachable] <head-sha1>*]");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!heads) {
|
||||||
|
if (show_unreachable) {
|
||||||
|
fprintf(stderr, "unable to do reachability without a head\n");
|
||||||
|
show_unreachable = 0;
|
||||||
|
}
|
||||||
|
fprintf(stderr, "expect dangling commits - potential heads - due to lack of head information\n");
|
||||||
|
}
|
||||||
|
|
||||||
check_connectivity();
|
check_connectivity();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
Загрузка…
Ссылка в новой задаче