feat: Display autostash in RevisionGrid #12200
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
gerhardol
reviewed
Feb 17, 2025
RussKie
reviewed
Feb 17, 2025
|
Does that make sense and won't it be to difficult to display the branch as grey, like a stash (to not be confused by thinking it is a real branch)? |
gerhardol
approved these changes
Feb 22, 2025
RussKie
reviewed
Feb 23, 2025
gerhardol
approved these changes
Feb 25, 2025
gerhardol
approved these changes
Mar 9, 2025
RussKie
approved these changes
Mar 10, 2025
pmiossec
reviewed
Mar 10, 2025
| long now = DateTimeUtils.ToUnixTime(File.GetLastWriteTime(autoStashFileName)); | ||
| GitRevision autoStashRevision = new(autoStashCommitId) | ||
| { | ||
| AuthorUnixTime = now, |
There was a problem hiding this comment.
It is still the current user that makes the commit (autostash)
I rather have that blank:#12200 (comment)
pmiossec
approved these changes
Mar 10, 2025
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.
Proposed changes
GitRevisionfrom information about autostash in.git/rebase-mergefolderUsecase:
Auto-stashed changes had been unreachable until the rebase was finished.
Displaying the "Autostash" revision enables workflows like:
If one wants to amend a former commit, then just edit that commit (context menu, a, e), cherry-pick the changes from the autostash and amend the commit.
Screenshots
Before
After
Test methodology
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.