From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Sep 2007 07:42:12 +0000 (-0700)
Subject: Merge branch 'jc/autogc' into js/rebase-i
X-Git-Tag: v1.5.4-rc0~389^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=61ab92df40b2c256299ad3d812ee0de14353098d;p=git.git

Merge branch 'jc/autogc' into js/rebase-i

* jc/autogc:
  git-gc --auto: run "repack -A -d -l" as necessary.
  git-gc --auto: restructure the way "repack" command line is built.
  git-gc --auto: protect ourselves from accumulated cruft
  git-gc --auto: add documentation.
  git-gc --auto: move threshold check to need_to_gc() function.
  repack -A -d: use --keep-unreachable when repacking
  pack-objects --keep-unreachable
  Export matches_pack_name() and fix its return value
  Invoke "git gc --auto" from commit, merge, am and rebase.
  Implement git gc --auto

Conflicts:

	builtin-pack-objects.c
---

61ab92df40b2c256299ad3d812ee0de14353098d
diff --cc builtin-pack-objects.c
index a15906bdb,ba7c8da5b..0be539ed7
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@@ -24,8 -20,8 +24,8 @@@ git-pack-objects [{ -q | --progress | -
  	[--max-pack-size=N] [--local] [--incremental] \n\
  	[--window=N] [--window-memory=N] [--depth=N] \n\
  	[--no-reuse-delta] [--no-reuse-object] [--delta-base-offset] \n\
 -	[--non-empty] [--revs [--unpacked | --all]*] [--reflog] \n\
 +	[--threads=N] [--non-empty] [--revs [--unpacked | --all]*] [--reflog] \n\
- 	[--stdout | base-name] [<ref-list | <object-list]";
+ 	[--stdout | base-name] [--keep-unreachable] [<ref-list | <object-list]";
  
  struct object_entry {
  	struct pack_idx_entry idx;
diff --cc git-repack.sh
index 0aae1a3ed,633b902e2..e72adc4d9
--- a/git-repack.sh
+++ b/git-repack.sh
@@@ -7,9 -7,9 +7,9 @@@ USAGE='[-a|-A] [-d] [-f] [-l] [-n] [-q
  SUBDIRECTORY_OK='Yes'
  . git-sh-setup
  
- no_update_info= all_into_one= remove_redundant=
+ no_update_info= all_into_one= remove_redundant= keep_unreachable=
  local= quiet= no_reuse= extra=
 -while case "$#" in 0) break ;; esac
 +while test $# != 0
  do
  	case "$1" in
  	-n)	no_update_info=t ;;