From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Subject: [PATCH 2/2] Protect commits recorded in reflog from pruning.
Date: Mon, 18 Dec 2006 01:42:32 -0800 [thread overview]
Message-ID: <7vr6uxzgjb.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7vodq3a136.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Sat, 16 Dec 2006 15:10:53 -0800")
This teaches fsck-objects and prune to protect objects referred
to by reflog entries.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
>> - now reflog is enabled by default for user repositories, I
>> have two worries about its effect, fortunately can be killed
>> with a single stone.
>>
>> * the reflog grows unbounded;
>>
>> * revisions recorded in the reflog can be pruned out,
>> rendering some entries in reflog useless.
>>
>> I am thinking about teaching fsck-objects and prune to keep
>> revisions recorded in the reflog; we would need an end-user
>> way to prune older reflog entries and I would appreciate
>> somebody codes it up, but even without it, people can always
>> use "vi" or "ed" on reflog files ;-).
Rewinding would not lose any objects from the object database
with this; somebody needs to code up a garbage collector and/or
expiration mechanism for reflogs.
builtin-prune.c | 16 ++++++++++++++++
fsck-objects.c | 22 ++++++++++++++++++++++
2 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/builtin-prune.c b/builtin-prune.c
index 8591d28..00a53b3 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -181,12 +181,28 @@ static void walk_commit_list(struct rev_info *revs)
}
}
+static int add_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, char *datail, void *cb_data)
+{
+ struct object *object;
+
+ object = parse_object(osha1);
+ if (object)
+ add_pending_object(&revs, object, "");
+ object = parse_object(nsha1);
+ if (object)
+ add_pending_object(&revs, object, "");
+ return 0;
+}
+
static int add_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
{
struct object *object = parse_object(sha1);
if (!object)
die("bad object ref: %s:%s", path, sha1_to_hex(sha1));
add_pending_object(&revs, object, "");
+
+ for_each_reflog_ent(path, add_one_reflog_ent, NULL);
+
return 0;
}
diff --git a/fsck-objects.c b/fsck-objects.c
index 46b628c..e3746e8 100644
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -402,6 +402,25 @@ static void fsck_dir(int i, char *path)
static int default_refs;
+static int fsck_handle_reflog_ent(unsigned char *osha1, unsigned char *nsha1, char *datail, void *cb_data)
+{
+ struct object *obj;
+
+ if (!is_null_sha1(osha1)) {
+ obj = lookup_object(osha1);
+ if (obj) {
+ obj->used = 1;
+ mark_reachable(obj, REACHABLE);
+ }
+ }
+ obj = lookup_object(nsha1);
+ if (obj) {
+ obj->used = 1;
+ mark_reachable(obj, REACHABLE);
+ }
+ return 0;
+}
+
static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
{
struct object *obj;
@@ -419,6 +438,9 @@ static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int f
default_refs++;
obj->used = 1;
mark_reachable(obj, REACHABLE);
+
+ for_each_reflog_ent(refname, fsck_handle_reflog_ent, NULL);
+
return 0;
}
--
1.4.4.2.gc30f
next prev parent reply other threads:[~2006-12-18 9:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-16 23:10 What's cooking in git.git (topics) Junio C Hamano
2006-12-16 23:29 ` Jakub Narebski
2006-12-17 0:19 ` Junio C Hamano
2006-12-17 17:35 ` Yann Dirson
2006-12-17 23:38 ` Josef Weidendorfer
2006-12-17 4:35 ` Brian Gernhardt
2006-12-17 4:42 ` Shawn Pearce
2006-12-17 6:46 ` [PATCH] revision: introduce ref@{N..M} syntax Junio C Hamano
2006-12-17 18:14 ` Linus Torvalds
2006-12-17 19:38 ` Junio C Hamano
2006-12-17 23:41 ` What's cooking in git.git (topics) Andy Parkins
2006-12-18 8:09 ` Junio C Hamano
2006-12-18 9:17 ` Andy Parkins
2006-12-18 9:33 ` Shawn Pearce
2006-12-18 9:40 ` [PATCH 1/2] add for_each_reflog_ent() iterator Junio C Hamano
2006-12-18 9:42 ` Junio C Hamano [this message]
2006-12-18 14:08 ` [PATCH 2/2] Protect commits recorded in reflog from pruning Shawn Pearce
2006-12-19 1:22 ` Junio C Hamano
2006-12-19 8:25 ` [PATCH 1/2] Move in_merge_bases() to commit.c Junio C Hamano
2006-12-19 8:25 ` [PATCH 2/2] git reflog expire Junio C Hamano
2006-12-19 9:08 ` Shawn Pearce
2006-12-19 10:15 ` Junio C Hamano
2006-12-19 10:27 ` Shawn Pearce
2006-12-19 23:29 ` Linus Torvalds
2006-12-20 0:34 ` Junio C Hamano
2006-12-20 0:58 ` Linus Torvalds
2006-12-19 10:40 ` Shawn Pearce
2006-12-19 11:08 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vr6uxzgjb.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).