git-repack.sh: don't use --kept-pack-only option to pack-objects

The --kept-pack-only option to pack-objects treats all kept packs as equal.
This results in objects that reside in an alternate pack that has a .keep
file, not being packed into a newly created pack when the user specifies the
-a option to repack.  Since the user may not have any control over the
alternate database, git should not refrain from repacking those objects
even though they are in a pack with a .keep file.

This fixes the 'packed obs in alternate ODB kept pack are repacked' test in
t7700.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-repack.sh b/git-repack.sh
index a736009c67ec938485c16aa1760b4e56d2e4cc6f..e02bf27aa6a7ee9552f5d0a937e38e6689704438 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -71,11 +71,7 @@ case ",$all_into_one," in
                                existing="$existing $e"
                        fi
                done
                                existing="$existing $e"
                        fi
                done

-               if test -n "$existing"
-               then
-                       args="--kept-pack-only"
-               fi
-               if test -n "$args" -a -n "$unpack_unreachable" -a \
+               if test -n "$existing" -a -n "$unpack_unreachable" -a \

                        -n "$remove_redundant"
                then
                        args="$args $unpack_unreachable"
                        -n "$remove_redundant"
                then
                        args="$args $unpack_unreachable"

diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index fa4772101fda56116698f2063572ebfef8d4d46a..adba8a1c65822c1c05045a0f22930757f6eaeadf 100755 (executable)
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -69,7 +69,7 @@ test_expect_success 'packed obs in alt ODB are repacked even when local repo is
        done
 '
 
        done
 '
 

-test_expect_failure 'packed obs in alternate ODB kept pack are repacked' '
+test_expect_success 'packed obs in alternate ODB kept pack are repacked' '

        # swap the .keep so the commit object is in the pack with .keep
        for p in alt_objects/pack/*.pack
        do
        # swap the .keep so the commit object is in the pack with .keep
        for p in alt_objects/pack/*.pack
        do