mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zk/prompt-rebase-step'

Browse Source 
* zk/prompt-rebase-step:
  bash-prompt.sh: show where rebase is at when stopped
This commit is contained in:
Junio C Hamano
2013-05-01 15:23:56 -07:00
parent 7e6a0cc47d b71dc3e1a0
commit b9347eb224
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
contrib/completion/git-prompt.sh
View File

@ -263,14 +263,21 @@ __git_ps1 ()
else
local r=""
local b=""
if [ -f "$g/rebase-merge/interactive" ]; then
r="|REBASE-i"
b="$(cat "$g/rebase-merge/head-name")"
elif [ -d "$g/rebase-merge" ]; then
r="|REBASE-m"
local step=""
local total=""
if [ -d "$g/rebase-merge" ]; then
b="$(cat "$g/rebase-merge/head-name")"
step=$(cat "$g/rebase-merge/msgnum")
total=$(cat "$g/rebase-merge/end")
if [ -f "$g/rebase-merge/interactive" ]; then
r="|REBASE-i"
else
r="|REBASE-m"
fi
else
if [ -d "$g/rebase-apply" ]; then
step=$(cat "$g/rebase-apply/next")
total=$(cat "$g/rebase-apply/last")
if [ -f "$g/rebase-apply/rebasing" ]; then
r="|REBASE"
elif [ -f "$g/rebase-apply/applying" ]; then
@ -308,6 +315,10 @@ __git_ps1 ()
}
fi
if [ -n "$step" ] && [ -n "$total" ]; then
r="$r $step/$total"
fi
local w=""
local i=""
local s=""