diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 12:45:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 12:45:07 -0800 |
| commit | be0a4c820094c72cff67b69de8ba7ce88145ce86 (patch) | |
| tree | fb9bac5ca8cd01ac38f5748547bbf689a8d02f15 | |
| parent | 2f9d2e22cb553d26e355e63171678a848170dcf8 (diff) | |
| parent | 89d71f7564cb3945b2775092284a4de807f577e4 (diff) | |
| download | git-be0a4c820094c72cff67b69de8ba7ce88145ce86.tar.gz git-be0a4c820094c72cff67b69de8ba7ce88145ce86.tar.xz | |
Merge branch 'jk/repack-reuse-object' into maint
* jk/repack-reuse-object:
Documentation: pack.compression: explain how to recompress
repack: add -F flag to let user choose between --no-reuse-delta/object
Conflicts:
Documentation/git-repack.txt
| -rw-r--r-- | Documentation/config.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-repack.txt | 6 | ||||
| -rwxr-xr-x | git-repack.sh | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 7f6b2109b..e6a8f27f2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1466,6 +1466,10 @@ pack.compression:: not set, defaults to -1, the zlib default, which is "a default compromise between speed and compression (currently equivalent to level 6)." ++ +Note that changing the compression level will not automatically recompress +all existing objects. You can force recompression by passing the -F option +to linkgit:git-repack[1]. pack.deltaCacheSize:: The maximum memory in bytes used for caching deltas in diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index af79b8651..27f7865b0 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -8,7 +8,7 @@ git-repack - Pack unpacked objects in a repository SYNOPSIS -------- -'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=<n>] [--depth=<n>] +'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=<n>] [--depth=<n>] DESCRIPTION ----------- @@ -62,6 +62,10 @@ other objects in that pack they already have locally. linkgit:git-pack-objects[1]. -f:: + Pass the `--no-reuse-delta` option to `git-pack-objects`, see + linkgit:git-pack-objects[1]. + +-F:: Pass the `--no-reuse-object` option to `git-pack-objects`, see linkgit:git-pack-objects[1]. diff --git a/git-repack.sh b/git-repack.sh index 1eb3bca35..769baaf7e 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -10,7 +10,8 @@ git repack [options] a pack everything in a single pack A same as -a, and turn unreachable objects loose d remove redundant packs, and run git-prune-packed -f pass --no-reuse-object to git-pack-objects +f pass --no-reuse-delta to git-pack-objects +F pass --no-reuse-object to git-pack-objects n do not run git-update-server-info q,quiet be quiet l pass --local to git-pack-objects @@ -34,7 +35,8 @@ do unpack_unreachable=--unpack-unreachable ;; -d) remove_redundant=t ;; -q) GIT_QUIET=t ;; - -f) no_reuse=--no-reuse-object ;; + -f) no_reuse=--no-reuse-delta ;; + -F) no_reuse=--no-reuse-object ;; -l) local=--local ;; --max-pack-size|--window|--window-memory|--depth) extra="$extra $1=$2"; shift ;; |