Skip to content

Commit

Permalink
Protect commits recorded in reflog from pruning.
Browse files Browse the repository at this point in the history
This teaches fsck-objects and prune to protect objects referred
to by reflog entries.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Dec 21, 2006
1 parent 2ff8166 commit 55dd552
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 0 deletions.
16 changes: 16 additions & 0 deletions builtin-prune.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
22 changes: 22 additions & 0 deletions fsck-objects.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down

0 comments on commit 55dd552

Please sign in to comment.