2012-05-22 22:46:40 +02:00
|
|
|
# bash/zsh git prompt support
|
|
|
|
#
|
|
|
|
# Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
|
|
|
|
# Distributed under the GNU General Public License, version 2.0.
|
|
|
|
#
|
2013-06-26 05:05:17 +02:00
|
|
|
# This script allows you to see repository status in your prompt.
|
2012-05-22 22:46:40 +02:00
|
|
|
#
|
|
|
|
# To enable:
|
|
|
|
#
|
|
|
|
# 1) Copy this file to somewhere (e.g. ~/.git-prompt.sh).
|
|
|
|
# 2) Add the following line to your .bashrc/.zshrc:
|
|
|
|
# source ~/.git-prompt.sh
|
2012-12-12 00:04:36 +01:00
|
|
|
# 3a) Change your PS1 to call __git_ps1 as
|
2012-10-10 21:31:58 +02:00
|
|
|
# command-substitution:
|
|
|
|
# Bash: PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
|
2013-06-26 05:05:17 +02:00
|
|
|
# ZSH: setopt PROMPT_SUBST ; PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ '
|
2012-12-12 00:04:36 +01:00
|
|
|
# the optional argument will be used as format string.
|
2013-07-01 21:41:55 +02:00
|
|
|
# 3b) Alternatively, for a slightly faster prompt, __git_ps1 can
|
|
|
|
# be used for PROMPT_COMMAND in Bash or for precmd() in Zsh
|
bash prompt: mention that PROMPT_COMMAND mode is faster
__git_ps1() is usually added to the prompt inside a command
substitution, imposing the overhead of fork()ing a subshell. Using
__git_ps1() for $PROMPT_COMMAND is slightly faster, because it avoids
that command substitution.
Mention this in the comments about setting up the git prompt.
The whole series speeds up the bash prompt on Windows/MSysGit
considerably. Here are some timing results in three scenarios, each
repeated 10 times:
At the top of the work tree, before:
$ time for i in {0..9} ; do prompt="$(__git_ps1)" ; done
real 0m1.716s
user 0m0.301s
sys 0m0.772s
After:
real 0m0.687s
user 0m0.075s
sys 0m0.396s
After, from $PROMPT_COMMAND:
$ time for i in {0..9} ; do __git_ps1 '\h:\w' '$ ' ; done
real 0m0.546s
user 0m0.075s
sys 0m0.181s
At the top of the work tree, detached head, before:
real 0m2.574s
user 0m0.376s
sys 0m1.207s
After:
real 0m1.139s
user 0m0.151s
sys 0m0.500s
After, from $PROMPT_COMMAND:
real 0m1.030s
user 0m0.245s
sys 0m0.336s
In a subdirectory, during rebase, stash status indicator enabled,
before:
real 0m3.557s
user 0m0.495s
sys 0m1.767s
After:
real 0m0.717s
user 0m0.120s
sys 0m0.300s
After, from $PROMPT_COMMAND:
real 0m0.577s
user 0m0.047s
sys 0m0.258s
On Linux the speedup ratio is comparable to Windows, but overall it
was about an order of magnitude faster to begin with. The last case
from above, repeated 100 times, before:
$ time for i in {0..99} ; do prompt="$(__git_ps1)" ; done
real 0m2.806s
user 0m0.180s
sys 0m0.264s
After:
real 0m0.857s
user 0m0.020s
sys 0m0.028s
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
2013-06-24 02:28:02 +02:00
|
|
|
# with two parameters, <pre> and <post>, which are strings
|
|
|
|
# you would put in $PS1 before and after the status string
|
|
|
|
# generated by the git-prompt machinery. e.g.
|
2013-05-17 10:55:48 +02:00
|
|
|
# Bash: PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
|
2013-06-26 05:05:17 +02:00
|
|
|
# will show username, at-sign, host, colon, cwd, then
|
|
|
|
# various status string, followed by dollar and SP, as
|
|
|
|
# your prompt.
|
2013-05-17 10:55:48 +02:00
|
|
|
# ZSH: precmd () { __git_ps1 "%n" ":%~$ " "|%s" }
|
2013-06-26 05:05:17 +02:00
|
|
|
# will show username, pipe, then various status string,
|
|
|
|
# followed by colon, cwd, dollar and SP, as your prompt.
|
2012-12-26 20:15:05 +01:00
|
|
|
# Optionally, you can supply a third argument with a printf
|
|
|
|
# format string to finetune the output of the branch status
|
2012-05-22 22:46:40 +02:00
|
|
|
#
|
2013-06-26 05:05:17 +02:00
|
|
|
# The repository status will be displayed only if you are currently in a
|
|
|
|
# git repository. The %s token is the placeholder for the shown status.
|
|
|
|
#
|
|
|
|
# The prompt status always includes the current branch name.
|
2012-05-22 22:46:40 +02:00
|
|
|
#
|
|
|
|
# In addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty value,
|
|
|
|
# unstaged (*) and staged (+) changes will be shown next to the branch
|
|
|
|
# name. You can configure this per-repository with the
|
|
|
|
# bash.showDirtyState variable, which defaults to true once
|
|
|
|
# GIT_PS1_SHOWDIRTYSTATE is enabled.
|
|
|
|
#
|
|
|
|
# You can also see if currently something is stashed, by setting
|
|
|
|
# GIT_PS1_SHOWSTASHSTATE to a nonempty value. If something is stashed,
|
|
|
|
# then a '$' will be shown next to the branch name.
|
|
|
|
#
|
|
|
|
# If you would like to see if there're untracked files, then you can set
|
|
|
|
# GIT_PS1_SHOWUNTRACKEDFILES to a nonempty value. If there're untracked
|
2013-02-13 12:01:58 +01:00
|
|
|
# files, then a '%' will be shown next to the branch name. You can
|
|
|
|
# configure this per-repository with the bash.showUntrackedFiles
|
|
|
|
# variable, which defaults to true once GIT_PS1_SHOWUNTRACKEDFILES is
|
|
|
|
# enabled.
|
2012-05-22 22:46:40 +02:00
|
|
|
#
|
|
|
|
# If you would like to see the difference between HEAD and its upstream,
|
|
|
|
# set GIT_PS1_SHOWUPSTREAM="auto". A "<" indicates you are behind, ">"
|
2012-09-24 19:41:26 +02:00
|
|
|
# indicates you are ahead, "<>" indicates you have diverged and "="
|
|
|
|
# indicates that there is no difference. You can further control
|
|
|
|
# behaviour by setting GIT_PS1_SHOWUPSTREAM to a space-separated list
|
|
|
|
# of values:
|
2012-05-22 22:46:40 +02:00
|
|
|
#
|
|
|
|
# verbose show number of commits ahead/behind (+/-) upstream
|
2013-10-10 16:40:39 +02:00
|
|
|
# name if verbose, then also show the upstream abbrev name
|
2012-05-22 22:46:40 +02:00
|
|
|
# legacy don't use the '--count' option available in recent
|
|
|
|
# versions of git-rev-list
|
|
|
|
# git always compare HEAD to @{upstream}
|
|
|
|
# svn always compare HEAD to your SVN upstream
|
|
|
|
#
|
|
|
|
# By default, __git_ps1 will compare HEAD to your SVN upstream if it can
|
|
|
|
# find one, or @{upstream} otherwise. Once you have set
|
|
|
|
# GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
|
|
|
|
# setting the bash.showUpstream config variable.
|
2012-10-10 21:32:24 +02:00
|
|
|
#
|
2012-12-12 00:20:24 +01:00
|
|
|
# If you would like to see more information about the identity of
|
|
|
|
# commits checked out as a detached HEAD, set GIT_PS1_DESCRIBE_STYLE
|
|
|
|
# to one of these values:
|
|
|
|
#
|
|
|
|
# contains relative to newer annotated tag (v1.6.3.2~35)
|
|
|
|
# branch relative to newer tag or branch (master~4)
|
|
|
|
# describe relative to older annotated tag (v1.6.3.1-13-gdd42c2f)
|
|
|
|
# default exactly matching tag
|
2012-12-12 00:50:10 +01:00
|
|
|
#
|
2012-10-10 21:32:24 +02:00
|
|
|
# If you would like a colored hint about the current dirty state, set
|
2012-10-16 21:34:05 +02:00
|
|
|
# GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
|
2013-06-26 05:05:17 +02:00
|
|
|
# the colored output of "git status -sb" and are available only when
|
|
|
|
# using __git_ps1 for PROMPT_COMMAND or precmd.
|
2012-05-22 22:46:40 +02:00
|
|
|
|
2013-08-22 03:39:03 +02:00
|
|
|
# check whether printf supports -v
|
|
|
|
__git_printf_supports_v=
|
|
|
|
printf -v __git_printf_supports_v -- '%s' yes >/dev/null 2>&1
|
|
|
|
|
2012-05-22 22:46:40 +02:00
|
|
|
# stores the divergence from upstream in $p
|
|
|
|
# used by GIT_PS1_SHOWUPSTREAM
|
|
|
|
__git_ps1_show_upstream ()
|
|
|
|
{
|
|
|
|
local key value
|
|
|
|
local svn_remote svn_url_pattern count n
|
2013-10-10 16:40:39 +02:00
|
|
|
local upstream=git legacy="" verbose="" name=""
|
2012-05-22 22:46:40 +02:00
|
|
|
|
|
|
|
svn_remote=()
|
|
|
|
# get some config options from git-config
|
|
|
|
local output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
|
|
|
|
while read -r key value; do
|
|
|
|
case "$key" in
|
|
|
|
bash.showupstream)
|
|
|
|
GIT_PS1_SHOWUPSTREAM="$value"
|
|
|
|
if [[ -z "${GIT_PS1_SHOWUPSTREAM}" ]]; then
|
|
|
|
p=""
|
|
|
|
return
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
svn-remote.*.url)
|
2013-05-22 09:40:39 +02:00
|
|
|
svn_remote[$((${#svn_remote[@]} + 1))]="$value"
|
2013-10-15 14:21:11 +02:00
|
|
|
svn_url_pattern="$svn_url_pattern\\|$value"
|
2012-05-22 22:46:40 +02:00
|
|
|
upstream=svn+git # default upstream is SVN if available, else git
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done <<< "$output"
|
|
|
|
|
|
|
|
# parse configuration values
|
|
|
|
for option in ${GIT_PS1_SHOWUPSTREAM}; do
|
|
|
|
case "$option" in
|
|
|
|
git|svn) upstream="$option" ;;
|
|
|
|
verbose) verbose=1 ;;
|
|
|
|
legacy) legacy=1 ;;
|
2013-10-10 16:40:39 +02:00
|
|
|
name) name=1 ;;
|
2012-05-22 22:46:40 +02:00
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
|
|
|
# Find our upstream
|
|
|
|
case "$upstream" in
|
|
|
|
git) upstream="@{upstream}" ;;
|
|
|
|
svn*)
|
|
|
|
# get the upstream from the "git-svn-id: ..." in a commit message
|
|
|
|
# (git-svn uses essentially the same procedure internally)
|
2013-05-22 09:40:39 +02:00
|
|
|
local -a svn_upstream
|
|
|
|
svn_upstream=($(git log --first-parent -1 \
|
2012-05-22 22:46:40 +02:00
|
|
|
--grep="^git-svn-id: \(${svn_url_pattern#??}\)" 2>/dev/null))
|
|
|
|
if [[ 0 -ne ${#svn_upstream[@]} ]]; then
|
2013-05-22 09:40:39 +02:00
|
|
|
svn_upstream=${svn_upstream[${#svn_upstream[@]} - 2]}
|
2012-05-22 22:46:40 +02:00
|
|
|
svn_upstream=${svn_upstream%@*}
|
|
|
|
local n_stop="${#svn_remote[@]}"
|
|
|
|
for ((n=1; n <= n_stop; n++)); do
|
|
|
|
svn_upstream=${svn_upstream#${svn_remote[$n]}}
|
|
|
|
done
|
|
|
|
|
|
|
|
if [[ -z "$svn_upstream" ]]; then
|
|
|
|
# default branch name for checkouts with no layout:
|
|
|
|
upstream=${GIT_SVN_ID:-git-svn}
|
|
|
|
else
|
|
|
|
upstream=${svn_upstream#/}
|
|
|
|
fi
|
|
|
|
elif [[ "svn+git" = "$upstream" ]]; then
|
|
|
|
upstream="@{upstream}"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# Find how many commits we are ahead/behind our upstream
|
|
|
|
if [[ -z "$legacy" ]]; then
|
|
|
|
count="$(git rev-list --count --left-right \
|
|
|
|
"$upstream"...HEAD 2>/dev/null)"
|
|
|
|
else
|
|
|
|
# produce equivalent output to --count for older versions of git
|
|
|
|
local commits
|
|
|
|
if commits="$(git rev-list --left-right "$upstream"...HEAD 2>/dev/null)"
|
|
|
|
then
|
|
|
|
local commit behind=0 ahead=0
|
|
|
|
for commit in $commits
|
|
|
|
do
|
|
|
|
case "$commit" in
|
|
|
|
"<"*) ((behind++)) ;;
|
|
|
|
*) ((ahead++)) ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
count="$behind $ahead"
|
|
|
|
else
|
|
|
|
count=""
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
# calculate the result
|
|
|
|
if [[ -z "$verbose" ]]; then
|
|
|
|
case "$count" in
|
|
|
|
"") # no upstream
|
|
|
|
p="" ;;
|
|
|
|
"0 0") # equal to upstream
|
|
|
|
p="=" ;;
|
|
|
|
"0 "*) # ahead of upstream
|
|
|
|
p=">" ;;
|
|
|
|
*" 0") # behind upstream
|
|
|
|
p="<" ;;
|
|
|
|
*) # diverged from upstream
|
|
|
|
p="<>" ;;
|
|
|
|
esac
|
|
|
|
else
|
|
|
|
case "$count" in
|
|
|
|
"") # no upstream
|
|
|
|
p="" ;;
|
|
|
|
"0 0") # equal to upstream
|
|
|
|
p=" u=" ;;
|
|
|
|
"0 "*) # ahead of upstream
|
|
|
|
p=" u+${count#0 }" ;;
|
|
|
|
*" 0") # behind upstream
|
|
|
|
p=" u-${count% 0}" ;;
|
|
|
|
*) # diverged from upstream
|
|
|
|
p=" u+${count#* }-${count% *}" ;;
|
|
|
|
esac
|
2013-10-10 16:40:39 +02:00
|
|
|
if [[ -n "$count" && -n "$name" ]]; then
|
|
|
|
p="$p $(git rev-parse --abbrev-ref "$upstream" 2>/dev/null)"
|
|
|
|
fi
|
2012-05-22 22:46:40 +02:00
|
|
|
fi
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2013-05-17 10:55:47 +02:00
|
|
|
# Helper function that is meant to be called from __git_ps1. It
|
2013-06-26 05:05:14 +02:00
|
|
|
# injects color codes into the appropriate gitstring variables used
|
|
|
|
# to build a gitstring.
|
2013-05-17 10:55:47 +02:00
|
|
|
__git_ps1_colorize_gitstring ()
|
|
|
|
{
|
2013-05-17 10:55:48 +02:00
|
|
|
if [[ -n ${ZSH_VERSION-} ]]; then
|
|
|
|
local c_red='%F{red}'
|
|
|
|
local c_green='%F{green}'
|
|
|
|
local c_lblue='%F{blue}'
|
|
|
|
local c_clear='%f'
|
2013-06-26 05:05:14 +02:00
|
|
|
else
|
|
|
|
# Using \[ and \] around colors is necessary to prevent
|
|
|
|
# issues with command line editing/browsing/completion!
|
|
|
|
local c_red='\[\e[31m\]'
|
|
|
|
local c_green='\[\e[32m\]'
|
|
|
|
local c_lblue='\[\e[1;34m\]'
|
|
|
|
local c_clear='\[\e[0m\]'
|
2013-05-17 10:55:48 +02:00
|
|
|
fi
|
2013-05-17 10:55:47 +02:00
|
|
|
local bad_color=$c_red
|
|
|
|
local ok_color=$c_green
|
|
|
|
local flags_color="$c_lblue"
|
|
|
|
|
2013-06-26 05:05:14 +02:00
|
|
|
local branch_color=""
|
2013-05-17 10:55:47 +02:00
|
|
|
if [ $detached = no ]; then
|
|
|
|
branch_color="$ok_color"
|
|
|
|
else
|
|
|
|
branch_color="$bad_color"
|
|
|
|
fi
|
2013-06-26 05:05:14 +02:00
|
|
|
c="$branch_color$c"
|
2013-05-17 10:55:47 +02:00
|
|
|
|
2013-06-26 05:05:16 +02:00
|
|
|
z="$c_clear$z"
|
2013-05-17 10:55:47 +02:00
|
|
|
if [ "$w" = "*" ]; then
|
2013-06-26 05:05:14 +02:00
|
|
|
w="$bad_color$w"
|
2013-05-17 10:55:47 +02:00
|
|
|
fi
|
|
|
|
if [ -n "$i" ]; then
|
2013-06-26 05:05:14 +02:00
|
|
|
i="$ok_color$i"
|
2013-05-17 10:55:47 +02:00
|
|
|
fi
|
|
|
|
if [ -n "$s" ]; then
|
2013-06-26 05:05:14 +02:00
|
|
|
s="$flags_color$s"
|
2013-05-17 10:55:47 +02:00
|
|
|
fi
|
|
|
|
if [ -n "$u" ]; then
|
2013-06-26 05:05:14 +02:00
|
|
|
u="$bad_color$u"
|
2013-05-17 10:55:47 +02:00
|
|
|
fi
|
2013-06-26 05:05:14 +02:00
|
|
|
r="$c_clear$r"
|
2013-05-17 10:55:47 +02:00
|
|
|
}
|
2012-05-22 22:46:40 +02:00
|
|
|
|
2014-04-12 01:32:25 +02:00
|
|
|
eread ()
|
|
|
|
{
|
|
|
|
f="$1"
|
|
|
|
shift
|
|
|
|
test -r "$f" && read "$@" <"$f"
|
|
|
|
}
|
|
|
|
|
2012-05-22 22:46:40 +02:00
|
|
|
# __git_ps1 accepts 0 or 1 arguments (i.e., format string)
|
2012-10-10 21:31:58 +02:00
|
|
|
# when called from PS1 using command substitution
|
|
|
|
# in this mode it prints text to add to bash PS1 prompt (includes branch name)
|
|
|
|
#
|
2012-12-26 20:15:05 +01:00
|
|
|
# __git_ps1 requires 2 or 3 arguments when called from PROMPT_COMMAND (pc)
|
2012-10-10 21:31:58 +02:00
|
|
|
# in that case it _sets_ PS1. The arguments are parts of a PS1 string.
|
2012-12-26 20:15:05 +01:00
|
|
|
# when two arguments are given, the first is prepended and the second appended
|
2012-10-10 21:31:58 +02:00
|
|
|
# to the state string when assigned to PS1.
|
2012-12-26 20:15:05 +01:00
|
|
|
# The optional third parameter will be used as printf format string to further
|
|
|
|
# customize the output of the git-status string.
|
2012-10-10 21:32:24 +02:00
|
|
|
# In this mode you can request colored hints using GIT_PS1_SHOWCOLORHINTS=true
|
2012-05-22 22:46:40 +02:00
|
|
|
__git_ps1 ()
|
|
|
|
{
|
2012-10-10 21:31:58 +02:00
|
|
|
local pcmode=no
|
2012-10-16 21:34:05 +02:00
|
|
|
local detached=no
|
2012-10-10 21:31:58 +02:00
|
|
|
local ps1pc_start='\u@\h:\w '
|
|
|
|
local ps1pc_end='\$ '
|
|
|
|
local printf_format=' (%s)'
|
|
|
|
|
|
|
|
case "$#" in
|
2012-12-26 20:15:05 +01:00
|
|
|
2|3) pcmode=yes
|
2012-10-10 21:31:58 +02:00
|
|
|
ps1pc_start="$1"
|
|
|
|
ps1pc_end="$2"
|
2012-12-26 20:15:05 +01:00
|
|
|
printf_format="${3:-$printf_format}"
|
2012-10-10 21:31:58 +02:00
|
|
|
;;
|
|
|
|
0|1) printf_format="${1:-$printf_format}"
|
|
|
|
;;
|
|
|
|
*) return
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
bash prompt: combine 'git rev-parse' for detached head
When describing a detached HEAD according to the $GIT_PS1_DESCRIBE
environment variable fails, __git_ps1() now runs the '$(git rev-parse
--short HEAD)' command substitution to get the abbreviated detached
HEAD commit object name. This imposes the overhead of fork()ing a
subshell and fork()+exec()ing a git process.
Avoid this overhead by combining this command substitution with the
"main" 'git rev-parse' execution for getting the path to the .git
directory & co. This means that we'll look for the abbreviated commit
object name even when it's not necessary, because we're on a branch or
the detached HEAD can be described. It doesn't matter, however,
because once 'git rev-parse' is up and running to fulfill all those
other queries, the additional overhead of looking for the abbreviated
commit object name is not measurable because it's lost in the noise.
There is a caveat, however, when we are on an unborn branch, because
in that case HEAD doesn't point to a valid commit, hence the query for
the abbreviated commit object name fails. Therefore, '--short HEAD'
must be the last options to 'git rev-parse' in order to get all the
other necessary information for the prompt even on an unborn branch.
Furthermore, in that case, and in that case only, 'git rev-parse'
doesn't output the last line containing the abbreviated commit object
name, obviously, so we have to take care to only parse it if 'git
rev-parse' exited without any error.
Although there are tests already excercising __git_ps1() on unborn
branches, they all do so implicitly. Add a test that checks this
explicitly.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
2013-06-24 02:16:02 +02:00
|
|
|
local repo_info rev_parse_exit_code
|
|
|
|
repo_info="$(git rev-parse --git-dir --is-inside-git-dir \
|
|
|
|
--is-bare-repository --is-inside-work-tree \
|
|
|
|
--short HEAD 2>/dev/null)"
|
|
|
|
rev_parse_exit_code="$?"
|
|
|
|
|
2013-06-17 22:58:42 +02:00
|
|
|
if [ -z "$repo_info" ]; then
|
2012-10-10 21:31:58 +02:00
|
|
|
if [ $pcmode = yes ]; then
|
|
|
|
#In PC mode PS1 always needs to be set
|
|
|
|
PS1="$ps1pc_start$ps1pc_end"
|
|
|
|
fi
|
2011-09-05 20:53:37 +02:00
|
|
|
return
|
|
|
|
fi
|
|
|
|
|
bash prompt: combine 'git rev-parse' for detached head
When describing a detached HEAD according to the $GIT_PS1_DESCRIBE
environment variable fails, __git_ps1() now runs the '$(git rev-parse
--short HEAD)' command substitution to get the abbreviated detached
HEAD commit object name. This imposes the overhead of fork()ing a
subshell and fork()+exec()ing a git process.
Avoid this overhead by combining this command substitution with the
"main" 'git rev-parse' execution for getting the path to the .git
directory & co. This means that we'll look for the abbreviated commit
object name even when it's not necessary, because we're on a branch or
the detached HEAD can be described. It doesn't matter, however,
because once 'git rev-parse' is up and running to fulfill all those
other queries, the additional overhead of looking for the abbreviated
commit object name is not measurable because it's lost in the noise.
There is a caveat, however, when we are on an unborn branch, because
in that case HEAD doesn't point to a valid commit, hence the query for
the abbreviated commit object name fails. Therefore, '--short HEAD'
must be the last options to 'git rev-parse' in order to get all the
other necessary information for the prompt even on an unborn branch.
Furthermore, in that case, and in that case only, 'git rev-parse'
doesn't output the last line containing the abbreviated commit object
name, obviously, so we have to take care to only parse it if 'git
rev-parse' exited without any error.
Although there are tests already excercising __git_ps1() on unborn
branches, they all do so implicitly. Add a test that checks this
explicitly.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
2013-06-24 02:16:02 +02:00
|
|
|
local short_sha
|
|
|
|
if [ "$rev_parse_exit_code" = "0" ]; then
|
|
|
|
short_sha="${repo_info##*$'\n'}"
|
|
|
|
repo_info="${repo_info%$'\n'*}"
|
|
|
|
fi
|
2013-06-17 22:58:42 +02:00
|
|
|
local inside_worktree="${repo_info##*$'\n'}"
|
|
|
|
repo_info="${repo_info%$'\n'*}"
|
|
|
|
local bare_repo="${repo_info##*$'\n'}"
|
|
|
|
repo_info="${repo_info%$'\n'*}"
|
|
|
|
local inside_gitdir="${repo_info##*$'\n'}"
|
|
|
|
local g="${repo_info%$'\n'*}"
|
|
|
|
|
2011-09-05 20:53:37 +02:00
|
|
|
local r=""
|
|
|
|
local b=""
|
|
|
|
local step=""
|
|
|
|
local total=""
|
|
|
|
if [ -d "$g/rebase-merge" ]; then
|
2014-04-12 01:32:25 +02:00
|
|
|
eread "$g/rebase-merge/head-name" b
|
|
|
|
eread "$g/rebase-merge/msgnum" step
|
|
|
|
eread "$g/rebase-merge/end" total
|
2011-09-05 20:53:37 +02:00
|
|
|
if [ -f "$g/rebase-merge/interactive" ]; then
|
|
|
|
r="|REBASE-i"
|
|
|
|
else
|
|
|
|
r="|REBASE-m"
|
|
|
|
fi
|
2012-10-10 21:31:58 +02:00
|
|
|
else
|
2011-09-05 20:53:37 +02:00
|
|
|
if [ -d "$g/rebase-apply" ]; then
|
2014-04-12 01:32:25 +02:00
|
|
|
eread "$g/rebase-apply/next" step
|
|
|
|
eread "$g/rebase-apply/last" total
|
2011-09-05 20:53:37 +02:00
|
|
|
if [ -f "$g/rebase-apply/rebasing" ]; then
|
2014-04-12 01:32:25 +02:00
|
|
|
eread "$g/rebase-apply/head-name" b
|
2011-09-05 20:53:37 +02:00
|
|
|
r="|REBASE"
|
|
|
|
elif [ -f "$g/rebase-apply/applying" ]; then
|
|
|
|
r="|AM"
|
2013-04-25 11:28:54 +02:00
|
|
|
else
|
2011-09-05 20:53:37 +02:00
|
|
|
r="|AM/REBASE"
|
2012-05-22 22:46:40 +02:00
|
|
|
fi
|
2011-09-05 20:53:37 +02:00
|
|
|
elif [ -f "$g/MERGE_HEAD" ]; then
|
|
|
|
r="|MERGING"
|
|
|
|
elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
|
|
|
|
r="|CHERRY-PICKING"
|
|
|
|
elif [ -f "$g/REVERT_HEAD" ]; then
|
|
|
|
r="|REVERTING"
|
|
|
|
elif [ -f "$g/BISECT_LOG" ]; then
|
|
|
|
r="|BISECTING"
|
|
|
|
fi
|
2012-05-22 22:46:40 +02:00
|
|
|
|
2011-03-31 23:41:18 +02:00
|
|
|
if [ -n "$b" ]; then
|
|
|
|
:
|
|
|
|
elif [ -h "$g/HEAD" ]; then
|
|
|
|
# symlink symbolic ref
|
|
|
|
b="$(git symbolic-ref HEAD 2>/dev/null)"
|
|
|
|
else
|
|
|
|
local head=""
|
2014-04-12 01:32:25 +02:00
|
|
|
if ! eread "$g/HEAD" head; then
|
2011-03-31 23:41:18 +02:00
|
|
|
if [ $pcmode = yes ]; then
|
|
|
|
PS1="$ps1pc_start$ps1pc_end"
|
|
|
|
fi
|
|
|
|
return
|
|
|
|
fi
|
|
|
|
# is it a symbolic ref?
|
|
|
|
b="${head#ref: }"
|
|
|
|
if [ "$head" = "$b" ]; then
|
|
|
|
detached=yes
|
|
|
|
b="$(
|
|
|
|
case "${GIT_PS1_DESCRIBE_STYLE-}" in
|
|
|
|
(contains)
|
|
|
|
git describe --contains HEAD ;;
|
|
|
|
(branch)
|
|
|
|
git describe --contains --all HEAD ;;
|
|
|
|
(describe)
|
|
|
|
git describe HEAD ;;
|
|
|
|
(* | default)
|
|
|
|
git describe --tags --exact-match HEAD ;;
|
|
|
|
esac 2>/dev/null)" ||
|
2012-05-22 22:46:40 +02:00
|
|
|
|
bash prompt: combine 'git rev-parse' for detached head
When describing a detached HEAD according to the $GIT_PS1_DESCRIBE
environment variable fails, __git_ps1() now runs the '$(git rev-parse
--short HEAD)' command substitution to get the abbreviated detached
HEAD commit object name. This imposes the overhead of fork()ing a
subshell and fork()+exec()ing a git process.
Avoid this overhead by combining this command substitution with the
"main" 'git rev-parse' execution for getting the path to the .git
directory & co. This means that we'll look for the abbreviated commit
object name even when it's not necessary, because we're on a branch or
the detached HEAD can be described. It doesn't matter, however,
because once 'git rev-parse' is up and running to fulfill all those
other queries, the additional overhead of looking for the abbreviated
commit object name is not measurable because it's lost in the noise.
There is a caveat, however, when we are on an unborn branch, because
in that case HEAD doesn't point to a valid commit, hence the query for
the abbreviated commit object name fails. Therefore, '--short HEAD'
must be the last options to 'git rev-parse' in order to get all the
other necessary information for the prompt even on an unborn branch.
Furthermore, in that case, and in that case only, 'git rev-parse'
doesn't output the last line containing the abbreviated commit object
name, obviously, so we have to take care to only parse it if 'git
rev-parse' exited without any error.
Although there are tests already excercising __git_ps1() on unborn
branches, they all do so implicitly. Add a test that checks this
explicitly.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
2013-06-24 02:16:02 +02:00
|
|
|
b="$short_sha..."
|
2011-03-31 23:41:18 +02:00
|
|
|
b="($b)"
|
|
|
|
fi
|
|
|
|
fi
|
2011-09-05 20:53:37 +02:00
|
|
|
fi
|
2012-05-22 22:46:40 +02:00
|
|
|
|
2011-09-05 20:53:37 +02:00
|
|
|
if [ -n "$step" ] && [ -n "$total" ]; then
|
|
|
|
r="$r $step/$total"
|
|
|
|
fi
|
2013-04-25 11:28:54 +02:00
|
|
|
|
2011-09-05 20:53:37 +02:00
|
|
|
local w=""
|
|
|
|
local i=""
|
|
|
|
local s=""
|
|
|
|
local u=""
|
|
|
|
local c=""
|
|
|
|
local p=""
|
2012-05-22 22:46:40 +02:00
|
|
|
|
2013-06-17 22:58:42 +02:00
|
|
|
if [ "true" = "$inside_gitdir" ]; then
|
|
|
|
if [ "true" = "$bare_repo" ]; then
|
2011-09-05 20:53:37 +02:00
|
|
|
c="BARE:"
|
|
|
|
else
|
|
|
|
b="GIT_DIR!"
|
|
|
|
fi
|
2013-06-17 22:58:42 +02:00
|
|
|
elif [ "true" = "$inside_worktree" ]; then
|
2011-09-05 20:53:37 +02:00
|
|
|
if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] &&
|
|
|
|
[ "$(git config --bool bash.showDirtyState)" != "false" ]
|
|
|
|
then
|
|
|
|
git diff --no-ext-diff --quiet --exit-code || w="*"
|
2013-06-24 12:49:19 +02:00
|
|
|
if [ -n "$short_sha" ]; then
|
2011-09-05 20:53:37 +02:00
|
|
|
git diff-index --cached --quiet HEAD -- || i="+"
|
2012-05-22 22:46:40 +02:00
|
|
|
else
|
2011-09-05 20:53:37 +02:00
|
|
|
i="#"
|
2012-05-22 22:46:40 +02:00
|
|
|
fi
|
2011-09-05 20:53:37 +02:00
|
|
|
fi
|
2011-04-01 17:47:37 +02:00
|
|
|
if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ] &&
|
|
|
|
[ -r "$g/refs/stash" ]; then
|
|
|
|
s="$"
|
2011-09-05 20:53:37 +02:00
|
|
|
fi
|
2012-05-22 22:46:40 +02:00
|
|
|
|
2011-09-05 20:53:37 +02:00
|
|
|
if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] &&
|
|
|
|
[ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
|
2011-08-12 14:17:12 +02:00
|
|
|
git ls-files --others --exclude-standard --error-unmatch -- '*' >/dev/null 2>/dev/null
|
2011-09-05 20:53:37 +02:00
|
|
|
then
|
|
|
|
u="%${ZSH_VERSION+%}"
|
|
|
|
fi
|
2012-05-22 22:46:40 +02:00
|
|
|
|
2011-09-05 20:53:37 +02:00
|
|
|
if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
|
|
|
|
__git_ps1_show_upstream
|
2012-05-22 22:46:40 +02:00
|
|
|
fi
|
2011-09-05 20:53:37 +02:00
|
|
|
fi
|
2012-05-22 22:46:40 +02:00
|
|
|
|
2011-09-05 20:53:37 +02:00
|
|
|
local z="${GIT_PS1_STATESEPARATOR-" "}"
|
2013-06-26 05:05:14 +02:00
|
|
|
|
2013-07-01 21:41:55 +02:00
|
|
|
# NO color option unless in PROMPT_COMMAND mode
|
|
|
|
if [ $pcmode = yes ] && [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
|
|
|
|
__git_ps1_colorize_gitstring
|
|
|
|
fi
|
2013-06-26 05:05:14 +02:00
|
|
|
|
2011-09-05 20:53:37 +02:00
|
|
|
local f="$w$i$s$u"
|
2013-07-01 21:41:55 +02:00
|
|
|
local gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p"
|
2013-06-26 05:05:14 +02:00
|
|
|
|
2011-09-05 20:53:37 +02:00
|
|
|
if [ $pcmode = yes ]; then
|
2013-08-22 03:39:03 +02:00
|
|
|
if [ "${__git_printf_supports_v-}" != yes ]; then
|
2013-06-17 21:42:55 +02:00
|
|
|
gitstring=$(printf -- "$printf_format" "$gitstring")
|
|
|
|
else
|
|
|
|
printf -v gitstring -- "$printf_format" "$gitstring"
|
|
|
|
fi
|
2011-09-05 20:53:37 +02:00
|
|
|
PS1="$ps1pc_start$gitstring$ps1pc_end"
|
|
|
|
else
|
2013-07-01 21:41:55 +02:00
|
|
|
printf -- "$printf_format" "$gitstring"
|
2012-05-22 22:46:40 +02:00
|
|
|
fi
|
|
|
|
}
|