Merge branch 'jc/autogc' into js/rebase-i
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Sep 2007 07:42:12 +0000 (00:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Sep 2007 07:42:12 +0000 (00:42 -0700)
* 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

1  2 
Documentation/config.txt
builtin-pack-objects.c
cache.h
git-am.sh
git-commit.sh
git-merge.sh
git-rebase--interactive.sh
git-repack.sh

Simple merge
@@@ -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 cache.h
Simple merge
diff --cc git-am.sh
Simple merge
diff --cc git-commit.sh
Simple merge
diff --cc git-merge.sh
Simple merge
Simple merge
diff --cc 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 ;;