Skip to content

Commit 79d17ae

Browse files
committed
Merge branch 'releases/v4' of https://github.com/JamesIves/github-pages-deploy-action into releases/v4
2 parents 04eb643 + 0fb7278 commit 79d17ae

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

lib/git.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ function init(action) {
2626
try {
2727
(0, core_1.info)(`Deploying using ${action.tokenType}… 🔑`);
2828
(0, core_1.info)('Configuring git…');
29+
try {
30+
yield (0, execute_1.execute)(`git config --global --add safe.directory "${action.workspace}"`, action.workspace, action.silent);
31+
}
32+
catch (_a) {
33+
(0, core_1.info)('Unable to set workspace as a safe directory…');
34+
}
2935
yield (0, execute_1.execute)(`git config user.name "${action.name}"`, action.workspace, action.silent);
3036
yield (0, execute_1.execute)(`git config user.email "${action.email}"`, action.workspace, action.silent);
3137
yield (0, execute_1.execute)(`git config core.ignorecase false`, action.workspace, action.silent);
@@ -40,7 +46,7 @@ function init(action) {
4046
throw new Error();
4147
}
4248
}
43-
catch (_a) {
49+
catch (_b) {
4450
(0, core_1.info)('Unable to unset previous git config authentication as it may not exist, continuing…');
4551
}
4652
try {
@@ -49,7 +55,7 @@ function init(action) {
4955
throw new Error();
5056
}
5157
}
52-
catch (_b) {
58+
catch (_c) {
5359
(0, core_1.info)('Attempted to remove origin but failed, continuing…');
5460
}
5561
yield (0, execute_1.execute)(`git remote add origin ${action.repositoryPath}`, action.workspace, action.silent);

node_modules/@types/node/README.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/@types/node/buffer.d.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/@types/node/net.d.ts

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/@types/node/package.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)