Fix out of scope opt variable #10020
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
faho
requested changes
Sep 15, 2023
| @@ -50,7 +50,6 @@ function ls --description "List contents of directory" | |||
| __fish_set_lscolors | |||
|
|
|||
| isatty stdout | |||
There was a problem hiding this comment.
The intention is to apply -F only if the output goes to the terminal. Your patch removes that and makes this isatty ineffectual.
The simplest fix is to set $opt before:
set -l opt
isatty stdout
and set opt -FNote that we have some cases above where we might apply "-F" even if the output isn't a tty, those should be removed. It's either when we have colorls or when ls doesn't support any of the color flags.
|
Thanks! |
faho
pushed a commit
that referenced
this pull request
Oct 8, 2023
* Fix out of scope opt variable * Update ls.fish (cherry picked from commit a809672)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
I had a weird bug on a fresh fish install and I traced it back to this rather weird piece of code. The $opt variable is not set when the if at L29 fails and so just contained random junk from an earlier function call. Moreover, with every subsequent call of of ls it would grow an extra
-F! I believe the following is the intended meaning of the author.You can look at the blame of linet 53 and 66 to see that this state of things was caused by an old refactor of the ls function.
Fixes issue: if $opt is filled with some junk before calling ls it will result in unexpected behavior
~> set fish_trace on
~> set opt test