Skip to content

fix: refuse unexpected gitlinks staged by git add - #761

Merged
EndBug merged 3 commits into
mainfrom
cursor/b896b824
Aug 8, 2026
Merged

fix: refuse unexpected gitlinks staged by git add#761
EndBug merged 3 commits into
mainfrom
cursor/b896b824

Conversation

@EndBug

@EndBug EndBug commented Aug 8, 2026

Copy link
Copy Markdown
Owner

Summary

  • After git add, inspect git diff --cached --raw and fail if any new mode-160000 gitlink would be committed (embedded nested .git).
  • Allow updates that stay 160000→160000 so existing submodule SHA bumps still work.
  • Document the behavior in the README and cover the parser/assert helpers with unit tests.

Test plan

  • npm test passes (parser fixtures: new gitlink, mode change into gitlink, submodule bump, mixed/empty)
  • Manual PoC: nested .git under the working tree + default add: '.' fails the action with remediation hints instead of committing a gitlink
  • Existing submodule path update (160000→160000) still commits successfully
  • CI confirms committed lib/index.js matches a clean rebuild

Made with Cursor

Detect new mode-160000 entries after add via git diff --cached --raw so nested .git directories cannot be silently committed as attacker-chosen gitlinks.

Co-authored-by: Cursor <cursoragent@cursor.com>
@coderabbitai

coderabbitai Bot commented Aug 8, 2026

Copy link
Copy Markdown

Warning

Review limit reached

@EndBug, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 3 minutes

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 91ab0e5a-0bc9-4f39-a1fd-ccfc32036bfc

📥 Commits

Reviewing files that changed from the base of the PR and between 75038f8 and ee6ea87.

📒 Files selected for processing (5)
  • README.md
  • lib/index.js
  • src/main.ts
  • src/util.ts
  • test/util.test.ts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@EndBug
EndBug marked this pull request as ready for review August 8, 2026 22:07
@EndBug
EndBug requested a lite review from Copilot August 8, 2026 22:07
Co-authored-by: Cursor <cursoragent@cursor.com>

Copilot AI left a comment

Copy link
Copy Markdown

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 adds a safety check to prevent the action from committing newly introduced gitlinks (mode 160000) after git add, which can happen when an embedded/nested .git directory is staged and would otherwise be recorded as a submodule-like reference.

Changes:

  • Add parsing + assertion helpers to detect newly introduced mode-160000 entries in git diff --cached --raw.
  • Enforce the check in the add() flow so the action fails fast when unexpected gitlinks are staged.
  • Document the behavior and add unit tests for the parser/assert helpers.

Reviewed changes

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

File Description
src/util.ts Adds gitlink detection/parsing and a failing assertion with remediation hints.
src/main.ts Runs the cached raw diff check after git add and fails on unexpected gitlinks.
test/util.test.ts Adds unit tests for the new gitlink parser and assertion helper.
README.md Documents the new “refuse new gitlinks” behavior and remediation steps.
Suppressed comments (2)

src/util.ts:190

  • The remediation hint uses git rm --cached ${p} without a -- path separator. If a path begins with -, the pasted command can be interpreted as an option instead of a path. Adding -- makes the suggested command safe for all path names.
  const listed = paths.map(p => `  - ${p}`).join('\n');
  const rmHints = paths.map(p => `  git rm --cached ${p}`).join('\n');
  throw new Error(
    `Refusing to commit unexpected gitlink(s) (embedded git repository staged as mode 160000):\n${listed}\n` +
      'Git records a nested .git directory as a gitlink, not as its files. ' +
      `Remove the nested .git directory, or unstage the path(s) with:\n${rmHints}`,

test/util.test.ts:235

  • This assertion hard-codes the remediation hint without the -- path separator. If the hint is updated to git rm --cached -- <path> (recommended for safety), the test should assert the safer form to match.
    );
    expect(() => assertNoUnexpectedGitlinks(['evil_nested_repo'])).toThrow(
      /git rm --cached evil_nested_repo/,
    );

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread src/util.ts
Comment on lines +167 to +174
const match = line.match(
/^:(\d{6}) (\d{6}) [0-9a-f]+ [0-9a-f]+ [A-Z]\t(.+)$/,
);
if (!match) continue;
const [, oldMode, newMode, filePath] = match;
if (newMode === '160000' && oldMode !== '160000') {
paths.push(filePath);
}
Comment thread README.md Outdated
Comment thread test/util.test.ts
).toStrictEqual(['was_a_file']);
});

