diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-21 13:19:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-21 13:25:47 -0700 |
| commit | 91efcf60653b2538b05625807293b97c07cb04f4 (patch) | |
| tree | 0240b448657063bc251be1c79596377ea8b91542 /git-repack.sh | |
| parent | 43885c2a557871aedcbb1a412fc18e98c3dd1dc4 (diff) | |
| parent | 70827b15bfb11f7aea52c6995956be9d149233e1 (diff) | |
| download | git-91efcf60653b2538b05625807293b97c07cb04f4.tar.xz | |
Merge branch 'master' into jc/fmt-patch
* master:
Split up builtin commands into separate files from git.c
git-log produces no output
fix pack-object buffer size
mailinfo: decode underscore used in "Q" encoding properly.
Reintroduce svn pools to solve the memory leak.
pack-objects: do not stop at object that is "too small"
git-commit --amend: two fixes.
get_tree_entry(): make it available from tree-walk
sha1_name.c: no need to include diff.h; tree-walk.h will do.
sha1_name.c: prepare to make get_tree_entry() reusable from others.
get_sha1() shorthands for blob/tree objects
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.
diff: move diff.c to diff-lib.c to make room.
git log: don't do merge diffs by default
Allow "git repack" users to specify repacking window/depth
Document git-clone --reference
Fix filename scaling for binary files
Fix uninteresting tags in new revision parsing
Conflicts:
Adjusted the addition of fmt-patch to match the recent split
from git.c to builtin.log.c.
Diffstat (limited to 'git-repack.sh')
| -rwxr-xr-x | git-repack.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-repack.sh b/git-repack.sh index a5d349fd09..e0c9f323c3 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -5,9 +5,9 @@ USAGE='[-a] [-d] [-f] [-l] [-n] [-q]' . git-sh-setup - + no_update_info= all_into_one= remove_redundant= -local= quiet= no_reuse_delta= +local= quiet= no_reuse_delta= extra= while case "$#" in 0) break ;; esac do case "$1" in @@ -17,6 +17,8 @@ do -q) quiet=-q ;; -f) no_reuse_delta=--no-reuse-delta ;; -l) local=--local ;; + --window=*) extra="$extra $1" ;; + --depth=*) extra="$extra $1" ;; *) usage ;; esac shift @@ -40,7 +42,7 @@ case ",$all_into_one," in find . -type f \( -name '*.pack' -o -name '*.idx' \) -print` ;; esac -pack_objects="$pack_objects $local $quiet $no_reuse_delta" +pack_objects="$pack_objects $local $quiet $no_reuse_delta$extra" name=$(git-rev-list --objects --all $rev_list 2>&1 | git-pack-objects --non-empty $pack_objects .tmp-pack) || exit 1 |