summaryrefslogtreecommitdiff
path: root/builtin-prune.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 /builtin-prune.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 'builtin-prune.c')
-rw-r--r--builtin-prune.c16
1 files changed, 16 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;
}