From: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
The loose-objects task deletes loose objects that already exist in a
pack-file, then place the remaining loose objects into a new pack-file.
If this step runs all the time, then we risk creating pack-files with
very few objects with every 'git commit' process. To prevent
overwhelming the packs directory with small pack-files, place a minimum
number of objects to justify the task.
The 'maintenance.loose-objects.auto' config option specifies a minimum
number of loose objects to justify the task to run under the '--auto'
option. This defaults to 100 loose objects. Setting the value to zero
will prevent the step from running under '--auto' while a negative value
will force it to run every time.
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
---
Documentation/config/maintenance.txt | 9 +++++++++
builtin/gc.c | 30 ++++++++++++++++++++++++++++
t/t7900-maintenance.sh | 25 +++++++++++++++++++++++
3 files changed, 64 insertions(+)
diff --git a/Documentation/config/maintenance.txt b/Documentation/config/maintenance.txt
index 9bd69b9df3..a9442dd260 100644
--- a/Documentation/config/maintenance.txt
+++ b/Documentation/config/maintenance.txt
@@ -12,3 +12,12 @@ maintenance.commit-graph.auto::
reachable commits that are not in the commit-graph file is at least
the value of `maintenance.commit-graph.auto`. The default value is
100.
+
+maintenance.loose-objects.auto::
+ This integer config option controls how often the `loose-objects` task
+ should be run as part of `git maintenance run --auto`. If zero, then
+ the `loose-objects` task will not run with the `--auto` option. A
+ negative value will force the task to run every time. Otherwise, a
+ positive value implies the command should run when the number of
+ loose objects is at least the value of `maintenance.loose-objects.auto`.
+ The default value is 100.
diff --git a/builtin/gc.c b/builtin/gc.c
index 84ad360d17..ae59a28203 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -951,6 +951,35 @@ struct write_loose_object_data {
int batch_size;
};
+static int loose_object_auto_limit = 100;
+
+static int loose_object_count(const struct object_id *oid,
+ const char *path,
+ void *data)
+{
+ int *count = (int*)data;
+ if (++(*count) >= loose_object_auto_limit)
+ return 1;
+ return 0;
+}
+
+static int loose_object_auto_condition(void)
+{
+ int count = 0;
+
+ git_config_get_int("maintenance.loose-objects.auto",
+ &loose_object_auto_limit);
+
+ if (!loose_object_auto_limit)
+ return 0;
+ if (loose_object_auto_limit < 0)
+ return 1;
+
+ return for_each_loose_file_in_objdir(the_repository->objects->odb->path,
+ loose_object_count,
+ NULL, NULL, &count);
+}
+
static int loose_object_exists(const struct object_id *oid,
const char *path,
void *data)
@@ -1285,6 +1314,7 @@ static void initialize_tasks(void)
tasks[num_tasks]->name = "loose-objects";
tasks[num_tasks]->fn = maintenance_task_loose_objects;
+ tasks[num_tasks]->auto_condition = loose_object_auto_condition;
num_tasks++;
tasks[num_tasks]->name = "incremental-repack";
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
index 373b8dbe04..e4244d7c3c 100755
--- a/t/t7900-maintenance.sh
+++ b/t/t7900-maintenance.sh
@@ -115,6 +115,31 @@ test_expect_success 'loose-objects task' '
test_cmp packs-between packs-after
'
+test_expect_success 'maintenance.loose-objects.auto' '
+ git repack -adk &&
+ GIT_TRACE2_EVENT="$(pwd)/trace-lo1.txt" \
+ git -c maintenance.loose-objects.auto=1 maintenance \
+ run --auto --task=loose-objects &&
+ ! grep "\"prune-packed\"" trace-lo1.txt &&
+ for i in 1 2
+ do
+ printf data-A-$i | git hash-object -t blob --stdin -w &&
+ GIT_TRACE2_EVENT="$(pwd)/trace-loA-$i" \
+ git -c maintenance.loose-objects.auto=2 \
+ maintenance run --auto --task=loose-objects &&
+ ! grep "\"prune-packed\"" trace-loA-$i &&
+ printf data-B-$i | git hash-object -t blob --stdin -w &&
+ GIT_TRACE2_EVENT="$(pwd)/trace-loB-$i" \
+ git -c maintenance.loose-objects.auto=2 \
+ maintenance run --auto --task=loose-objects &&
+ grep "\"prune-packed\"" trace-loB-$i &&
+ GIT_TRACE2_EVENT="$(pwd)/trace-loC-$i" \
+ git -c maintenance.loose-objects.auto=2 \
+ maintenance run --auto --task=loose-objects &&
+ grep "\"prune-packed\"" trace-loC-$i || return 1
+ done
+'
+
test_expect_success 'incremental-repack task' '
packDir=.git/objects/pack &&
for i in $(test_seq 1 5)
--
gitgitgadget
