scalar: configure maintenance during 'reconfigure'
The 'scalar reconfigure' command is intended to update registered repos with the latest settings available. However, up to now we were not reregistering the repos with background maintenance. In particular, this meant that the background maintenance schedule would not be updated if there are improvements between versions. Be sure to register repos for maintenance during the reconfigure step. Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
4f5551957d
commit
b9183b0a02
3
scalar.c
3
scalar.c
@ -723,6 +723,9 @@ static int cmd_reconfigure(int argc, const char **argv)
|
||||
|
||||
the_repository = old_repo;
|
||||
|
||||
if (toggle_maintenance(1) >= 0)
|
||||
succeeded = 1;
|
||||
|
||||
loop_end:
|
||||
if (!succeeded) {
|
||||
res = -1;
|
||||
|
@ -176,8 +176,11 @@ test_expect_success 'scalar reconfigure' '
|
||||
scalar reconfigure one &&
|
||||
test true = "$(git -C one/src config core.preloadIndex)" &&
|
||||
git -C one/src config core.preloadIndex false &&
|
||||
scalar reconfigure -a &&
|
||||
test true = "$(git -C one/src config core.preloadIndex)"
|
||||
rm one/src/cron.txt &&
|
||||
GIT_TRACE2_EVENT="$(pwd)/reconfigure" scalar reconfigure -a &&
|
||||
test_path_is_file one/src/cron.txt &&
|
||||
test true = "$(git -C one/src config core.preloadIndex)" &&
|
||||
test_subcommand git maintenance start <reconfigure
|
||||
'
|
||||
|
||||
test_expect_success 'scalar reconfigure --all with includeIf.onbranch' '
|
||||
|
Reference in New Issue
Block a user