Skip to content

Patch | QA to Prod | Feature | TEST-123 | Various edits #4

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

Open
ajongaro wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Patch | QA to Prod | Feature | TEST-123 | Various edits #4

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
32c5a06
Feature | TEST-123 | Various edits
ajongaro Nov 3, 2024
93f8ff0
Version bump 1.0.0 -> 1.0.1
ajongaro Nov 3, 2024
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": "patchport",
"version": "1.0.0",
"version": "1.0.1",
"description": "a deployment and development environment management utility",
"main": "index.js",
"bin": {
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ async function run() {
}

// No commit ID provided, display git log for selection
commitId = await GitHelpers.selectCommitFromLog()
commitId = await GitHelpers.selectCommitFromLog(originBranch)
if (!commitId) {
console.error('No commit selected. Exiting.')
process.exit(1)
Expand Down
5 changes: 4 additions & 1 deletion src/utils/gitHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,14 @@ async function promptForOriginBranch(): Promise<ValidBranchName> {
return originBranch
}

export async function selectCommitFromLog(): Promise<string | null> {
export async function selectCommitFromLog(
branchName: string
): Promise<string | null> {
console.log('')
const git: SimpleGit = simpleGit()
try {
// Fetch the latest commits from the current branch
await git.pull('origin', branchName)
const log = await git.log({ maxCount: 20 })

if (log.all.length === 0) {
Expand Down