Allow amending the last commit #12353
Conversation
| const newState = merge(currentState, newValues) | ||
|
|
||
| const isSameLastLocalCommit = | ||
| currentState.localCommitSHAs.length > 0 && | ||
| newState.localCommitSHAs.length > 0 && | ||
| currentState.localCommitSHAs[0] === newState.localCommitSHAs[0] | ||
|
|
||
| // Only keep the "is amending" state if the last local commit hasn't changed | ||
| // and there is no "fixing conflicts" state. | ||
| const newIsAmending = | ||
| newState.isAmending && | ||
| isSameLastLocalCommit && | ||
| newState.changesState.conflictState === null | ||
|
|
||
| this.repositoryState.set(repository.hash, { | ||
| ...newState, | ||
| isAmending: newIsAmending, | ||
| }) |
There was a problem hiding this comment.
If you check my previous approach, I intended to stop amending manually whenever the user started any operation that could lead to a state where the user would amend the wrong commit (for example, you switch to a completely different branch… the amend state should be cleared… and same for pulling, pushing, merging, cherry-picking, squashing…).
After thinking a bit about it, I decided to go with this other centralized and (more) future-proof approach, where the amending state will be cleared whenever:
- The last local commit sha changes
- The app is in a "fix conflicts" state
This should cover all our present needs, at least!
| </> | ||
| ) : ( | ||
| commitVerb | ||
| ) |
There was a problem hiding this comment.
Suggestion. I found this hard to read.. maybe worth separating into two variables. commitDefaultContents and amendDefaultContents and then defaultContents = isAmending ? amendDefaultContents : commitDefaultContents
| const commitVerb = loading ? 'Committing' : 'Commit' | ||
|
|
||
| const isAmending = this.props.commitToAmend !== null | ||
| const commitVerb = isAmending |
There was a problem hiding this comment.
This one isn't as hard to follow but.. maybe still clearer if broken into a variable for each type like below.
|
Addressed both issues, thank you! ❤️ |
sergiou87
force-pushed
the
undo-context-menu
branch
from
1803fc5
to
980133e
Compare
Pull, push, merge, update, squash, cherry-pick, rebase, switching branches, deleting branches…
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
What is the reason for not allowing to amend to pushed commits? I regularly run into issues with GitHub desktop where it doesn't allow things for none obvious reasons which work fine with |
|
We didn't want to create this kind of "force-push" situations very often, but we've talked about it and we'll allow to amend pushed commits 😄 Thank you for your feedback @MichaIng !! |
|
Many thanks 👍! At least I use this quite often to squash or repair commits in a PR without bloating the commit history. Currently I am forced to use |
Closes #1644
Description
This PR introduces the ability to amend the last commit in your branch (if it's not pushed) by right-clicking it in the
Historytab and selecting the newAmend Commit…action.This will switch Desktop to a "amending" state, where all selected changes and the new summary and description will be applied to the last commit.
Screenshots
amend-last-commit.mov
Release notes
Notes: [New] Amend the last local commit in your branch