summaryrefslogtreecommitdiff
path: root/fsck-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-18 09:36:16 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-21 01:22:10 (GMT)
commit55dd55263b6d27aa8daa77bd69f5ea990b66c7a1 (patch)
tree31bb7894f535d14cbb4a55a2bb4a53bbef7537fc /fsck-objects.c
parent2ff81662c2fb2679f841c09a28bd80c0a63011ac (diff)
downloadgit-55dd55263b6d27aa8daa77bd69f5ea990b66c7a1.zip
git-55dd55263b6d27aa8daa77bd69f5ea990b66c7a1.tar.gz
git-55dd55263b6d27aa8daa77bd69f5ea990b66c7a1.tar.bz2
Protect commits recorded in reflog from pruning.
This teaches fsck-objects and prune to protect objects referred to by reflog entries. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'fsck-objects.c')
-rw-r--r--fsck-objects.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/fsck-objects.c b/fsck-objects.c
index 409aea0..1cc3b39 100644
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -399,6 +399,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;
@@ -416,6 +435,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;
}