Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix close abort #1039

Merged
merged 1 commit into from
Dec 16, 2023
Merged

Fix close abort #1039

merged 1 commit into from
Dec 16, 2023

Conversation

ttytm
Copy link
Contributor

@ttytm ttytm commented Dec 16, 2023

Fixes #439

Current issue repro in a neogit status buffer:

  • ca in the status buffer to amend to the last commit.
  • Change something in the commit message - don't save the buffer.
  • q to close, a confirmation dialog starts. Hit no in the saves changes confirmation dialog to not confirm the changes.
  • The commit is made anyway / See the commit sha changing.

Ref.: #441 (comment)

With the changes in the PR the commit is not being made when not confirming the changes.

The changes are based on the abort implementation:

[mapping["Abort"]] = function(buffer)
aborted = true
buffer:write()
buffer:close(true)
end,
},

@CKolkey CKolkey merged commit 69fb64c into NeogitOrg:master Dec 16, 2023
6 checks passed
@ttytm ttytm deleted the fix/abort branch December 16, 2023 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Canceling an amend still sends a commit
2 participants