fsck-cache: read the default reference information even when

not doing reachability analysis.

This avoids the dangling head problem, and means that just a
plain "git-fsck-cache" with no parameters will DTRT.

diff --git a/fsck-cache.c b/fsck-cache.c
index d2aff8c64380f5655ea14de9f6f6e4ce468e525a..c4b1c1ae60c050d3d0645f90014fe7e30f82f284 100644 (file)
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -419,11 +419,11 @@ int main(int argc, char **argv)
        }
 
        /*
        }
 
        /*

-        * If we've been asked to do reachability without any explicit
-        * head information, do the default ones from .git/refs. We also
-        * consider the index file in this case (ie this implies --cache).
+        * If we've not been gived any explicit head information, do the
+        * default ones from .git/refs. We also consider the index file
+        * in this case (ie this implies --cache).

         */
         */

-       if (show_unreachable && !heads) {
+       if (!heads) {

                get_default_heads();
                keep_cache_objects = 1;
        }
                get_default_heads();
                keep_cache_objects = 1;
        }