Illogical message when deleting unstaged changes

[WelliSolutions]

Describe the bug

When I want to delete an untracked file, the choices and messages are illogical.

To Reproduce

Steps to reproduce the behavior:

1. Create an empty repo
2. Create an empty file
3. Select the file in the files panel
4. Press D to delete it
5. The option "Discard unstaged changes" is unavailable (strike through)

Expected behavior

The tool lets me choose "Discard unstaged changes", because that's exactly what it has: unstaged changes only.
The option "Discard all changes" with the message "Discard both staged and unstaged changes" is illogical, because this file does not have staged changes.

Screenshots

Version info:

commit=, build date=, build source='debian', version='0.50.0+ds1-1+b2', os=linux, arch=amd64, git version=2.47.3

Terminal info:

Windows with Putty, SSH to Linux Mint

Additional context

I am new to Linux and lazygit and don't want to mess with nightly builds at the moment.

[dhanush0x96c]

Hi @stefanhaller, just checking in on my PR #5406 from a few days ago. It is a small change and should be quick to review. I would appreciate it whenever you have a moment. Thanks!

[stefanhaller]

This is not a bug, the logic is fine. Maybe we could improve the wording of the menu entries and/or tooltips to avoid the confusion that @WelliSolutions apparently had with this.

What the menu entries mean is:

• discard all changes: discard whatever changes this item has; staged, unstaged, or both
• discard unstaged changes: discard only the unstaged changes, keeping the staged ones. This only makes sense if the item does have both staged and unstaged changes, and lazygit is right in crossing it out if that's not the case.

[dhanush0x96c]

I understand your point @stefanhaller. In fact, my first instinct was to improve the wording. But while working through that, I realised the underlying behavior itself might be the source of confusion.

From a UX perspective, it would be much simpler if the actions were consistent and context-independent:

• discard all changes → discard all changes (regardless of context)
• discard unstaged changes → discard unstaged changes (regardless of context)

While trying to rephrase things, it started to feel like I was just working around the behavior rather than addressing the root issue.

In particular, it’s quite hard to explain why “discard unstaged changes” would be disabled when there are unstaged changes present. That’s where the mental model breaks down a bit for the user.

That said, if you still feel the current behavior is the right approach, I’m happy to focus on improving the wording/tooltips to make things clearer 👍

[stefanhaller]

For the record, I disagree; mainly because I think it's confusing to have two commands that do exactly the same thing (in some scenarios).

But honestly, I think we have much bigger problems than this, and I'd rather spend my time on those.

[dhanush0x96c]

I apologize if my earlier approach came across as naive, @stefanhaller. I’m a junior developer and still learning. I’ve updated the PR #5406 to remove the behavior changes and instead focus on clearer discard messaging with context-specific disabled reasons, and I’d really appreciate your feedback.