Skip to content

Commit e47e1e0

Browse files
dschomjcheetham
authored andcommitted
Merge branch 'scalar-and-non-interactive-authentication-in-maintenance'
This topic branch first merges the topic branch that teaches background maintenance to avoid trying to authenticate interactively, and then teaches `scalar reconfigure` to enforce that. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents 21361a7 + 3ddcf2b commit e47e1e0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

scalar.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,8 @@ static int cmd_reconfigure(int argc, const char **argv)
11301130
old_repo = the_repository;
11311131
the_repository = &r;
11321132

1133-
if (set_recommended_config(1) >= 0)
1133+
if (set_recommended_config(1) >= 0 &&
1134+
toggle_maintenance(1) >= 0)
11341135
succeeded = 1;
11351136

11361137
the_repository = old_repo;

0 commit comments

Comments
 (0)