linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-19 20:29:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prefix cd calls with builtin (#8937)

Browse source
This commit is contained in:
Jacob Menke 2020-05-20 05:30:11 -04:00 committed by GitHub
parent 8b51d17c46
commit 582c8cb291
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/cli.zsh
View file

@ -103,7 +103,7 @@ EOF
function _omz::pr::clean { function _omz::pr::clean {
( (
set -e set -e
cd -q "$ZSH" builtin cd -q "$ZSH"
_omz::log info "removing all Oh My Zsh Pull Request branches..." _omz::log info "removing all Oh My Zsh Pull Request branches..."
command git branch --list 'ohmyzsh/pull-*' | while read branch; do command git branch --list 'ohmyzsh/pull-*' | while read branch; do
@ -126,7 +126,7 @@ function _omz::pr::test {
# Save current git HEAD # Save current git HEAD
local branch local branch
branch=$(cd -q "$ZSH"; git symbolic-ref --short HEAD) || { branch=$(builtin cd -q "$ZSH"; git symbolic-ref --short HEAD) || {
_omz::log error "error when getting the current git branch. Aborting..." _omz::log error "error when getting the current git branch. Aborting..."
return 1 return 1
} }
@ -136,7 +136,7 @@ function _omz::pr::test {
# If any of these operations fail, undo the changes made # If any of these operations fail, undo the changes made
( (
set -e set -e
cd -q "$ZSH" builtin cd -q "$ZSH"
# Get the ohmyzsh git remote # Get the ohmyzsh git remote
command git remote -v | while read remote url _; do command git remote -v | while read remote url _; do
@ -185,7 +185,7 @@ function _omz::pr::test {
( (
set -e set -e
cd -q "$ZSH" builtin cd -q "$ZSH"
command git checkout "$branch" -- || { command git checkout "$branch" -- || {
_omz::log error "could not go back to the previous branch ('$branch')." _omz::log error "could not go back to the previous branch ('$branch')."

8
lib/diagnostics.zsh
View file

@ -192,19 +192,19 @@ function _omz_diag_dump_one_big_text() {
command ls -ld ~/.oh* command ls -ld ~/.oh*
builtin echo builtin echo
builtin echo oh-my-zsh git state: builtin echo oh-my-zsh git state:
(cd $ZSH && builtin echo "HEAD: $(git rev-parse HEAD)" && git remote -v && git status | command grep "[^[:space:]]") (builtin cd $ZSH && builtin echo "HEAD: $(git rev-parse HEAD)" && git remote -v && git status | command grep "[^[:space:]]")
if [[ $verbose -ge 1 ]]; then if [[ $verbose -ge 1 ]]; then
(cd $ZSH && git reflog --date=default | command grep pull) (builtin cd $ZSH && git reflog --date=default | command grep pull)
fi fi
builtin echo builtin echo
if [[ -e $ZSH_CUSTOM ]]; then if [[ -e $ZSH_CUSTOM ]]; then
local custom_dir=$ZSH_CUSTOM local custom_dir=$ZSH_CUSTOM
if [[ -h $custom_dir ]]; then if [[ -h $custom_dir ]]; then
custom_dir=$(cd $custom_dir && pwd -P) custom_dir=$(builtin cd $custom_dir && pwd -P)
fi fi
builtin echo "oh-my-zsh custom dir:" builtin echo "oh-my-zsh custom dir:"
builtin echo " $ZSH_CUSTOM ($custom_dir)" builtin echo " $ZSH_CUSTOM ($custom_dir)"
(cd ${custom_dir:h} && command find ${custom_dir:t} -name .git -prune -o -print) (builtin cd ${custom_dir:h} && command find ${custom_dir:t} -name .git -prune -o -print)
builtin echo builtin echo
fi fi

2
oh-my-zsh.sh
View file

@ -63,7 +63,7 @@ fi
# Construct zcompdump OMZ metadata # Construct zcompdump OMZ metadata
zcompdump_metadata="\ zcompdump_metadata="\
#omz revision: $(cd -q "$ZSH"; git rev-parse HEAD 2>/dev/null) #omz revision: $(builtin cd -q "$ZSH"; git rev-parse HEAD 2>/dev/null)
#omz fpath: $fpath\ #omz fpath: $fpath\
" "