Skip to content

Commit e7f949b

Browse files
author
Ira Abramov
committed
fix the shellcheck and linter issues
1 parent 1df68c1 commit e7f949b

3 files changed

Lines changed: 20 additions & 22 deletions

File tree

aliases/available/git-omz.aliases.bash

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ fi
1212

1313
# Setup git version
1414
read -ra git_version_arr <<< "$(git version 2> /dev/null)"
15+
# shellcheck disable=SC2034
1516
git_version="${git_version_arr[2]}"
1617

1718
# Setup is-at-least

aliases/available/git.aliases.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ about-alias 'common git abbreviations'
33

44
# We can use this variable to make sure that we don't accidentally clash with git-zsh aliases
55
if _bash-it-component-item-is-enabled aliases git-omz; then
6-
_log_warning "The aliases from 'git' and from 'git-omz' conflict with each other; please only enable one."
7-
return 1
6+
_log_warning "The aliases from 'git' and from 'git-omz' conflict with each other; please only enable one."
7+
return 1
88
fi
99

1010
alias g='git'

test/lib/search.bats

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,23 @@ function local_setup() {
1818
}
1919

2020
@test "search: git" {
21-
local plugin completion
22-
run _bash-it-search 'git' --no-color
23-
24-
assert_line -n 0 -p ' aliases:'
25-
assert_success
26-
for alias in 'git' 'gitsvn' 'git-omz'
27-
do
28-
echo $alias
29-
assert_line -n 0 -p $alias
30-
done
31-
32-
assert_line -n 1 -p ' plugins:'
33-
for plugin in "autojump" "git" "gitstatus" "git-subrepo" "jgitflow" "jump"
34-
do
35-
assert_line -n 1 -p "$plugin"
36-
done
37-
for completion in "git" "git_flow" "git_flow_avh" "github-cli"
38-
do
39-
assert_line -n 2 -p "$completion"
40-
done
21+
local plugin completion
22+
run _bash-it-search 'git' --no-color
23+
24+
assert_line -n 0 -p ' aliases:'
25+
assert_success
26+
for alias in 'git' 'gitsvn' 'git-omz'; do
27+
echo $alias
28+
assert_line -n 0 -p $alias
29+
done
30+
31+
assert_line -n 1 -p ' plugins:'
32+
for plugin in "autojump" "git" "gitstatus" "git-subrepo" "jgitflow" "jump"; do
33+
assert_line -n 1 -p "$plugin"
34+
done
35+
for completion in "git" "git_flow" "git_flow_avh" "github-cli"; do
36+
assert_line -n 2 -p "$completion"
37+
done
4138
}
4239

4340
@test "search: ruby gem bundle rake rails" {

0 commit comments

Comments
 (0)