mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2025-12-13 16:04:08 +08:00
Compare commits
2 Commits
8b51d17c46
...
cfdd3c8dd8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cfdd3c8dd8 | ||
|
|
582c8cb291 |
@ -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')."
|
||||||
|
|||||||
@ -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
|
||||||
|
|
||||||
|
|||||||
@ -35,7 +35,6 @@ setopt extended_history # record timestamp of command in HISTFILE
|
|||||||
setopt hist_expire_dups_first # delete duplicates first when HISTFILE size exceeds HISTSIZE
|
setopt hist_expire_dups_first # delete duplicates first when HISTFILE size exceeds HISTSIZE
|
||||||
setopt hist_ignore_dups # ignore duplicated commands history list
|
setopt hist_ignore_dups # ignore duplicated commands history list
|
||||||
setopt hist_ignore_space # ignore commands that start with space
|
setopt hist_ignore_space # ignore commands that start with space
|
||||||
setopt hist_reduce_blanks # remove superfluous blanks from commands added to history
|
|
||||||
setopt hist_verify # show command with history expansion to user before running it
|
setopt hist_verify # show command with history expansion to user before running it
|
||||||
setopt inc_append_history # add commands to HISTFILE in order of execution
|
setopt inc_append_history # add commands to HISTFILE in order of execution
|
||||||
setopt share_history # share command history data
|
setopt share_history # share command history data
|
||||||
|
|||||||
@ -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\
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user