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.

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 return value of getCurrentCommitId #889

Merged
merged 3 commits into from Jul 25, 2022

Conversation

jakubmazanec
Copy link
Contributor

@jakubmazanec jakubmazanec commented Jul 25, 2022

fixes #888

@changeset-bot
Copy link

changeset-bot bot commented Jul 25, 2022

🦋 Changeset detected

Latest commit: 3acf4bc

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 6 packages
Name Type
@changesets/git Patch
@changesets/apply-release-plan Patch
@changesets/cli Patch
@changesets/read Patch
@changesets/release-utils Patch
@changesets/get-release-plan Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@codesandbox-ci
Copy link

codesandbox-ci bot commented Jul 25, 2022

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 3acf4bc:

Sandbox Source
Vanilla Configuration

@@ -296,5 +296,6 @@ export async function getCurrentCommitId({
await spawn("git", ["show", `--format="%h"`, "--no-patch"], { cwd })
).stdout
.toString()
.trim();
.trim()
.replace(/"/g, "");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, git show --format="%h" --no-patch doesnt add quotation marks in the stdout for me. What system and git version are you using?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows 10 Enterprise 21H1, git 2.30.1.windows.1.
When i run git show --format="%h" --no-patch in PowerShell, I also see only the hash 🤔

@@ -296,5 +296,6 @@ export async function getCurrentCommitId({
await spawn("git", ["show", `--format="%h"`, "--no-patch"], { cwd })
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if the reason we end up with those quotation marks isn't that we include them here in the format. I've checked on my machine and this works fine too:

Suggested change
await spawn("git", ["show", `--format="%h"`, "--no-patch"], { cwd })
await spawn("git", ["show", "--format=%h", "--no-patch"], { cwd })

Alternatively we could also just switch to using this:

Suggested change
await spawn("git", ["show", `--format="%h"`, "--no-patch"], { cwd })
await spawn("git", ["rev-parse", "--short", "HEAD"], { cwd })

It seems to be better suited for this job anyway.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both suggestion seem to solve the problem. I agree that the second one seems to be better for this. I updated the PR.

@Andarist Andarist merged commit f64bc1b into changesets:main Jul 25, 2022
@github-actions github-actions bot mentioned this pull request Jul 25, 2022
@jakubmazanec jakubmazanec deleted the fix-getcurrentcommitid branch July 25, 2022 12:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Commit hash with quotation marks results in invalid snapshot version
2 participants