repack: do not fall back to incremental repacking with [-a|-A]
When repack is called with either the -a or -A option, the user has requested to repack all objects including those referenced by the alternates mechanism. Currently, if there are no local packs without .keep files, then repack will call pack-objects with the '--unpacked --incremental' options which causes it to exclude alternate packed objects. So, remove this fallback. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey committed
Nov 12, 2008 at 11:59 UTC
f7991d1ed37502c0e98dfa95866dfc1a8b08d834
1 file changed
+4
-7
git-repack.sh
+4
-7
@@ -71,13 +71,10 @@ case ",$all_into_one," in
71
existing="$existing $e"
72
fi
73
done
74
- fi
75
- if test -z "$args"
76
- then
77
- args='--unpacked --incremental'
78
- elif test -n "$unpack_unreachable"
79
- then
80
- args="$args $unpack_unreachable"
74
+ if test -n "$args" -a -n "$unpack_unreachable"
75
+ then
76
+ args="$args $unpack_unreachable"
77
+ fi
78
fi
79
;;
80
esac