Skip to content

honor showUntrackedFiles config #753

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

Merged
merged 7 commits into from
Jun 1, 2021
Merged

Conversation

extrawurst
Copy link
Collaborator

closes #752

@IndianBoy42
Copy link

Should you check gui.displayuntracked?

I can't seem to find if it's an official flag or only for git-cola. It is mentioned in the official git repo here

@extrawurst
Copy link
Collaborator Author

extrawurst commented May 31, 2021

Should you check gui.displayuntracked?

I can't seem to find if it's an official flag or only for git-cola. It is mentioned in the official git repo here

I went for the more standard config.

did you test this branch on your use case again?

@IndianBoy42
Copy link

It partially works, it doesn't show the untracked files. However it still attempts to stage them when I run "Stage All"

I think either Stage-All should ignore untracked files (if status.showUntrackedFiles == no). Or we add a separate key for 'Update-All' which mimics git add -u

For example these commits in my fork:

  1. IndianBoy42@8ea8bfa
  2. IndianBoy42@4b2215a

@IndianBoy42
Copy link

IndianBoy42 commented May 31, 2021

I have manually 'rebased' my fork onto your new way of getting the showUntrackedFiles option

https://github.com/IndianBoy42/gitui/tree/yadm

If you are okay with it I can send a pull request after this PR is merged

@extrawurst
Copy link
Collaborator Author

@IndianBoy42 I will fix the stage_all it should honour the same config. but an additional command for staging untracked files when you configured it to not show them does not carry its own weight IMO

@extrawurst
Copy link
Collaborator Author

@IndianBoy42 stage_all honors the config too now

@IndianBoy42
Copy link

This works well now.

Sorry to keep bothering but I remembered another thing that I added in my branch.

You may want the 'stash untracked' option to be unchecked by default if showUntrackedFiles==no. This is not a big deal because you can always unselect it before stashing, but its a little less error prone

@extrawurst
Copy link
Collaborator Author

This works well now.

Sorry to keep bothering but I remembered another thing that I added in my branch.

You may want the 'stash untracked' option to be unchecked by default if showUntrackedFiles==no. This is not a big deal because you can always unselect it before stashing, but its a little less error prone

should work now

@extrawurst extrawurst merged commit 3cd218d into master Jun 1, 2021
@extrawurst extrawurst deleted the status-without-untracked branch June 1, 2021 07:56
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.

Support using gitui with yadm
2 participants