feat: Show diff on the stash detail screen #420
Merged
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
altsem
approved these changes
Sep 19, 2025
Owner
altsem
left a comment
There was a problem hiding this comment.
Looks nice! There's just a linting error it seems:
error: redundant field names in struct initialization
--> src/items.rs:274:21
|
274 | stash_ref: stash_ref,
| ^^^^^^^^^^^^^^^^^^^^ help: replace it with: `stash_ref`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#redundant_field_names
= note: `-D clippy::redundant-field-names` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::redundant_field_names)]`
error: could not compile `gitu` (lib) due to 1 previous error
💩
I'll merge it in and do a little commit to fix this tiny thing.
Contributor
Author
|
Thank you @altsem! Sorry about the linter error, Edit: Checked the CI pipelines and saw it was |
Owner
|
no worries, I put some stuff in the Makefile, Line 42 in b3492a8 Perhaps there's a way to incorporate this into Cargo, or some other way to make it more apparent 🤔. |
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.
Currently, the stash detail screen shows "unmerged" for all the files in the stash, which also means there is also no diff being shown for the stash.
It seems like the reason for "unmerged" is that the current implementation does
git show <stash_commit>which ends up withdiff --ccoutput, which the diff parser interprets as conflicts.What I've changed here is to have a separate
show_stashscreen and to store the stash ref instead of the commit on theItemData::Stashstruct. The new screen runsgit stash show -p <stash_ref>instead, which produces a diff that the diff parser is happier about.I thought it was better to add something explicitly for showing stashes, rather than to try have a way to conditionally modify the diff parser, since it separates the concerns better at the cost of some conciseness in the code. More than happy to take suggestions.