diff --git a/share/completions/git.fish b/share/completions/git.fish index 13a2899f0..768e6e7c9 100644 --- a/share/completions/git.fish +++ b/share/completions/git.fish @@ -69,8 +69,7 @@ function __fish_git_unique_remote_branches # `git checkout frobulate` is equivalent to `git checkout -b frobulate --track alice/frobulate`. __fish_git for-each-ref --format="%(refname:strip=3)" \ --sort="refname:strip=3" \ - "refs/remotes/*/$match*" "refs/remotes/*/*/**" 2>/dev/null | \ - uniq -u + "refs/remotes/*/$match*" "refs/remotes/*/*/**" 2>/dev/null | uniq -u end function __fish_git_tags @@ -1070,8 +1069,7 @@ complete -c git -n '__fish_git_using_command diff; and __fish_contains_opt cache ### Function to list available tools for git difftool and mergetool function __fish_git_diffmerge_tools -a cmd - git $cmd --tool-help | \ - while read -l line + git $cmd --tool-help | while read -l line string match -q 'The following tools are valid, but not currently available:' -- $line and break string replace -f -r '^\t\t(\w+).*$' '$1' -- $line diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish index 5509aab14..6c6c278d3 100644 --- a/share/functions/__fish_config_interactive.fish +++ b/share/functions/__fish_config_interactive.fish @@ -109,7 +109,7 @@ function __fish_config_interactive -d "Initializations that should be performed # Run python directly in the background and swallow all output $py $update_args >/dev/null 2>&1 & # Then disown the job so that it continues to run in case of an early exit (#6269) - disown >/dev/null 2>&1 + disown >/dev/null 2>&1 break end end diff --git a/tests/checks/line-continuation.fish b/tests/checks/line-continuation.fish index ba9edeec2..37e11a41a 100644 --- a/tests/checks/line-continuation.fish +++ b/tests/checks/line-continuation.fish @@ -15,8 +15,7 @@ d echo true \U00000066\ true echo if true - \ - \145n\ +\145n\ d\ #CHECK: if true