repack: turn on "ref paranoia" when doing a destructive repack

If we are repacking with "-ad", we will drop any unreachable
objects. Likewise, using "-Ad --unpack-unreachable=<time>"
will drop any old, unreachable objects. In these cases, we
want to make sure the reachability we compute with "--all"
is complete. We can do this by passing GIT_REF_PARANOIA=1 in
the environment to pack-objects.

Note that "-Ad" is safe already, because it only loosens
unreachable objects. It is up to "git prune" to avoid
deleting them.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/repack.c b/builtin/repack.c
index 3f852f35d1e786b2584d435d640ae830a9f34639..2fe1b30d716958b451a5486dcedfb811062f786f 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -228,13 +228,17 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
                get_non_kept_pack_filenames(&existing_packs);
 
                if (existing_packs.nr && delete_redundant) {
                get_non_kept_pack_filenames(&existing_packs);
 
                if (existing_packs.nr && delete_redundant) {

-                       if (unpack_unreachable)
+                       if (unpack_unreachable) {

                                argv_array_pushf(&cmd.args,
                                                "--unpack-unreachable=%s",
                                                unpack_unreachable);
                                argv_array_pushf(&cmd.args,
                                                "--unpack-unreachable=%s",
                                                unpack_unreachable);

-                       else if (pack_everything & LOOSEN_UNREACHABLE)
+                               argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
+                       } else if (pack_everything & LOOSEN_UNREACHABLE) {

                                argv_array_push(&cmd.args,
                                                "--unpack-unreachable");
                                argv_array_push(&cmd.args,
                                                "--unpack-unreachable");

+                       } else {
+                               argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
+                       }

                }
        } else {
                argv_array_push(&cmd.args, "--unpacked");
                }
        } else {
                argv_array_push(&cmd.args, "--unpacked");

diff --git a/t/t5312-prune-corruption.sh b/t/t5312-prune-corruption.sh
index 5ffb81715e052b0bca32fd862441906c5187bbb8..e8d04ef1bfb072ddd6117201cefb3959941ec034 100755 (executable)
--- a/t/t5312-prune-corruption.sh
+++ b/t/t5312-prune-corruption.sh
@@ -38,7 +38,7 @@ test_expect_success 'put bogus object into pack' '
        verbose git cat-file -e $bogus
 '
 
        verbose git cat-file -e $bogus
 '
 

-test_expect_failure 'destructive repack keeps packed object' '
+test_expect_success 'destructive repack keeps packed object' '

        test_might_fail git repack -Ad --unpack-unreachable=now &&
        verbose git cat-file -e $bogus &&
        test_might_fail git repack -ad &&
        test_might_fail git repack -Ad --unpack-unreachable=now &&
        verbose git cat-file -e $bogus &&
        test_might_fail git repack -ad &&