it('allows existing submodule SHA updates (160000→160000)', () => {
Accept scored R/C statuses and destination paths, and use -- in rm remediation hints.

Co-authored-by: Cursor <cursoragent@cursor.com>
@EndBug
EndBug merged commit ebc24bf into main Aug 8, 2026
10 checks passed
@EndBug
EndBug deleted the cursor/b896b824 branch August 8, 2026 22:18
kodiakhq Bot pushed a commit to pdylanross/fatigue that referenced this pull request Aug 12, 2026
Bumps EndBug/add-and-commit from 10 to 11.

Release notes
Sourced from EndBug/add-and-commit's releases.

v11.0.0
What's Changed

chore(deps): bump picomatch by @​dependabot[bot] in EndBug/add-and-commit#724
chore(deps-dev): bump handlebars from 4.7.8 to 4.7.9 by @​dependabot[bot] in EndBug/add-and-commit#725
chore(deps): bump lodash from 4.17.23 to 4.18.1 by @​dependabot[bot] in EndBug/add-and-commit#728
chore(deps-dev): bump ts-jest from 29.4.6 to 29.4.9 by @​dependabot[bot] in EndBug/add-and-commit#727
chore(deps): bump @​actions/github from 9.0.0 to 9.1.0 by @​dependabot[bot] in EndBug/add-and-commit#729
chore(deps): bump @​actions/github from 9.1.0 to 9.1.1 by @​dependabot[bot] in EndBug/add-and-commit#732
chore(deps): bump @​actions/core from 3.0.0 to 3.0.1 by @​dependabot[bot] in EndBug/add-and-commit#733
ci(deps): bump actions/dependency-review-action from 4 to 5 by @​dependabot[bot] in EndBug/add-and-commit#734
chore(deps-dev): bump ts-jest from 29.4.9 to 29.4.11 by @​dependabot[bot] in EndBug/add-and-commit#736
chore(deps-dev): bump jest from 30.3.0 to 30.4.2 by @​dependabot[bot] in EndBug/add-and-commit#735
chore(deps-dev): bump eslint-plugin-prettier from 5.5.5 to 5.5.6 by @​dependabot[bot] in EndBug/add-and-commit#738
chore(deps): bump js-yaml from 4.1.1 to 4.2.0 by @​dependabot[bot] in EndBug/add-and-commit#739
ci(deps): bump actions/checkout from 6 to 7 by @​dependabot[bot] in EndBug/add-and-commit#741
chore(deps): bump undici from 6.24.1 to 6.27.0 by @​dependabot[bot] in EndBug/add-and-commit#744
ci(deps): bump actions/setup-node from 6 to 7 by @​dependabot[bot] in EndBug/add-and-commit#749
chore(deps-dev): bump @​vercel/ncc from 0.38.4 to 0.44.1 by @​dependabot[bot] in EndBug/add-and-commit#746
chore(deps): bump js-yaml from 4.2.0 to 5.2.1 by @​dependabot[bot] in EndBug/add-and-commit#747
chore(deps-dev): bump ts-jest from 29.4.11 to 29.4.12 by @​dependabot[bot] in EndBug/add-and-commit#750
chore(deps): bump js-yaml from 5.2.1 to 5.2.2 by @​dependabot[bot] in EndBug/add-and-commit#751
chore(deps): bump undici from 6.27.0 to 6.28.0 by @​dependabot[bot] in EndBug/add-and-commit#753
fix: reject remote-helper git flags that enable RCE by @​EndBug in EndBug/add-and-commit#754
fix: prevent git option injection via new_branch by @​EndBug in EndBug/add-and-commit#755
fix: verify committed lib/ matches source in CI by @​EndBug in EndBug/add-and-commit#756
fix: stop logging full git config (credential leak) by @​EndBug in EndBug/add-and-commit#758
fix: reject -F/--file git args that can exfiltrate runner files by @​EndBug in EndBug/add-and-commit#759
fix: reject unmatched quotes in matchGitArgs to prevent flag injection by @​EndBug in EndBug/add-and-commit#760
fix: refuse unexpected gitlinks staged by git add by @​EndBug in EndBug/add-and-commit#761
fix: do not report committed=true for empty commit SHA by @​EndBug in EndBug/add-and-commit#757
ci: pin actions-tagger and restrict release workflow permissions by @​EndBug in EndBug/add-and-commit#762
fix: neutralize bidi and control chars in action logs by @​EndBug in EndBug/add-and-commit#763

Full Changelog: EndBug/add-and-commit@v10.0.0...v11.0.0



Commits

645ecc0 11.0.0
06e788f fix: neutralize bidi and control chars in action logs (#763)
68ec86a ci: pin actions-tagger and restrict release workflow permissions (#762)
f1bb0cc fix: do not report committed=true for empty commit SHA (#757)
ebc24bf fix: refuse unexpected gitlinks staged by git add (#761)
75038f8 fix: reject unmatched quotes in matchGitArgs to prevent flag injection (#760)
d07c930 fix: reject -F/--file git args that can exfiltrate runner files (#759)
0971289 fix: stop logging full git config (credential leak) (#758)
c38a33b fix: verify committed lib/ matches source in CI (#756)
b4a0134 fix: prevent git option injection via new_branch (#755)
Additional commits viewable in compare view




Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR
@dependabot recreate will recreate this PR, overwriting any edits that have been made to it
@dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
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