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

drafnel · gitster · commit 171110a4a67f · 2009-03-20T13:32:33.000-07:00
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 &lt;casey@nrlssc.navy.mil&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ test_expect_success 'packed obs in alt ODB are repacked even when local repo is`
`69`	`69`	`done`
`70`	`70`	`'`
`71`	`71`
`72`		`-test_expect_failure 'packed obs in alternate ODB kept pack are repacked' '`
	`72`	`+test_expect_success 'packed obs in alternate ODB kept pack are repacked' '`
`73`	`73`	`# swap the .keep so the commit object is in the pack with .keep`
`74`	`74`	`for p in alt_objects/pack/*.pack`
`75`	`75`	`do`