Skip to content

fix for no-ff#10

Merged
madkoo merged 4 commits into
mainfrom
bug/handle-non-ff
Mar 26, 2026
Merged

fix for no-ff#10
madkoo merged 4 commits into
mainfrom
bug/handle-non-ff

Conversation

@madkoo

@madkoo madkoo commented Mar 25, 2026

Copy link
Copy Markdown
Owner

No description provided.

Copilot AI review requested due to automatic review settings March 25, 2026 15:53

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the repository caching logic to better handle git pull failures caused by non-fast-forward histories in shallow cached clones, and bumps the package version.

Changes:

  • Add stale .git/index.lock cleanup and use fetch --depth 1 when updating an existing cached repo.
  • Handle non-fast-forward pull failures by falling back to reset --hard origin/<branch> and, if needed, wipe + re-clone.
  • Bump package version.

Reviewed changes

Copilot reviewed 2 out of 3 changed files in this pull request and generated 2 comments.

File Description
src/cache.ts Improves robustness of cached repo updates (shallow fetch, lock cleanup, non-FF recovery).
package.json Bumps package version to 1.1.1.
package-lock.json Updates lockfile metadata version (currently inconsistent with package.json).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/cache.ts Outdated
Comment thread src/cache.ts Outdated
@madkoo madkoo merged commit 884e2ac into main Mar 26, 2026
6 checks passed
@madkoo madkoo deleted the bug/handle-non-ff branch March 26, 2026 13:35
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.

2 participants