From: Jay Soffian <jaysoffian@gmail.com>
Date: Sun, 20 Feb 2011 04:12:28 +0000 (-0500)
Subject: bash: teach __git_ps1 about CHERRY_PICK_HEAD
X-Git-Tag: v1.7.5-rc0~88^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5b2af8cac9883ab7e666d4aa30ea7fd3d1f1d4de;p=git.git

bash: teach __git_ps1 about CHERRY_PICK_HEAD

Make the git prompt (when enabled) show a CHERRY-PICKING indicator
when we are in the middle of a conflicted cherry-pick, analogous
to the existing MERGING and BISECTING flags.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 893b7716c..0b0b913d2 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -246,6 +246,8 @@ __git_ps1 ()
 				fi
 			elif [ -f "$g/MERGE_HEAD" ]; then
 				r="|MERGING"
+			elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
+				r="|CHERRY-PICKING"
 			elif [ -f "$g/BISECT_LOG" ]; then
 				r="|BISECTING"
 			fi