diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-11 13:49:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-11 13:49:56 -0700 |
| commit | aec813062b340e6bb181470cf57cc4b4406e1bb8 (patch) | |
| tree | bb2b33ca6b89fdfd8d0e4b2e6d34f5a806674b67 /git-repack.sh | |
| parent | 8f4cc7911955a3642af601394a4b4473e7bfde33 (diff) | |
| parent | 69e020ae00ebd3f7ae3c2f35acb139361417ef64 (diff) | |
| download | git-aec813062b340e6bb181470cf57cc4b4406e1bb8.tar.gz | |
Merge branch 'jc/maint-1.6.0-keep-pack'
* jc/maint-1.6.0-keep-pack:
is_kept_pack(): final clean-up
Simplify is_kept_pack()
Consolidate ignore_packed logic more
has_sha1_kept_pack(): take "struct rev_info"
has_sha1_pack(): refactor "pretend these packs do not exist" interface
git-repack: resist stray environment variable
Diffstat (limited to 'git-repack.sh')
| -rwxr-xr-x | git-repack.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-repack.sh b/git-repack.sh index be6db5e805..0144c2d7b9 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -60,6 +60,7 @@ case ",$all_into_one," in args='--unpacked --incremental' ;; ,t,) + args= existing= if [ -d "$PACKDIR" ]; then for e in `cd "$PACKDIR" && find . -type f -name '*.pack' \ | sed -e 's/^\.\///' -e 's/\.pack$//'` @@ -67,10 +68,13 @@ case ",$all_into_one," in if [ -e "$PACKDIR/$e.keep" ]; then : keep else - args="$args --unpacked=$e.pack" existing="$existing $e" fi done + if test -n "$existing" + then + args="--kept-pack-only" + fi if test -n "$args" -a -n "$unpack_unreachable" -a \ -n "$remove_redundant" then |