@@ -21,58 +21,53 @@ export async function init(action: ActionInterface): Promise<void | Error> {
2121 info ( `Deploying using ${ action . tokenType } )
2222 info ( 'Configuring git…' )
2323
24- // Keep trying to configure Git with various different methods until it works with a maximum of 2 attempts.
25- const ATTEMPT_LIMIT = 2
26-
27- let attempt = 0
28- let rejected = false
29-
30- do {
31- attempt ++
24+ async function configureGit ( throwOnError : boolean ) {
25+ try {
26+ await execute (
27+ `git config --global --add safe.directory "${ action . workspace } ,
28+ action . workspace ,
29+ action . silent
30+ )
3231
33- if ( attempt > ATTEMPT_LIMIT ) {
34- throw new Error ( ) ;
35- }
32+ await execute (
33+ `git config user.name "${ action . name } ,
34+ action . workspace ,
35+ action . silent
36+ )
3637
37- if ( attempt > 1 ) {
3838 await execute (
39- `git init ` ,
39+ `git config user.email " ${ action . email } " ` ,
4040 action . workspace ,
4141 action . silent
4242 )
4343
4444 await execute (
45- `git commit -m "Initial commit" --allow-empty ` ,
45+ `git config core.ignorecase false ` ,
4646 action . workspace ,
4747 action . silent
4848 )
49+ } catch {
50+ if ( throwOnError ) {
51+ throw new Error ( )
52+ }
4953 }
54+ }
5055
51- await execute (
52- `git config --global --add safe.directory " ${ action . workspace } "` ,
53- action . workspace ,
54- action . silent
55- )
56+ try {
57+ await configureGit ( false )
58+ } catch {
59+ // Attempt to re-run if initial configuration failed using git init.
60+ await execute ( `git init` , action . workspace , action . silent )
5661
5762 await execute (
58- `git config user.name "${ action . name } ,
59- action . workspace ,
60- action . silent
61- )
62-
63- await execute (
64- `git config user.email "${ action . email } ,
63+ `git commit -m "Initial commit" --allow-empty` ,
6564 action . workspace ,
6665 action . silent
6766 )
68-
69- await execute (
70- `git config core.ignorecase false` ,
71- action . workspace ,
72- action . silent
73- )
74- } while ( rejected )
75-
67+
68+ await configureGit ( true )
69+ }
70+
7671 try {
7772 if ( ( process . env . CI && ! action . sshKey ) || action . isTest ) {
7873 /* Ensures that previously set Git configs do not interfere with the deployment.
0 commit comments