Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Put worktree outside of repo in manual steps #5

Merged
merged 2 commits into from
Oct 28, 2022
Merged

Put worktree outside of repo in manual steps #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37be8e1
Bumping to next version
VachaShah Oct 24, 2022
c2d0755
Put worktree outside of repo in manual steps
andrross Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backport",
"version": "2.0.0",
"version": "2.1.0",
"license": "MIT",
"main": "dist/index.js",
"files": [
Expand Down
6 changes: 3 additions & 3 deletions src/backport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ const getFailedBackportCommentBody = ({
errorMessage: string;
head: string;
}) => {
const worktreePath = `.worktrees/backport-${base}`;
const worktreePath = `../.worktrees/backport-${base}`;
return [
`The backport to \`${base}\` failed:`,
"```",
Expand All @@ -167,15 +167,15 @@ const getFailedBackportCommentBody = ({
"# Create a new working tree",
`git worktree add ${worktreePath} ${base}`,
"# Navigate to the new working tree",
`cd ${worktreePath}`,
`pushd ${worktreePath}`,
"# Create a new branch",
`git switch --create ${head}`,
"# Cherry-pick the merged commit of this pull request and resolve the conflicts",
`git cherry-pick -x --mainline 1 ${commitSha}`,
"# Push it to GitHub",
`git push --set-upstream origin ${head}`,
"# Go back to the original working tree",
"cd ../..",
"popd",
"# Delete the working tree",
`git worktree remove ${worktreePath}`,
"```",
Expand Down