commit hunk selections #7893
Merged
commit hunk selections #7893
Conversation
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
|
@Byron is attempting to deploy a commit to the GitButler Team on Vercel. A member of the Team first needs to authorize it. |
1 task
Byron
force-pushed
the
commit-hunks
branch
2 times, most recently
from
cd6cfa3 to
2bafd30
Compare
Byron
commented
Mar 30, 2025
crates/but-core/src/lib.rs
Outdated
| @@ -140,6 +140,9 @@ pub enum UnifiedDiff { | |||
| Patch { | |||
| /// All non-overlapping hunks, including their context lines. | |||
| hunks: Vec<unified_diff::DiffHunk>, | |||
| /// If `true`, a binary to text filter (`textconv` in Git config) was used to obtain the `hunks` in the diff. | |||
| /// This means hunk-based operations must be disabled. | |||
| is_result_of_binary_to_text_conversion: bool, | |||
There was a problem hiding this comment.
Hi @estib-vega , here is the promised flag that the UI would use to determine if hunk-selections of any kind should be allowed. That's the case only if this is false.
There was a problem hiding this comment.
Could you add a serde rename to that it's camelCased, please? :)
There was a problem hiding this comment.
Hehe, right, we didn't notice before because it was naturally camelCase.
Should be fixed now.
Byron
force-pushed
the
commit-hunks
branch
2 times, most recently
from
949b2f0 to
10c61e3
Compare
The UI may or may not surface it, but it definitely doesn't show in the logs as return values won't show.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add V3 facilities for discarding changes in the worktree or index, this time it's about hunks specifically.
Follow-up of #7807.
Tasks
gixfrommainbut-clisupports committing hunk headersNext PR
- Once that is clear, it should fail as it needs a base-substitute.