Merge branch 'releases/v4-validate' of https://github.com/JamesIves/github-pages-deploy-action into releases/v4-validate

Author: JamesIves

lib/git.js

@@ -56,58 +56,64 @@ function init(action) {
                 (0, core_1.info)('Unable to unset previous git config authentication as it may not exist, continuing…');
             }
             // Remove includeIf directives that point to credential files (actions/checkout@v6+)
+            // This runs unconditionally because checkout@v6 credentials must be cleared
             try {
-                // Always try to remove includeIf credentials when not using SSH key
-                // This is necessary because actions/checkout@v6+ uses includeIf to inject credentials
-                if (!action.sshKey || action.isTest) {
-                    /* actions/checkout@v6+ uses includeIf directives to inject credentials.
-                       We need to remove these to ensure the provided token/SSH key is used instead.
-                       Check local, global, and system scopes as containers may configure differently.
-                    */
-                    for (const scope of ['--local', '--global', '--system']) {
-                        try {
-                            const includeIfResult = yield (0, execute_1.execute)(`git config ${scope} --get-regexp 'includeIf\\..*\\.path'`, action.workspace, true // Always silent to avoid exposing credential paths
-                            );
-                            // Parse the output to find includeIf sections
-                            if (includeIfResult.stdout) {
-                                const lines = includeIfResult.stdout.trim().split('\n');
-                                for (const line of lines) {
-                                    // Skip empty lines
-                                    if (!line.trim()) {
-                                        continue;
+                /* actions/checkout@v6+ uses includeIf directives to inject credentials.
+                   We need to remove these to ensure the provided token/SSH key is used instead.
+                   Check local, global, and system scopes as containers may configure differently.
+                */
+                (0, core_1.info)('Checking for includeIf credential directives from actions/checkout@v6...');
+                let foundAny = false;
+                for (const scope of ['--local', '--global', '--system']) {
+                    try {
+                        const includeIfResult = yield (0, execute_1.execute)(`git config ${scope} --get-regexp 'includeIf\\..*\\.path'`, action.workspace, true // Always silent to avoid exposing credential paths
+                        );
+                        // Parse the output to find includeIf sections
+                        if (includeIfResult.stdout) {
+                            const lines = includeIfResult.stdout.trim().split('\n');
+                            for (const line of lines) {
+                                // Skip empty lines
+                                if (!line.trim()) {
+                                    continue;
+                                }
+                                // Each line is in format: includeIf.gitdir:/path/.git.path /path/to/config
+                                // The regex captures the section name without the trailing .path suffix
+                                const match = line.match(/^(includeIf\.[^\s]+)\.path\s+/);
+                                if (match) {
+                                    const section = match[1];
+                                    foundAny = true;
+                                    (0, core_1.info)(`Found includeIf directive in ${scope} scope: ${section}`);
+                                    try {
+                                        yield (0, execute_1.execute)(`git config ${scope} --remove-section "${section}"`, action.workspace, true // Always silent
+                                        );
+                                        (0, core_1.info)(`Removed includeIf section: ${section}`);
                                     }
-                                    // Each line is in format: includeIf.gitdir:/path/.git.path /path/to/config
-                                    // The regex captures the section name without the trailing .path suffix
-                                    const match = line.match(/^(includeIf\.[^\s]+)\.path\s+/);
-                                    if (match) {
-                                        const section = match[1];
-                                        try {
-                                            yield (0, execute_1.execute)(`git config ${scope} --remove-section "${section}"`, action.workspace, true // Always silent
-                                            );
-                                        }
-                                        catch (_c) {
-                                            // Continue if section cannot be removed
-                                        }
+                                    catch (error) {
+                                        (0, core_1.info)(`Failed to remove includeIf section ${section}: ${(0, util_1.extractErrorMessage)(error)}`);
                                     }
                                 }
                             }
                         }
-                        catch (_d) {
-                            // Continue if no includeIf directives exist in this scope
-                        }
                     }
+                    catch (error) {
+                        // Log but continue - this is expected if no config exists in this scope
+                        (0, core_1.info)(`No includeIf directives found in ${scope} scope (or scope not accessible)`);
+                    }
+                }
+                if (!foundAny) {
+                    (0, core_1.info)('No includeIf credential directives found');
                 }
             }
-            catch (_e) {
-                // Silently continue if no includeIf directives exist or cannot be read
+            catch (error) {
+                (0, core_1.info)(`Error while checking for includeIf directives: ${(0, util_1.extractErrorMessage)(error)}`);
             }
             try {
                 yield (0, execute_1.execute)(`git remote rm origin`, action.workspace, action.silent);
                 if (action.isTest === constants_1.TestFlag.UNABLE_TO_REMOVE_ORIGIN) {
                     throw new Error();
                 }
             }
-            catch (_f) {
+            catch (_c) {
                 (0, core_1.info)('Attempted to remove origin but failed, continuing…');
             }
             yield (0, execute_1.execute)(`git remote add origin ${action.repositoryPath}`, action.workspace, action.silent);