repack: use only pack-objects, not rev-list.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Sep 18, 2006 at 02:29 UTC
cd0d74d2f9c7578b36e705dda55f79731dbe9696
1 file changed
+4
-9
git-repack.sh
+4
-9
@@ -32,12 +32,10 @@ trap 'rm -f "$PACKTMP"-*' 0 1 2 3 15
32
# There will be more repacking strategies to come...
33
case ",$all_into_one," in
34
,,)
35
- rev_list='--unpacked'
36
- pack_objects='--incremental'
35
+ args='--unpacked --incremental'
36
;;
37
,t,)
39
- rev_list=
40
- pack_objects=
38
+ args=
39
40
# Redundancy check in all-into-one case is trivial.
41
existing=`test -d "$PACKDIR" && cd "$PACKDIR" && \
@@ -45,11 +43,8 @@ case ",$all_into_one," in
43
;;
44
esac
45
48
-pack_objects="$pack_objects $local $quiet $no_reuse_delta$extra"
49
-name=$( { git-rev-list --objects --all $rev_list ||
50
- echo "git-rev-list died with exit code $?"
51
- } |
52
- git-pack-objects --non-empty $pack_objects "$PACKTMP") ||
46
+args="$args $local $quiet $no_reuse_delta$extra"
47
+name=$(git-pack-objects --non-empty --all $args </dev/null "$PACKTMP") ||
48
exit 1
49
if [ -z "$name" ]; then
50
echo Nothing new to pack.