From: Johannes Sixt <j6t@kdbg.org>
Date: Wed, 08 Jul 2015 17:46:48 GMT
Subject: Re: [PATCH v7 2/8] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs
Message-ID: <559D6208.8090607@kdbg.org>
In-Reply-To: <1436316963-25520-2-git-send-email-dturner@twopensource.com>

Am 08.07.2015 um 02:55 schrieb David Turner:
> Instead of directly writing to and reading from files in
> $GIT_DIR, use ref API to interact with CHERRY_PICK_HEAD
> and REVERT_HEAD.
>
> Signed-off-by: David Turner <dturner@twopensource.com>
> ---
...
> diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
> index 366f0bc..e2c5583 100644
> --- a/contrib/completion/git-prompt.sh
> +++ b/contrib/completion/git-prompt.sh
> @@ -415,9 +415,9 @@ __git_ps1 ()
>   			fi
>   		elif [ -f "$g/MERGE_HEAD" ]; then
>   			r="|MERGING"
> -		elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
> +		elif git rev-parse --quiet --verify "CHERRY_PICK_HEAD" >/dev/null; then
>   			r="|CHERRY-PICKING"
> -		elif [ -f "$g/REVERT_HEAD" ]; then
> +		elif git rev-parse --quiet --verify "REVERT_HEAD" >/dev/null; then
>   			r="|REVERTING"
>   		elif [ -f "$g/BISECT_LOG" ]; then
>   			r="|BISECTING"

We are trying very hard not to spawn any new processes in __git_ps1(). 
So, I raise a moderate veto against this hunk.

-- Hannes