mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-12-23 00:17:59 +00:00
Replace git with 'command git' (#1551)
to improve performance if git is aliased to hub or other wrappers.
This commit is contained in:
parent
e00562e7cf
commit
b3c27bb164
@ -8,7 +8,7 @@
|
|||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -21,7 +21,7 @@ _arguments -C -s -S \
|
|||||||
|
|
||||||
case "$state" in
|
case "$state" in
|
||||||
(remote)
|
(remote)
|
||||||
remotes=($(git config --get-regexp 'remote.*.url' | cut -d. -f2))
|
remotes=($(command git config --get-regexp 'remote.*.url' | cut -d. -f2))
|
||||||
|
|
||||||
_describe -t branch 'remotes' remotes && ret=0
|
_describe -t branch 'remotes' remotes && ret=0
|
||||||
;;
|
;;
|
||||||
@ -29,7 +29,7 @@ case "$state" in
|
|||||||
remote="$words[(($CURRENT - 1))]"
|
remote="$words[(($CURRENT - 1))]"
|
||||||
|
|
||||||
branches_or_tags=($(
|
branches_or_tags=($(
|
||||||
git ls-remote --heads --tags "$remote" 2> /dev/null | cut -f2
|
command git ls-remote --heads --tags "$remote" 2> /dev/null | cut -f2
|
||||||
))
|
))
|
||||||
|
|
||||||
branches=(HEAD ${${(M)branches_or_tags[@]##refs/heads/?##}##refs/heads/})
|
branches=(HEAD ${${(M)branches_or_tags[@]##refs/heads/?##}##refs/heads/})
|
||||||
@ -39,7 +39,7 @@ case "$state" in
|
|||||||
_describe -t tag 'tags' tags && ret=0
|
_describe -t tag 'tags' tags && ret=0
|
||||||
;;
|
;;
|
||||||
(file)
|
(file)
|
||||||
files=(${(0)"$(_call_program files git ls-files -z --exclude-standard 2> /dev/null)"})
|
files=(${(0)"$(_call_program files command git ls-files -z --exclude-standard 2> /dev/null)"})
|
||||||
_wanted file expl 'file' _multi_parts - / files && ret=0
|
_wanted file expl 'file' _multi_parts - / files && ret=0
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -25,7 +25,7 @@ case "$state" in
|
|||||||
while IFS=$'\n' read submodule; do
|
while IFS=$'\n' read submodule; do
|
||||||
submodules+=("$submodule")
|
submodules+=("$submodule")
|
||||||
done < <(
|
done < <(
|
||||||
git config --file "$(git-root)/.gitmodules" --list \
|
command git config --file "$(git-root)/.gitmodules" --list \
|
||||||
| grep '.path=' \
|
| grep '.path=' \
|
||||||
| cut -d= -f2-
|
| cut -d= -f2-
|
||||||
)
|
)
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -18,7 +18,7 @@ local submodule
|
|||||||
while IFS=$'\n' read submodule; do
|
while IFS=$'\n' read submodule; do
|
||||||
submodules+=("$submodule")
|
submodules+=("$submodule")
|
||||||
done < <(
|
done < <(
|
||||||
git config --file "$(git-root)/.gitmodules" --list \
|
command git config --file "$(git-root)/.gitmodules" --list \
|
||||||
| grep '.path=' \
|
| grep '.path=' \
|
||||||
| cut -d= -f2-
|
| cut -d= -f2-
|
||||||
)
|
)
|
||||||
|
@ -7,12 +7,12 @@
|
|||||||
|
|
||||||
# function git-branch-current {
|
# function git-branch-current {
|
||||||
|
|
||||||
if ! git rev-parse 2> /dev/null; then
|
if ! command git rev-parse 2> /dev/null; then
|
||||||
print "$0: not a repository: $PWD" >&2
|
print "$0: not a repository: $PWD" >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local ref="$(git symbolic-ref HEAD 2> /dev/null)"
|
local ref="$(command git symbolic-ref HEAD 2> /dev/null)"
|
||||||
|
|
||||||
if [[ -n "$ref" ]]; then
|
if [[ -n "$ref" ]]; then
|
||||||
print "${ref#refs/heads/}"
|
print "${ref#refs/heads/}"
|
||||||
|
@ -7,15 +7,15 @@
|
|||||||
|
|
||||||
# function git-commit-lost {
|
# function git-commit-lost {
|
||||||
|
|
||||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
print "$0: not a repository work tree: $PWD" >&2
|
print "$0: not a repository work tree: $PWD" >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git fsck 2> /dev/null \
|
command git fsck 2> /dev/null \
|
||||||
| grep "^dangling commit" \
|
| grep "^dangling commit" \
|
||||||
| awk '{print $3}' \
|
| awk '{print $3}' \
|
||||||
| git log \
|
| command git log \
|
||||||
--date-order \
|
--date-order \
|
||||||
--no-walk \
|
--no-walk \
|
||||||
--stdin \
|
--stdin \
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
# function git-dir {
|
# function git-dir {
|
||||||
|
|
||||||
local git_dir="${$(git rev-parse --git-dir):A}"
|
local git_dir="${$(command git rev-parse --git-dir):A}"
|
||||||
|
|
||||||
if [[ -n "$git_dir" ]]; then
|
if [[ -n "$git_dir" ]]; then
|
||||||
print "$git_dir"
|
print "$git_dir"
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
# function git-hub-browse {
|
# function git-hub-browse {
|
||||||
|
|
||||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
print "$0: not a repository work tree: $PWD" >&2
|
print "$0: not a repository work tree: $PWD" >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@ -15,7 +15,7 @@ fi
|
|||||||
local remotes remote references reference file url
|
local remotes remote references reference file url
|
||||||
|
|
||||||
remote="${1:-origin}"
|
remote="${1:-origin}"
|
||||||
remotes=($(git config --get-regexp 'remote.*.url' | cut -d. -f2))
|
remotes=($(command git config --get-regexp 'remote.*.url' | cut -d. -f2))
|
||||||
|
|
||||||
if (( $remotes[(i)$remote] == $#remotes + 1 )); then
|
if (( $remotes[(i)$remote] == $#remotes + 1 )); then
|
||||||
print "$0: remote not found: $remote" >&2
|
print "$0: remote not found: $remote" >&2
|
||||||
@ -23,14 +23,14 @@ if (( $remotes[(i)$remote] == $#remotes + 1 )); then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
url=$(
|
url=$(
|
||||||
git config --get "remote.${remote}.url" \
|
command git config --get "remote.${remote}.url" \
|
||||||
| sed -En "s/(git|https?)(@|:\/\/)github.com(:|\/)(.+)\/(.+).git/https:\/\/github.com\/\4\/\5/p"
|
| sed -En "s/(git|https?)(@|:\/\/)github.com(:|\/)(.+)\/(.+).git/https:\/\/github.com\/\4\/\5/p"
|
||||||
)
|
)
|
||||||
|
|
||||||
reference="${${2:-$(git-branch-current)}:-HEAD}"
|
reference="${${2:-$(git-branch-current)}:-HEAD}"
|
||||||
references=(
|
references=(
|
||||||
HEAD
|
HEAD
|
||||||
${$(git ls-remote --heads --tags "$remote" | awk '{print $2}')##refs/(heads|tags)/}
|
${$(command git ls-remote --heads --tags "$remote" | awk '{print $2}')##refs/(heads|tags)/}
|
||||||
)
|
)
|
||||||
|
|
||||||
if (( $references[(i)$reference] == $#references + 1 )); then
|
if (( $references[(i)$reference] == $#references + 1 )); then
|
||||||
@ -39,7 +39,7 @@ if (( $references[(i)$reference] == $#references + 1 )); then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$reference" == 'HEAD' ]]; then
|
if [[ "$reference" == 'HEAD' ]]; then
|
||||||
reference="$(git rev-parse HEAD 2> /dev/null)"
|
reference="$(command git rev-parse HEAD 2> /dev/null)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
file="$3"
|
file="$3"
|
||||||
|
@ -178,15 +178,15 @@ function git-info {
|
|||||||
typeset -gA git_info
|
typeset -gA git_info
|
||||||
|
|
||||||
# Return if not inside a Git repository work tree.
|
# Return if not inside a Git repository work tree.
|
||||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (( $# > 0 )); then
|
if (( $# > 0 )); then
|
||||||
if [[ "$1" == [Oo][Nn] ]]; then
|
if [[ "$1" == [Oo][Nn] ]]; then
|
||||||
git config --bool prompt.showinfo true
|
command git config --bool prompt.showinfo true
|
||||||
elif [[ "$1" == [Oo][Ff][Ff] ]]; then
|
elif [[ "$1" == [Oo][Ff][Ff] ]]; then
|
||||||
git config --bool prompt.showinfo false
|
command git config --bool prompt.showinfo false
|
||||||
else
|
else
|
||||||
print "usage: $0 [ on | off ]" >&2
|
print "usage: $0 [ on | off ]" >&2
|
||||||
fi
|
fi
|
||||||
@ -194,7 +194,7 @@ function git-info {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Return if git-info is disabled.
|
# Return if git-info is disabled.
|
||||||
if ! is-true "${$(git config --bool prompt.showinfo):-true}"; then
|
if ! is-true "${$(command git config --bool prompt.showinfo):-true}"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -204,7 +204,7 @@ function git-info {
|
|||||||
# Format commit.
|
# Format commit.
|
||||||
zstyle -s ':prezto:module:git:info:commit' format 'commit_format'
|
zstyle -s ':prezto:module:git:info:commit' format 'commit_format'
|
||||||
if [[ -n "$commit_format" ]]; then
|
if [[ -n "$commit_format" ]]; then
|
||||||
commit="$(git rev-parse HEAD 2> /dev/null)"
|
commit="$(command git rev-parse HEAD 2> /dev/null)"
|
||||||
if [[ -n "$commit" ]]; then
|
if [[ -n "$commit" ]]; then
|
||||||
zformat -f commit_formatted "$commit_format" "c:$commit"
|
zformat -f commit_formatted "$commit_format" "c:$commit"
|
||||||
fi
|
fi
|
||||||
@ -213,7 +213,7 @@ function git-info {
|
|||||||
# Format stashed.
|
# Format stashed.
|
||||||
zstyle -s ':prezto:module:git:info:stashed' format 'stashed_format'
|
zstyle -s ':prezto:module:git:info:stashed' format 'stashed_format'
|
||||||
if [[ -n "$stashed_format" && -f "$(git-dir)/refs/stash" ]]; then
|
if [[ -n "$stashed_format" && -f "$(git-dir)/refs/stash" ]]; then
|
||||||
stashed="$(git stash list 2> /dev/null | wc -l | awk '{print $1}')"
|
stashed="$(command git stash list 2> /dev/null | wc -l | awk '{print $1}')"
|
||||||
if [[ -n "$stashed" ]]; then
|
if [[ -n "$stashed" ]]; then
|
||||||
zformat -f stashed_formatted "$stashed_format" "S:$stashed"
|
zformat -f stashed_formatted "$stashed_format" "S:$stashed"
|
||||||
fi
|
fi
|
||||||
@ -229,7 +229,7 @@ function git-info {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Get the branch.
|
# Get the branch.
|
||||||
branch="${$(git symbolic-ref HEAD 2> /dev/null)#refs/heads/}"
|
branch="${$(command git symbolic-ref HEAD 2> /dev/null)#refs/heads/}"
|
||||||
|
|
||||||
# Format branch.
|
# Format branch.
|
||||||
zstyle -s ':prezto:module:git:info:branch' format 'branch_format'
|
zstyle -s ':prezto:module:git:info:branch' format 'branch_format'
|
||||||
@ -240,7 +240,7 @@ function git-info {
|
|||||||
# Format position.
|
# Format position.
|
||||||
zstyle -s ':prezto:module:git:info:position' format 'position_format'
|
zstyle -s ':prezto:module:git:info:position' format 'position_format'
|
||||||
if [[ -z "$branch" && -n "$position_format" ]]; then
|
if [[ -z "$branch" && -n "$position_format" ]]; then
|
||||||
position="$(git describe --contains --all HEAD 2> /dev/null)"
|
position="$(command git describe --contains --all HEAD 2> /dev/null)"
|
||||||
if [[ -n "$position" ]]; then
|
if [[ -n "$position" ]]; then
|
||||||
zformat -f position_formatted "$position_format" "p:$position"
|
zformat -f position_formatted "$position_format" "p:$position"
|
||||||
fi
|
fi
|
||||||
@ -250,7 +250,7 @@ function git-info {
|
|||||||
zstyle -s ':prezto:module:git:info:remote' format 'remote_format'
|
zstyle -s ':prezto:module:git:info:remote' format 'remote_format'
|
||||||
if [[ -n "$branch" && -n "$remote_format" ]]; then
|
if [[ -n "$branch" && -n "$remote_format" ]]; then
|
||||||
# Gets the remote name.
|
# Gets the remote name.
|
||||||
remote_cmd='git rev-parse --symbolic-full-name --verify HEAD@{upstream}'
|
remote_cmd='command git rev-parse --symbolic-full-name --verify HEAD@{upstream}'
|
||||||
remote="${$(${(z)remote_cmd} 2> /dev/null)##refs/remotes/}"
|
remote="${$(${(z)remote_cmd} 2> /dev/null)##refs/remotes/}"
|
||||||
if [[ -n "$remote" ]]; then
|
if [[ -n "$remote" ]]; then
|
||||||
zformat -f remote_formatted "$remote_format" "R:$remote"
|
zformat -f remote_formatted "$remote_format" "R:$remote"
|
||||||
@ -261,7 +261,7 @@ function git-info {
|
|||||||
zstyle -s ':prezto:module:git:info:behind' format 'behind_format'
|
zstyle -s ':prezto:module:git:info:behind' format 'behind_format'
|
||||||
if [[ -n "$branch" && ( -n "$ahead_format" || -n "$behind_format" ) ]]; then
|
if [[ -n "$branch" && ( -n "$ahead_format" || -n "$behind_format" ) ]]; then
|
||||||
# Gets the commit difference counts between local and remote.
|
# Gets the commit difference counts between local and remote.
|
||||||
ahead_and_behind_cmd='git rev-list --count --left-right HEAD...@{upstream}'
|
ahead_and_behind_cmd='command git rev-list --count --left-right HEAD...@{upstream}'
|
||||||
|
|
||||||
# Get ahead and behind counts.
|
# Get ahead and behind counts.
|
||||||
ahead_and_behind="$(${(z)ahead_and_behind_cmd} 2> /dev/null)"
|
ahead_and_behind="$(${(z)ahead_and_behind_cmd} 2> /dev/null)"
|
||||||
@ -290,7 +290,7 @@ function git-info {
|
|||||||
if [[ -n "$indexed_format" ]]; then
|
if [[ -n "$indexed_format" ]]; then
|
||||||
((
|
((
|
||||||
indexed+=$(
|
indexed+=$(
|
||||||
git diff-index \
|
command git diff-index \
|
||||||
--no-ext-diff \
|
--no-ext-diff \
|
||||||
--name-only \
|
--name-only \
|
||||||
--cached \
|
--cached \
|
||||||
@ -310,7 +310,7 @@ function git-info {
|
|||||||
if [[ -n "$unindexed_format" ]]; then
|
if [[ -n "$unindexed_format" ]]; then
|
||||||
((
|
((
|
||||||
unindexed+=$(
|
unindexed+=$(
|
||||||
git diff-files \
|
command git diff-files \
|
||||||
--no-ext-diff \
|
--no-ext-diff \
|
||||||
--name-only \
|
--name-only \
|
||||||
--ignore-submodules=${ignore_submodules:-none} \
|
--ignore-submodules=${ignore_submodules:-none} \
|
||||||
@ -328,7 +328,7 @@ function git-info {
|
|||||||
if [[ -n "$untracked_format" ]]; then
|
if [[ -n "$untracked_format" ]]; then
|
||||||
((
|
((
|
||||||
untracked+=$(
|
untracked+=$(
|
||||||
git ls-files \
|
command git ls-files \
|
||||||
--other \
|
--other \
|
||||||
--exclude-standard \
|
--exclude-standard \
|
||||||
2> /dev/null \
|
2> /dev/null \
|
||||||
@ -343,7 +343,7 @@ function git-info {
|
|||||||
(( dirty = indexed + unindexed + untracked ))
|
(( dirty = indexed + unindexed + untracked ))
|
||||||
else
|
else
|
||||||
# Use porcelain status for easy parsing.
|
# Use porcelain status for easy parsing.
|
||||||
status_cmd="git status --porcelain --ignore-submodules=${ignore_submodules:-none}"
|
status_cmd="command git status --porcelain --ignore-submodules=${ignore_submodules:-none}"
|
||||||
|
|
||||||
# Get current status.
|
# Get current status.
|
||||||
while IFS=$'\n' read line; do
|
while IFS=$'\n' read line; do
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
# function git-root {
|
# function git-root {
|
||||||
|
|
||||||
local root="$(git rev-parse --show-toplevel 2> /dev/null)"
|
local root="$(command git rev-parse --show-toplevel 2> /dev/null)"
|
||||||
|
|
||||||
if [[ -n "$root" ]]; then
|
if [[ -n "$root" ]]; then
|
||||||
print "$root"
|
print "$root"
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
# function git-stash-clear-interactive {
|
# function git-stash-clear-interactive {
|
||||||
|
|
||||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
print "$0: not a repository work tree: $PWD" >&2
|
print "$0: not a repository work tree: $PWD" >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@ -15,10 +15,10 @@ fi
|
|||||||
local stashed
|
local stashed
|
||||||
|
|
||||||
if [[ -f "$(git-dir)/refs/stash" ]]; then
|
if [[ -f "$(git-dir)/refs/stash" ]]; then
|
||||||
stashed="$(git stash list 2> /dev/null | wc -l | awk '{print $1}')"
|
stashed="$(command git stash list 2> /dev/null | wc -l | awk '{print $1}')"
|
||||||
if (( $stashed > 0 )); then
|
if (( $stashed > 0 )); then
|
||||||
if read -q "?Clear $stashed stashed state(s) [y/N]? "; then
|
if read -q "?Clear $stashed stashed state(s) [y/N]? "; then
|
||||||
git stash clear
|
command git stash clear
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -7,15 +7,15 @@
|
|||||||
|
|
||||||
# function git-stash-dropped {
|
# function git-stash-dropped {
|
||||||
|
|
||||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
print "$0: not a repository work tree: $PWD" >&2
|
print "$0: not a repository work tree: $PWD" >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git fsck --unreachable 2> /dev/null \
|
command git fsck --unreachable 2> /dev/null \
|
||||||
| grep 'commit' \
|
| grep 'commit' \
|
||||||
| awk '{print $3}' \
|
| awk '{print $3}' \
|
||||||
| git log \
|
| command git log \
|
||||||
--pretty=format:${_git_log_oneline_format} \
|
--pretty=format:${_git_log_oneline_format} \
|
||||||
--extended-regexp \
|
--extended-regexp \
|
||||||
--grep="${1:-(WIP )?[Oo]n [^:]+:}" \
|
--grep="${1:-(WIP )?[Oo]n [^:]+:}" \
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
# function git-stash-recover {
|
# function git-stash-recover {
|
||||||
|
|
||||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
print "$0: not a repository work tree: $PWD" >&2
|
print "$0: not a repository work tree: $PWD" >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@ -15,8 +15,8 @@ fi
|
|||||||
local commit
|
local commit
|
||||||
|
|
||||||
for commit in "$@"; do
|
for commit in "$@"; do
|
||||||
git update-ref \
|
command git update-ref \
|
||||||
-m "$(git log -1 --pretty="format:%s" "$commit")" refs/stash "$commit"
|
-m "$(command git log -1 --pretty="format:%s" "$commit")" refs/stash "$commit"
|
||||||
done
|
done
|
||||||
|
|
||||||
# }
|
# }
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
# function git-submodule-move {
|
# function git-submodule-move {
|
||||||
|
|
||||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
print "$0: not a repository work tree: $PWD" >&2
|
print "$0: not a repository work tree: $PWD" >&2
|
||||||
return 1
|
return 1
|
||||||
elif [[ "$PWD" != "$(git-root)" ]]; then
|
elif [[ "$PWD" != "$(git-root)" ]]; then
|
||||||
@ -19,7 +19,7 @@ local src="$1"
|
|||||||
local dst="$2"
|
local dst="$2"
|
||||||
local url
|
local url
|
||||||
|
|
||||||
url="$(git config --file "$(git-root)/.gitmodules" --get "submodule.${src}.url")"
|
url="$(command git config --file "$(git-root)/.gitmodules" --get "submodule.${src}.url")"
|
||||||
|
|
||||||
if [[ -z "$url" ]]; then
|
if [[ -z "$url" ]]; then
|
||||||
print "$0: submodule not found: $src" >&2
|
print "$0: submodule not found: $src" >&2
|
||||||
@ -29,7 +29,7 @@ fi
|
|||||||
mkdir -p "${dst:h}"
|
mkdir -p "${dst:h}"
|
||||||
|
|
||||||
git-submodule-remove "$src"
|
git-submodule-remove "$src"
|
||||||
git submodule add "$url" "$dst"
|
command git submodule add "$url" "$dst"
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
@ -7,22 +7,22 @@
|
|||||||
|
|
||||||
# function git-submodule-remove {
|
# function git-submodule-remove {
|
||||||
|
|
||||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||||
print "$0: not a repository work tree: $PWD" >&2
|
print "$0: not a repository work tree: $PWD" >&2
|
||||||
return 1
|
return 1
|
||||||
elif [[ "$PWD" != "$(git-root)" ]]; then
|
elif [[ "$PWD" != "$(git-root)" ]]; then
|
||||||
print "$0: must be run from the root of the work tree" >&2
|
print "$0: must be run from the root of the work tree" >&2
|
||||||
return 1
|
return 1
|
||||||
elif ! git config --file .gitmodules --get "submodule.${1}.path" &>/dev/null; then
|
elif ! command git config --file .gitmodules --get "submodule.${1}.path" &> /dev/null; then
|
||||||
print "$0: submodule not found: $1" >&2
|
print "$0: submodule not found: $1" >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git config --file "$(git-dir)/config" --remove-section "submodule.${1}" &>/dev/null
|
command git config --file "$(git-dir)/config" --remove-section "submodule.${1}" &> /dev/null
|
||||||
git config --file "$(git-root)/.gitmodules" --remove-section "submodule.${1}" &>/dev/null
|
command git config --file "$(git-root)/.gitmodules" --remove-section "submodule.${1}" &> /dev/null
|
||||||
git add .gitmodules
|
command git add .gitmodules
|
||||||
|
|
||||||
git rm --cached -rf "${1}"
|
command git rm --cached -rf "${1}"
|
||||||
rm -rf "${1}"
|
rm -rf "${1}"
|
||||||
rm -rf "$(git-dir)/modules/${1}"
|
rm -rf "$(git-dir)/modules/${1}"
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ function wdiff {
|
|||||||
"$@" \
|
"$@" \
|
||||||
| sed 's/^\(@@\( [+-][[:digit:]]*,[[:digit:]]*\)\{2\} @@\)$/;5;6m\10m/g'
|
| sed 's/^\(@@\( [+-][[:digit:]]*,[[:digit:]]*\)\{2\} @@\)$/;5;6m\10m/g'
|
||||||
elif (( $+commands[git] )); then
|
elif (( $+commands[git] )); then
|
||||||
git --no-pager diff --color=auto --no-ext-diff --no-index --color-words "$@"
|
command git --no-pager diff --color=auto --no-ext-diff --no-index --color-words "$@"
|
||||||
else
|
else
|
||||||
command wdiff "$@"
|
command wdiff "$@"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user