Skip to content

fix(git): don't use external diff tools when getting git diff - #519

Merged
di-sukharev merged 2 commits into
di-sukharev:masterfrom
muni-corn:no-ext-diff
Aug 23, 2026
Merged

fix(git): don't use external diff tools when getting git diff#519
di-sukharev merged 2 commits into
di-sukharev:masterfrom
muni-corn:no-ext-diff

Conversation

@muni-corn

Copy link
Copy Markdown
Contributor

i use difftastic, and it was common for LLMs to think that no diff was provided because difftastic can eliminate enough context to make diffs person-readable, but not LLM-readable.

adding --no-ext-diff to our git diff command should help to avoid this.

@muni-corn

Copy link
Copy Markdown
Contributor Author

@di-sukharev Any thoughts on this? 😁

@di-sukharev di-sukharev left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Adding --no-ext-diff is correct and still needed because the current master does not include it. This PR conflicts after the getDiff refactor, so please port the single change onto master and add a regression test with an external diff tool configured, verifying that OpenCommit still receives the regular staged patch.

@muni-corn

muni-corn commented Aug 23, 2026

Copy link
Copy Markdown
Contributor Author

done! regression test pending

@di-sukharev di-sukharev left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

The implementation is correct and now rebased cleanly onto master. I added the requested end-to-end regression coverage for a configured external diff tool and regenerated the bundled CLI. Locally verified lint/typecheck, 170 unit tests, and all 34 core E2E tests. Ready to merge.

@di-sukharev
di-sukharev merged commit ca2b4f5 into di-sukharev:master Aug 23, 2026
5 checks passed
@di-sukharev

Copy link
Copy Markdown
Owner

All done — I added end-to-end regression coverage for repositories with a configured external diff tool, regenerated the bundled CLI, and merged the PR into master. Thank you for the contribution!

@muni-corn
muni-corn deleted the no-ext-diff branch August 23, 2026 19:37
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