diff options
| author | Brandon Casey <casey@nrlssc.navy.mil> | 2009-03-19 22:47:51 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-20 13:32:33 -0700 |
| commit | 171110a4a67f04c28d2ac89385ab88ba051fc780 (patch) | |
| tree | 1de92c77d1d69bd486f514e49f80c035240be7bd | |
| parent | 92cd872202241a0b80e88dadac5a4db071c8d1fa (diff) | |
| download | git-171110a4a67f04c28d2ac89385ab88ba051fc780.tar.gz | |
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>
| -rwxr-xr-x | git-repack.sh | 6 | ||||
| -rwxr-xr-x | t/t7700-repack.sh | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/git-repack.sh b/git-repack.sh index a736009c67..e02bf27aa6 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -71,11 +71,7 @@ case ",$all_into_one," in 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" diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index fa4772101f..adba8a1c65 100755 --- 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 ' -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 |