@matheusbsbs / matheus-bagliano / commits / 566842f62b
Fork 0

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>

Shawn O. Pearce committed Apr 4, 2007 at 10:46 UTC 566842f62bdf1f16c2e94fb431445d2e6c0f3f0b
3 files changed +15 -3
Documentation/git-fsck.txt
+7 -1
@@ -9,7 +9,7 @@ git-fsck - Verifies the connectivity and validity of the objects in the database
9 SYNOPSIS
10 --------
11 [verse]
12 -'git-fsck' [--tags] [--root] [--unreachable] [--cache]
12 +'git-fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
13 [--full] [--strict] [<object>*]
14
15 DESCRIPTION
@@ -38,6 +38,12 @@ index file and all SHA1 references in .git/refs/* as heads.
38 Consider any object recorded in the index also as a head node for
39 an unreachability trace.
40
41 +--no-reflogs::
42 + Do not consider commits that are referenced only by an
43 + entry in a reflog to be reachable. This option is meant
44 + only to search for commits that used to be in a ref, but
45 + now aren't, but are still in that corresponding reflog.
46 +
47 --full::
48 Check not just objects in GIT_OBJECT_DIRECTORY
49 ($GIT_DIR/objects), but also the ones found in alternate
builtin-fsck.c
+7 -1
@@ -14,6 +14,7 @@
14 static int show_root;
15 static int show_tags;
16 static int show_unreachable;
17 +static int include_reflogs = 1;
18 static int check_full;
19 static int check_strict;
20 static int keep_cache_objects;
@@ -517,7 +518,8 @@ static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int f
518 static void get_default_heads(void)
519 {
520 for_each_ref(fsck_handle_ref, NULL);
520 - for_each_reflog(fsck_handle_reflog, NULL);
521 + if (include_reflogs)
522 + for_each_reflog(fsck_handle_reflog, NULL);
523
524 /*
525 * Not having any default heads isn't really fatal, but
@@ -616,6 +618,10 @@ int cmd_fsck(int argc, char **argv, const char *prefix)
618 keep_cache_objects = 1;
619 continue;
620 }
621 + if (!strcmp(arg, "--no-reflogs")) {
622 + include_reflogs = 0;
623 + continue;
624 + }
625 if (!strcmp(arg, "--full")) {
626 check_full = 1;
627 continue;
git-lost-found.sh
+1 -1
@@ -12,7 +12,7 @@ fi
12 laf="$GIT_DIR/lost-found"
13 rm -fr "$laf" && mkdir -p "$laf/commit" "$laf/other" || exit
14
15 -git fsck --full |
15 +git fsck --full --no-reflogs |
16 while read dangling type sha1
17 do
18 case "$dangling" in