From 75cb4bf7c4070c9ed5fb446f5cdadfb652cd9eaa Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Tue, 9 Jun 2020 21:18:04 -0700
Subject: [PATCH] gc-util-functions: move default packing options into library

Avoid duplicating the default packing options by moving them
into the common gc-util-functions.sh script library.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
---
 jobd/gc-git-svn.sh        | 18 ------------------
 jobd/gc-util-functions.sh | 18 ++++++++++++++++++
 jobd/gc.sh                |  4 ----
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/jobd/gc-git-svn.sh b/jobd/gc-git-svn.sh
index a4fba54..1b8aa6d 100755
--- a/jobd/gc-git-svn.sh
+++ b/jobd/gc-git-svn.sh
@@ -32,24 +32,6 @@ umask 002
 v_get_proj_from_dir proj
 proj="${proj%.git}"
 
-# packing options
-packopts="--depth=50 --window=50 --window-memory=${var_window_memory:-1g}"
-quiet="-q"; [ "${show_progress:-0}" = "0" ] || quiet=
-
-# pack any existing, non-packed loose objects into a new _l.pack file then run prune-packed
-# note that prune-packed is NOT run beforehand -- the caller must do that if needed
-# loose objects need not be part of complete commits/trees as --weak-naming is used
-pack_incremental_loose_objects() {
-	_lpacks="$(run_combine_packs </dev/null --names --loose --weak-naming --incremental --non-empty --all-progress-implied ${quiet:---progress} $packopts)"
-	if [ -n "$_lpacks" ]; then
-		# We need to identify these packs later so we don't combine_packs them
-		for _objpack in $_lpacks; do
-			rename_pack "objects/pack/pack-$_objpack" "objects/pack/pack-${_objpack}_l" || :
-		done
-		git prune-packed $quiet
-	fi
-}
-
 if lotsa_loose_objects; then
 	echo "Packing loose objects ($(date))"
 	pack_incremental_loose_objects
diff --git a/jobd/gc-util-functions.sh b/jobd/gc-util-functions.sh
index 7040434..71c64f7 100755
--- a/jobd/gc-util-functions.sh
+++ b/jobd/gc-util-functions.sh
@@ -7,6 +7,10 @@
 # this script without having already sourced shlib.sh
 [ -n "$var_git_exec_path" ] || exit 2
 
+# default packing options
+packopts="--depth=50 --window=50 --window-memory=${var_window_memory:-1g}"
+quiet="-q"; [ "${show_progress:-0}" = "0" ] || quiet=
+
 # make sure combine-packs uses the correct Git executable
 run_combine_packs() {
 	PATH="$var_git_exec_path:$cfg_basedir/bin:$PATH" @basedir@/jobd/combine-packs.sh "$@"
@@ -67,3 +71,17 @@ lotsa_loose_objects() {
 	_objs=$(( $(find -L objects/17 objects/68 objects/71 objects/86 -maxdepth 1 -name "$octet19*" -type f -print 2>/dev/null | LC_ALL=C wc -l) ))
 	[ ${_objs:-0} -ge 5 ]
 }
+
+# pack any existing, non-packed loose objects into a new _l.pack file then run prune-packed
+# note that prune-packed is NOT run beforehand -- the caller must do that if needed
+# loose objects need not be part of complete commits/trees as --weak-naming is used
+pack_incremental_loose_objects() {
+	_lpacks="$(run_combine_packs </dev/null --names --loose --weak-naming --incremental --non-empty --all-progress-implied ${quiet:---progress} $packopts)"
+	if [ -n "$_lpacks" ]; then
+		# We need to identify these packs later so we don't combine_packs them
+		for _objpack in $_lpacks; do
+			rename_pack "objects/pack/pack-$_objpack" "objects/pack/pack-${_objpack}_l" || :
+		done
+		git prune-packed $quiet
+	fi
+}
diff --git a/jobd/gc.sh b/jobd/gc.sh
index ce60cb1..358f40a 100755
--- a/jobd/gc.sh
+++ b/jobd/gc.sh
@@ -21,10 +21,6 @@ unset GIROCCO_SUPPRESS_AUTO_GC_UPDATE
 . "$cfg_basedir/jobd/generate-auto-gc-update.sh"
 GIROCCO_SUPPRESS_AUTO_GC_UPDATE=1 && export GIROCCO_SUPPRESS_AUTO_GC_UPDATE
 
-# packing options
-packopts="--depth=50 --window=50 --window-memory=${var_window_memory:-1g}"
-quiet="-q"; [ "${show_progress:-0}" = "0" ] || quiet=
-
 umask 002
 [ "$cfg_permission_control" != "Hooks" ] || umask 000
 clean_git_env
-- 
2.11.4.GIT