summaryrefslogtreecommitdiff
path: root/git-gc.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-22 07:28:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-22 07:28:28 (GMT)
commite3ff4b244726f89620201e3295f097cf00b6b502 (patch)
tree0974a068a5c3ce28d9c132ec232ff8da266beded /git-gc.sh
parenta0022eebf345a4515c7d148c303911010b1fa834 (diff)
downloadgit-e3ff4b244726f89620201e3295f097cf00b6b502.zip
git-e3ff4b244726f89620201e3295f097cf00b6b502.tar.gz
git-e3ff4b244726f89620201e3295f097cf00b6b502.tar.bz2
git-gc: do not run git-prune by default.
git-prune is not safe when run uncontrolled in parallel while other git operations are creating new objects. To avoid mistakes, do not run git-prune by default from git-gc. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-gc.sh')
-rwxr-xr-xgit-gc.sh18
1 files changed, 16 insertions, 2 deletions
diff --git a/git-gc.sh b/git-gc.sh
index 6de55f7..3e8c87c 100755
--- a/git-gc.sh
+++ b/git-gc.sh
@@ -4,12 +4,26 @@
#
# Cleanup unreachable files and optimize the repository.
-USAGE=''
+USAGE='git-gc [--prune]'
SUBDIRECTORY_OK=Yes
. git-sh-setup
+no_prune=:
+while case $# in 0) break ;; esac
+do
+ case "$1" in
+ --prune)
+ no_prune=
+ ;;
+ --)
+ usage
+ ;;
+ esac
+ shift
+done
+
git-pack-refs --prune &&
git-reflog expire --all &&
git-repack -a -d -l &&
-git-prune &&
+$no_prune git-prune &&
git-rerere gc || exit