Commit only tracked files in tracked filter view

[parthokunda]

• PR Description
  When in tracked filter view, selecting a folder for staging should only stage files that are tracked by git. Previously, it staged even untracked files that were not in view.
  All staged (even untracked) files are shown in tracked filter view.
  Fixes When hiding untracked files, adding a folder adds also untracked files (git add instead of git add -u) #4245

• Please check if the PR fulfills these requirements

• Cheatsheets are up-to-date (run go generate ./...)
• Code has been formatted (see here)
• Tests have been added/updated (see here for the integration test guide)
• Text is internationalised (see here)
• If a new UserConfig entry was added, make sure it can be hot-reloaded (see here)
• Docs have been updated if necessary
• You've read through your own file changes for silly mistakes etc

[parthokunda]

All staged (even untracked) files are shown in tracked filter view. I have not written any test for this part. Do you think I should write one?

[stefanhaller]

I rebased this onto master and pushed a bunch of fixup commits (see the individual commit messages for details). The first one might be controversial, let me know if you feel strongly about your version of this. The other ones are only smaller nitpicks. Feel free to squash them if you are happy with the changes.

All staged (even untracked) files are shown in tracked filter view. I have not written any test for this part. Do you think I should write one?

There is an existing test for filtering (filter_and_search/filter_by_file_status.go), it should be easy to add another file to this (untracked but staged). We don't need a separate new test.

Finally, the change which files are shown could be a commit of its own (before the other one). I like separate commits for things that are independent, just to make the individual diffs smaller and easier to review.

[parthokunda]

The first one might be controversial, let me know if you feel strongly about your version of this.

Initially, I also considered this approach and got confused between the two. Both are okay for me. If you think this is good, I am okay with it.

There is an existing test for filtering (filter_and_search/filter_by_file_status.go), it should be easy to add another file to this (untracked but staged).

I have updated it. There is a fixup attached which replaces Contains with Equals in this test.

I like separate commits for things that are independent

Do you want me to create another PR? Or multiple commits per PR okay? At my work, we do one commit per PR, so I habitually squashed everything before pushing 😅 .

[stefanhaller]

I have updated it. There is a fixup attached which replaces Contains with Equals in this test.

Nice, thanks. I took the liberty of changing all the backticks to double quotes, just for aesthetic reasons.

I like separate commits for things that are independent

Do you want me to create another PR? Or multiple commits per PR okay? At my work, we do one commit per PR, so I habitually squashed everything before pushing 😅 .

No, I meant multiple commits within this PR. This is perfect, thanks.