Skip to content

Conversation

mstv
Copy link
Member

@mstv mstv commented Sep 14, 2024

Fixes #11894

Proposed changes

  • FormCommit: Disable ResetSoft if the git command will not be applicable, i.e. if "HEAD~1" does not exist

Screenshots

Before

exception (refer to issue)

After

image

Test methodology

  • manual

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.

if HEAD~1 does not exist
@mstv mstv self-assigned this Sep 14, 2024
Copy link
Member

@gerhardol gerhardol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar issues could likely occur for UndoLastCommit and maybe some rebase scenario.

@mstv mstv merged commit 1ab4868 into gitextensions:master Sep 15, 2024
4 checks passed
@mstv mstv deleted the fix/11894_disable_reset_soft branch September 15, 2024 08:54
@RussKie RussKie added this to the 5.1 milestone Nov 6, 2024
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.

[NBug] fatal: Failed to resolve 'HEAD~1' as a valid revision.
3 participants