diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-26 23:47:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-26 23:47:40 -0800 |
| commit | e8b4029f990907e24fac0e7772ee19ee6dd55c1c (patch) | |
| tree | b3b799be8af66f36bd4a09d0b5ed3d8f03136dab /builtin-prune.c | |
| parent | 268b827d9883e77f395a63e4afa10ebbac10bfcf (diff) | |
| parent | 7dc269230761e32e663d9cd0b6f4c316466a490d (diff) | |
| download | git-e8b4029f990907e24fac0e7772ee19ee6dd55c1c.tar.gz | |
Merge branch 'jc/fsck-reflog'
* jc/fsck-reflog:
Add git-reflog to .gitignore
reflog expire: do not punt on tags that point at non commits.
reflog expire: prune commits that are not incomplete
Don't crash during repack of a reflog with pruned commits.
git reflog expire
Move in_merge_bases() to commit.c
reflog: fix warning message.
Teach git-repack to preserve objects referred to by reflog entries.
Protect commits recorded in reflog from pruning.
add for_each_reflog_ent() iterator
Diffstat (limited to 'builtin-prune.c')
| -rw-r--r-- | builtin-prune.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/builtin-prune.c b/builtin-prune.c index 8591d28b8e..00a53b3647 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; } |