Status Tasb regression: new folders act as file

[extrawurst]

Describe the bug
New uncommitted folders show wrong and diff wrong.

To Reproduce
cargo init foobar open gitui in foobar and scroll to the src folder. its not a tree node anymore and diffs as if it is the main.rs file inside.

see screenshot.

Screenshots

Additional context
Looks like this go introduced with #2673

[cruessler]

Some observations: you’ll get the same behaviour in 0.27 if you set “Show untracked” to “Normal”. This is because gitoxide reads status.showUntrackedFiles (which I now remember because I left a note in the description of #2673). That way, the UI matches the output of git status that also shows src instead of src/main.rs. Which leads to the question: what’s the expected behaviour? I actually find it preferable to have it match git status, but I’m open to other suggestions as the current behaviour clearly is surprising.

[extrawurst]

I cant follow, look how it appears when two files are under src:

no way to diff or even see that there are two files

[cruessler]

This issue can be reproduced in gitui 0.27 when you go to options and set “Show untracked” to “Normal”.

The default for “Show untracked” is “Gitconfig” and this is where 0.27 and current master don’t behave the same. 0.27 seems to interpret “Gitconfig” as “All” when status.showUntrackedFiles is not set. Current master, on the other hand, interprets “Gitconfig” as “Normal” which is the default value for status.showUntrackedFiles when it is not explicitly set, per https://git-scm.com/docs/git-config#Documentation/git-config.txt-statusshowUntrackedFiles.

Does that make sense?

This is also what git status does on the command line.

This is what I get running git status with status.showUntrackedFiles not set or set to normal.

❯ git status
On branch main

No commits yet

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        .gitignore
        Cargo.toml
        src/

nothing added to commit but untracked files present (use "git add" to track)

On the other hand, this is what I get when status.showUntrackedFiles is set to all.

❯ git status
On branch main

No commits yet

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        .gitignore
        Cargo.toml
        src/lib.rs
        src/main.rs

nothing added to commit but untracked files present (use "git add" to track)

[laktak]

Also if you do mkdir -p foo/bar, the foo directory will show up in unstaged when it should be ignored.