diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-10-23 13:21:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-23 13:21:45 -0700 |
| commit | 807c895fcbf004d7a8f2bfd9aae5ea3b4f0c760b (patch) | |
| tree | a5dc9fe5f5fe73b37c4bb583ee63c453f1f8a26f | |
| parent | Merge branch 'hu/cherry-pick-previous-branch' (diff) | |
| parent | git-prompt.sh: optionally show upstream branch name (diff) | |
| download | tgif-807c895fcbf004d7a8f2bfd9aae5ea3b4f0c760b.tar.xz | |
Merge branch 'jc/prompt-upstream'
An enhancement to the GIT_PS1_SHOWUPSTREAM facility.
* jc/prompt-upstream:
git-prompt.sh: optionally show upstream branch name
| -rw-r--r-- | contrib/completion/git-prompt.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index d6c61b2bde..202e2e520f 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -60,6 +60,7 @@ # of values: # # verbose show number of commits ahead/behind (+/-) upstream +# name if verbose, then also show the upstream abbrev name # legacy don't use the '--count' option available in recent # versions of git-rev-list # git always compare HEAD to @{upstream} @@ -94,7 +95,7 @@ __git_ps1_show_upstream () { local key value local svn_remote svn_url_pattern count n - local upstream=git legacy="" verbose="" + local upstream=git legacy="" verbose="" name="" svn_remote=() # get some config options from git-config @@ -122,6 +123,7 @@ __git_ps1_show_upstream () git|svn) upstream="$option" ;; verbose) verbose=1 ;; legacy) legacy=1 ;; + name) name=1 ;; esac done @@ -204,6 +206,9 @@ __git_ps1_show_upstream () *) # diverged from upstream p=" u+${count#* }-${count% *}" ;; esac + if [[ -n "$count" && -n "$name" ]]; then + p="$p $(git rev-parse --abbrev-ref "$upstream" 2>/dev/null)" + fi fi } |