From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: [PATCH] Adjust fsck-cache to packed GIT and alternate object pool.
Date: Tue, 28 Jun 2005 01:49:39 -0700 [thread overview]
Message-ID: <7vslz2x3vg.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.58.0506271755140.19755@ppc970.osdl.org> (Linus Torvalds's message of "Mon, 27 Jun 2005 18:14:40 -0700 (PDT)")
>>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:
LT> There are some other issues too, like the fact that "git-fsck-cache"
LT> doesn't know about the pack-files yet, so it will complain about missing
LT> objects etc.
And here is a patch to fix it. It is interesting to know that
the same problem existed for a long time in a different form and
nobody has complained: GIT_ALTERNATE_OBJECT_DIRECTORIES.
Maybe the alternate object pool mechanism is not so widely used
and probably not very useful for everyday use. I donno.
------------
The fsck-cache complains if objects referred to by files in
.git/refs/ or objects stored in files under .git/objects/??/ are
not found as stand-alone SHA1 files (i.e. found in alternate
object pools GIT_ALTERNATE_OBJECT_DIRECTORIES or packed archives
stored under .git/objects/pack).
Although this is a good semantics to maintain consistency of a
single .git/objects directory as a self contained set of
objects, it sometimes is useful to consider it is OK as long as
these "outside" objects are available.
This commit introduces a new flag, --standalone, to
git-fsck-cache. When it is not specified, connectivity checks
and .git/refs pointer checks are taught that it is OK when
expected objects do not exist under .git/objects/?? hierarchy
but are available from an packed archive or in an alternate
object pool.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
fsck-cache.c | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
ea4255429bb0b4b760ba2fe327f5806d8d24d8a6
diff --git a/fsck-cache.c b/fsck-cache.c
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -12,6 +12,7 @@
static int show_root = 0;
static int show_tags = 0;
static int show_unreachable = 0;
+static int standalone = 0;
static int keep_cache_objects = 0;
static unsigned char head_sha1[20];
@@ -25,13 +26,17 @@ static void check_connectivity(void)
struct object_list *refs;
if (!obj->parsed) {
- printf("missing %s %s\n",
- obj->type, sha1_to_hex(obj->sha1));
+ if (!standalone && has_sha1_file(obj->sha1))
+ ; /* it is in pack */
+ else
+ printf("missing %s %s\n",
+ obj->type, sha1_to_hex(obj->sha1));
continue;
}
for (refs = obj->refs; refs; refs = refs->next) {
- if (refs->item->parsed)
+ if (refs->item->parsed ||
+ (!standalone && has_sha1_file(refs->item->sha1)))
continue;
printf("broken link from %7s %s\n",
obj->type, sha1_to_hex(obj->sha1));
@@ -315,8 +320,11 @@ static int read_sha1_reference(const cha
return -1;
obj = lookup_object(sha1);
- if (!obj)
+ if (!obj) {
+ if (!standalone && has_sha1_file(sha1))
+ return 0; /* it is in pack */
return error("%s: invalid sha1 pointer %.40s", path, hexname);
+ }
obj->used = 1;
mark_reachable(obj, REACHABLE);
@@ -390,6 +398,10 @@ int main(int argc, char **argv)
keep_cache_objects = 1;
continue;
}
+ if (!strcmp(arg, "--standalone")) {
+ standalone = 1;
+ continue;
+ }
if (*arg == '-')
usage("git-fsck-cache [--tags] [[--unreachable] [--cache] <head-sha1>*]");
}
------------
next prev parent reply other threads:[~2005-06-28 8:48 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-28 1:14 CAREFUL! No more delta object support! Linus Torvalds
2005-06-27 23:58 ` Christopher Li
2005-06-28 3:30 ` Linus Torvalds
2005-06-28 9:40 ` Junio C Hamano
2005-06-28 11:06 ` Christopher Li
2005-06-28 14:52 ` Petr Baudis
2005-06-28 16:35 ` Benjamin LaHaise
2005-06-28 20:30 ` Petr Baudis
2005-06-28 14:46 ` Jan Harkes
2005-06-28 10:38 ` Christopher Li
2005-06-28 16:45 ` Linus Torvalds
2005-06-29 0:49 ` [PATCH] Emit base objects of a delta chain when the delta is output Junio C Hamano
2005-06-28 2:01 ` CAREFUL! No more delta object support! Junio C Hamano
2005-06-28 2:03 ` [PATCH] Skip writing out sha1 files for objects in packed git Junio C Hamano
2005-06-28 2:43 ` Linus Torvalds
2005-06-28 3:33 ` Junio C Hamano
2005-06-28 15:45 ` Linus Torvalds
2005-06-28 2:13 ` CAREFUL! No more delta object support! Linus Torvalds
2005-06-28 2:32 ` Junio C Hamano
2005-06-28 2:37 ` [PATCH] Adjust to git-init-db creating $GIT_OBJECT_DIRECTORY/pack Junio C Hamano
2005-06-28 2:48 ` CAREFUL! No more delta object support! Linus Torvalds
2005-06-28 5:09 ` Daniel Barkalow
2005-06-28 15:49 ` Linus Torvalds
2005-06-28 16:21 ` Linus Torvalds
2005-06-28 17:04 ` Daniel Barkalow
2005-06-28 17:36 ` Linus Torvalds
2005-06-28 18:17 ` Linus Torvalds
2005-06-28 19:49 ` Matthias Urlichs
2005-06-28 20:18 ` Matthias Urlichs
2005-06-28 20:01 ` Daniel Barkalow
2005-06-29 3:53 ` Linus Torvalds
2005-06-29 18:59 ` Linus Torvalds
2005-06-29 21:05 ` Daniel Barkalow
2005-06-29 21:38 ` Linus Torvalds
2005-06-29 22:24 ` Daniel Barkalow
2005-06-28 8:49 ` Junio C Hamano [this message]
2005-06-28 21:56 ` [PATCH] Expose packed_git and alt_odb Junio C Hamano
2005-06-28 21:58 ` [PATCH 3/3] Update fsck-cache (take 2) Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vslz2x3vg.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).