GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Improve `commitFilesFromBase64` update handling by bluwy · Pull Request #116 · changesets/ghcommit

Conversation

bluwy commented Jun 19, 2026

Copy link

Copy Markdown

Member

I found the code for handling create, update and force update a bit hard to follow, so I attempted to refactor it here. See the changesets for the full list of improvements as well.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions


          Improve commitFilesFromBase64 update handling

435907e

bluwy commented

Jun 19, 2026

View reviewed changes

Comment thread

src/core.ts

		throw new Error(`Could not determine sha for base ref "${baseRef}"`);
		}
		const targetSha = info.targetBranch?.target?.oid ?? null;
		const sameBranchBase = "branch" in base && base.branch === branch;

bluwy Jun 19, 2026

Copy link

Copy Markdown

Member Author

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

This was one of the problem. It wasn't comparing the same branch base using shas.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Comment thread

src/core.ts

Comment on lines -99 to -111

		if (sameBranchBase) {
		mode = force ? "force-update" : "update";
		} else if (targetSha === null) {
		// TODO: legit creation failure should be retried if `force === true`
		mode = "create";
		} else if (force) {
		mode = "force-update";
		} else if (targetSha === baseSha) {
		mode = "update";
		} else {
		throw new Error(
		`Branch ${branch} exists already and does not match base ${baseSha}, force is set to false`,
		);

bluwy Jun 19, 2026

Copy link

Copy Markdown

Member Author

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

As a result, the conditions here are a bit weird. In the new code, I also flipped the force and targetSha === baseSha checks, because if targetSha === baseSha we can do updates just fine, we don't need to force update + temp branch stuff.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Comment thread

src/core.ts

bluwy Jun 19, 2026

Copy link

Copy Markdown

Member Author

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

Rest of the code in this file are moving things around. I have the function order inverted compared to before, which fits my style of putting the main functions top, but happy to change this.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Comment thread

tests/integration/core.test.ts

		});
		});

		it("can commit to same branch as base", async () => {

bluwy Jun 19, 2026

Copy link

Copy Markdown

Member Author

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

The git diff is weird, but I basically only removed this test. We already tested this behaviour above so this test really wasn't testing anything new.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

Andarist approved these changes

Jun 19, 2026

View reviewed changes

bluwy added this pull request to the merge queue

Jun 19, 2026

Merged via the queue into main with commit 67853bf

Jun 19, 2026

11 checks passed

Uh oh!

There was an error while loading. Please reload this page.

bluwy deleted the refactor-core branch

June 19, 2026 11:25

changesets-org-version-bot Bot mentioned this pull request

Jun 19, 2026

Version Packages (next) #113

Merged

changesets-org-version-bot Bot mentioned this pull request

Jul 27, 2026

Version Packages #124

Merged

Reviewers

Andarist

Andarist approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

2 participants

Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.