Skip to content

Commit

Permalink
Deploy Production Code for Commit fb1eb73 🚀
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesIves committed Sep 29, 2024
1 parent fb1eb73 commit 0c6bce4
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion lib/worktree.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function generateWorktree(action, worktreedir, branchExists) {
catch (error) {
(0, core_1.info)('Error encountered while checking out branch. Attempting to continue with a new branch name.');
branchName = `temp-${Date.now()}`;
checkout = new GitCheckout(branchName, `origin/${action.branch}`);
checkout = new GitCheckout(branchName);
yield (0, execute_1.execute)(checkout.toString(), `${action.workspace}/${worktreedir}`, action.silent);
}
if (!branchExists) {
Expand All @@ -91,6 +91,15 @@ function generateWorktree(action, worktreedir, branchExists) {
// New history isn't singleCommit, create empty initial commit
yield (0, execute_1.execute)(`git commit --no-verify --allow-empty -m "Initial ${branchName} commit"`, `${action.workspace}/${worktreedir}`, action.silent);
}
/**
* Ensure that the workspace is a safe directory.
*/
try {
yield (0, execute_1.execute)(`git config --global --add safe.directory "${action.workspace}/${worktreedir}"`, action.workspace, action.silent);
}
catch (_a) {
(0, core_1.info)('Unable to set worktree temp directory as a safe directory…');
}
}
}
catch (error) {
Expand Down

0 comments on commit 0c6bce4

Please sign in to comment.