diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-04-04 10:46:14 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-05 15:00:03 -0700 |
| commit | 566842f62bdf1f16c2e94fb431445d2e6c0f3f0b (patch) | |
| tree | 3c70147e9fb6cc2e8b850f32a9ecd86b8d6e6126 /builtin-fsck.c | |
| parent | d72308e01c5977177cda0aed06cfeee9192e1247 (diff) | |
| download | git-566842f62bdf1f16c2e94fb431445d2e6c0f3f0b.tar.gz | |
Fix lost-found to show commits only referenced by reflogs
Prior to 1.5.0 the git-lost-found utility was useful to locate
commits that were not referenced by any ref. These were often
amends, or resets, or tips of branches that had been deleted.
Being able to locate a 'lost' commit and recover it by creating a
new branch was a useful feature in those days.
Unfortunately 1.5.0 added the reflogs to the reachability analysis
performed by git-fsck, which means that most commits users would
consider to be lost are still reachable through a reflog. So most
(or all!) commits are reachable, and nothing gets output from
git-lost-found.
Now git-fsck can be told to ignore reflogs during its reachability
analysis, making git-lost-found useful again to locate commits
that are no longer referenced by a ref itself, but may still be
referenced by a reflog.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-fsck.c')
| -rw-r--r-- | builtin-fsck.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/builtin-fsck.c b/builtin-fsck.c index 4e5aa33dfb..4d8b66c344 100644 --- a/builtin-fsck.c +++ b/builtin-fsck.c @@ -14,6 +14,7 @@ static int show_root; static int show_tags; static int show_unreachable; +static int include_reflogs = 1; static int check_full; static int check_strict; static int keep_cache_objects; @@ -517,7 +518,8 @@ static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int f static void get_default_heads(void) { for_each_ref(fsck_handle_ref, NULL); - for_each_reflog(fsck_handle_reflog, NULL); + if (include_reflogs) + for_each_reflog(fsck_handle_reflog, NULL); /* * Not having any default heads isn't really fatal, but @@ -616,6 +618,10 @@ int cmd_fsck(int argc, char **argv, const char *prefix) keep_cache_objects = 1; continue; } + if (!strcmp(arg, "--no-reflogs")) { + include_reflogs = 0; + continue; + } if (!strcmp(arg, "--full")) { check_full = 1; continue; |