summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-02-16 11:57:18 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-02-17 02:11:38 -0800
commitcec2be76d9789b11c7f955b62dcad4b1050202af (patch)
tree514de6323dd92ab4d9e4134ff686ce8db89d0b5d
parentpack-objects: finishing touches. (diff)
downloadtgif-cec2be76d9789b11c7f955b62dcad4b1050202af.tar.xz
git-repack: allow passing a couple of flags to pack-objects.
A new flag -q makes underlying pack-objects less chatty. A new flag -f forces delta to be recomputed from scratch. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-repack.txt10
-rwxr-xr-xgit-repack.sh13
2 files changed, 16 insertions, 7 deletions
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 9060fe8897..6c0f792dad 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -9,7 +9,7 @@ objects into pack files.
SYNOPSIS
--------
-'git-repack' [-a] [-d] [-l] [-n]
+'git-repack' [-a] [-d] [-f] [-l] [-n] [-q]
DESCRIPTION
-----------
@@ -43,6 +43,14 @@ OPTIONS
Pass the `--local` option to `git pack-objects`, see
gitlink:git-pack-objects[1].
+-f::
+ Pass the `--no-reuse-delta` option to `git pack-objects`, see
+ gitlink:git-pack-objects[1].
+
+-q::
+ Pass the `-q` option to `git pack-objects`, see
+ gitlink:git-pack-objects[1].
+
-n::
Do not update the server information with
`git update-server-info`.
diff --git a/git-repack.sh b/git-repack.sh
index 1fafb6ecf6..3d6fec1c9a 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -3,17 +3,20 @@
# Copyright (c) 2005 Linus Torvalds
#
-USAGE='[-a] [-d] [-l] [-n]'
+USAGE='[-a] [-d] [-f] [-l] [-n] [-q]'
. git-sh-setup
-no_update_info= all_into_one= remove_redundant= local=
+no_update_info= all_into_one= remove_redundant=
+local= quiet= no_reuse_delta=
while case "$#" in 0) break ;; esac
do
case "$1" in
-n) no_update_info=t ;;
-a) all_into_one=t ;;
-d) remove_redundant=t ;;
- -l) local=t ;;
+ -q) quiet=-q ;;
+ -f) no_reuse_delta=--no-reuse-delta ;;
+ -l) local=--local ;;
*) usage ;;
esac
shift
@@ -39,9 +42,7 @@ case ",$all_into_one," in
find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
;;
esac
-if [ "$local" ]; then
- pack_objects="$pack_objects --local"
-fi
+pack_objects="$pack_objects $local $quiet $no_reuse_delta"
name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) 2>&1 |
git-pack-objects --non-empty $pack_objects .tmp-pack) ||
exit 1