Repository navigation
improvement: use clap idioms for diffr cli parse conflicts - #1038
Merged
Merged
Conversation
sidkmenon
added this pull request to stack #1041
October 8, 2026 19:06
sidkmenon
force-pushed
the
sm/diffr-first-word-wins
branch
from
October 8, 2026 19:15
ba897eb to
636191d
Compare
sidkmenon
changed the title
sidkmenon
marked this pull request as ready for review
October 8, 2026 23:37
thesiti92
approved these changes
Oct 8, 2026
sidkmenon
removed this pull request from stack #1041
October 8, 2026 23:43
sidkmenon
added this pull request to stack #1050
October 8, 2026 23:44
A command name after a diff flag stopped diffr with an error, so `diffr --merge-base config` could not diff against a branch named config. Now a command name is a command only as the first argument. Anywhere else it is a revision or path, as Git reads it. Tests: CLI tests; git comparison tests, with a branch named config after --merge-base. Agent-Session: 01a11aca-5007-7b80-ad35-c0a0f746a05d Agent-Session: ec5d2c35-3045-44f3-9c41-ba4378797c8e Agent-Session: cbc75bbf-5438-46f4-b8ed-41beb0e20f0c Agent-Session: 01a11cf1-8ad4-7910-b120-b0d622692a95 Agent-Session: 01a11ded-d896-7251-bf8f-c71bf07fd283 Agent-Session: 01a11e03-81df-7d63-bfa5-953f535444d2
It built a Git repository to check one clap attribute, and compared against `git diff --merge-base`, which the cross test image's Git predates, so it failed the musl job. Claude-Session: https://claude.ai/code/session_01PX4PvPgXJGTXNUL6QyQa7i Agent-Session: 01a11aca-5007-7b80-ad35-c0a0f746a05d Agent-Session: cbc75bbf-5438-46f4-b8ed-41beb0e20f0c Agent-Session: ec5d2c35-3045-44f3-9c41-ba4378797c8e Agent-Session: 01a11cf1-8ad4-7910-b120-b0d622692a95 Agent-Session: 01a11ded-d896-7251-bf8f-c71bf07fd283 Agent-Session: 01a11e03-81df-7d63-bfa5-953f535444d2
sidkmenon
force-pushed
the
sm/diffr-first-word-wins
branch
from
October 9, 2026 00:16
d690e9a to
badf445
Compare
sidkmenon
removed this pull request from stack #1050
October 9, 2026 00:16
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
clanker note: