summaryrefslogtreecommitdiff
path: root/git-repack.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-23 16:06:01 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-23 16:06:01 -0700
commite5e9714a106ab668ac982cf73f31919eb4e354fd (patch)
tree01c02ee795feeb0b7594ab9d91f20bfe619d3042 /git-repack.sh
parent6aad47dec7a72bb36c64afb6c43f4dbcaa49e7f9 (diff)
parentbbefaa1f38a47e06c32612edc2f64a0168cc40b2 (diff)
downloadgit-e5e9714a106ab668ac982cf73f31919eb4e354fd.tar.gz
Merge branch 'bc/repack'
* bc/repack: Documentation/git-repack.txt: document new -A behaviour let pack-objects do the writing of unreachable objects as loose objects add a force_object_loose() function builtin-gc.c: deprecate --prune, it now really has no effect git-gc: always use -A when manually repacking repack: modify behavior of -A option to leave unreferenced objects unpacked Conflicts: builtin-pack-objects.c
Diffstat (limited to 'git-repack.sh')
-rwxr-xr-xgit-repack.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-repack.sh b/git-repack.sh
index 501519ab68..10f735cff5 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -8,7 +8,7 @@ OPTIONS_SPEC="\
git-repack [options]
--
a pack everything in a single pack
-A same as -a, and keep unreachable objects too
+A same as -a, and turn unreachable objects loose
d remove redundant packs, and run git-prune-packed
f pass --no-reuse-delta to git-pack-objects
n do not run git-update-server-info
@@ -23,7 +23,7 @@ max-pack-size= maximum size of each packfile
SUBDIRECTORY_OK='Yes'
. git-sh-setup
-no_update_info= all_into_one= remove_redundant= keep_unreachable=
+no_update_info= all_into_one= remove_redundant= unpack_unreachable=
local= quiet= no_reuse= extra=
while test $# != 0
do
@@ -31,7 +31,7 @@ do
-n) no_update_info=t ;;
-a) all_into_one=t ;;
-A) all_into_one=t
- keep_unreachable=--keep-unreachable ;;
+ unpack_unreachable=--unpack-unreachable ;;
-d) remove_redundant=t ;;
-q) quiet=-q ;;
-f) no_reuse=--no-reuse-object ;;
@@ -79,9 +79,9 @@ case ",$all_into_one," in
if test -z "$args"
then
args='--unpacked --incremental'
- elif test -n "$keep_unreachable"
+ elif test -n "$unpack_unreachable"
then
- args="$args $keep_unreachable"
+ args="$args $unpack_unreachable"
fi
;;
esac