Skip to content

Commit 850cf4d

Browse files
committed
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 1d1eb95 + 1eb82d1 commit 850cf4d

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
@@ -1126,7 +1126,8 @@ static int cmd_reconfigure(int argc, const char **argv)
11261126
old_repo = the_repository;
11271127
the_repository = &r;
11281128

1129-
if (set_recommended_config(1) >= 0)
1129+
if (set_recommended_config(1) >= 0 &&
1130+
toggle_maintenance(1) >= 0)
11301131
succeeded = 1;
11311132

11321133
the_repository = old_repo;

0 commit comments

Comments
 (0)