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

fix: checkout merge base for cherry diff #37

Merged
merged 15 commits into from
Jan 22, 2024
Merged

fix: checkout merge base for cherry diff #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
192f1d0
chore: cosmetic
fwuensche Jan 22, 2024
f44b56c
chore: remove api key
fwuensche Jan 22, 2024
c39a874
chore: list branches
fwuensche Jan 22, 2024
27668a5
chore: echo head ref
fwuensche Jan 22, 2024
c1d22be
chore: show ref
fwuensche Jan 22, 2024
8f16061
chore: rev parse head
fwuensche Jan 22, 2024
5c6cc66
chore: head ref
fwuensche Jan 22, 2024
226a067
chore: origin/main
fwuensche Jan 22, 2024
72dbf55
chore: origin/main
fwuensche Jan 22, 2024
6c2335c
chore: fetch main
fwuensche Jan 22, 2024
486c781
chore: fetch main
fwuensche Jan 22, 2024
c3127e7
chore: checkout main
fwuensche Jan 22, 2024
6be6a28
chore: checkout main via cli
fwuensche Jan 22, 2024
b723845
chore: merge base with origin
fwuensche Jan 22, 2024
f8a0a74
feat: checkout merge base for cherry diff
fwuensche Jan 22, 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 .github/workflows/cherry_diff.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
run: npm install

- name: Raise if new JavaScript code is added
run: ./bin/cherry.js diff --metric='[loc] JavaScript' --api-key=${{ secrets.CHERRY_API_KEY }} --error-if-increase --quiet
run: ./bin/cherry.js diff --metric='[loc] JavaScript' --error-if-increase --quiet
6 changes: 2 additions & 4 deletions src/git.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,8 @@ export const getDefaultBranchName = async () => {
return defaultBranch.replace('origin/', '').trim()
}

export const getMergeBase = async (currentBranchName, defaultBranchName) => {
const mergeBase = (await git(`merge-base ${currentBranchName} ${defaultBranchName}`)).toString()
return mergeBase.trim()
}
export const getMergeBase = async (currentBranchName, defaultBranchName) =>
(await git(`merge-base ${currentBranchName} origin/${defaultBranchName}`)).toString().trim()

export const authorName = async (sha) => (await git(`show ${sha} --format=%an --no-patch`))[0]

Expand Down