From 55dd55263b6d27aa8daa77bd69f5ea990b66c7a1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 18 Dec 2006 01:36:16 -0800 Subject: 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 --- builtin-prune.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'builtin-prune.c') diff --git a/builtin-prune.c b/builtin-prune.c index 8591d28b8..00a53b364 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; } -- cgit v1.2.1