Skip to content

Commit

Permalink
linting the bats
Browse files Browse the repository at this point in the history
  • Loading branch information
Ira Abramov committed Nov 7, 2024
1 parent 092b1ea commit 9df0c64
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions aliases/available/git.aliases.bash
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ alias ggup='git log --branches --not --remotes --no-walk --decorate --oneline' #
alias gll='git log --graph --pretty=oneline --abbrev-commit'
alias gnew='git log HEAD@{1}..HEAD@{0}' # Show commits since last pull, see http://blogs.atlassian.com/2014/10/advanced-git-aliases/
alias gwc='git whatchanged'
alias ghist='git log --pretty=format:'\''%h %ad | %s%d [%an]'\'' --graph --date=short' # Use it to be fast and without color.
alias ghist='git log --pretty=format:'\''%h %ad | %s%d [%an]'\'' --graph --date=short' # Use it to be fast and without color.
alias gprogress='git log --pretty=format:'\''%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d'\'' --decorate --date=short' #Usually use "git progress" in the file .gitconfig. The new alias from Git friends will be truly welcome.

# ls-files
Expand Down Expand Up @@ -153,8 +153,8 @@ alias grma='GIT_SEQUENCE_EDITOR=: git rebase $(get_default_branch) -i --autosqu
alias gprom='git fetch origin $(get_default_branch) && git rebase origin/$(get_default_branch) && git update-ref refs/heads/$(get_default_branch) origin/$(get_default_branch)' # Rebase with latest remote

# reset
alias gus='git reset HEAD' # read as: 'git unstage'
alias grh='git reset' # equivalent to: git reset HEAD
alias gus='git reset HEAD' # read as: 'git unstage'
alias grh='git reset' # equivalent to: git reset HEAD
alias grh!='git reset --hard'
alias gpristine='git reset --hard && git clean -dfx'

Expand Down
1 change: 1 addition & 0 deletions test/plugins/battery.plugin.bats
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ function setup_ioreg {
percent="$1"

function ioreg {
# shellcheck disable=SC2317
printf "\"MaxCapacity\" = 100\n\"CurrentCapacity\" = %s" "${percent}"
}
}
Expand Down
4 changes: 2 additions & 2 deletions themes/base.theme.bash
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,9 @@ function node_version_prompt() {
_log_debug "node: using version strategy '$NODE_VERSION_STRATEGY'"

if [ "$NODE_VERSION_STRATEGY" == "nvm" ]; then
nvm_version_prompt
nvm_version_prompt
elif [ "$NODE_VERSION_STRATEGY" == "node" ]; then
node_native_version_prompt
node_native_version_prompt
fi
}

Expand Down

0 comments on commit 9df0c64

Please sign in to comment.