Re: [PATCH] Show the presence of untracked files in the bash prompt.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Daniel Trstenjak <trsten@xxxxxxxxxxxxxxxxxxxx> wrote:
> 
> Added the envvar GIT_PS1_SHOWUNTRACKEDFILES to 'git-completion.bash'.
> When set to a nonempty value, then the char '%' will be shown next
> to the branch name in the bash prompt.
> 
> Signed-off-by: Daniel Trstenjak <daniel.trstenjak@xxxxxxxxxxxxxxxxxxxx>

Acked-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>


> ---
>  contrib/completion/git-completion.bash |   15 +++++++++++++--
>  1 files changed, 13 insertions(+), 2 deletions(-)
> 
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 887731e..745b5fb 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -44,6 +44,10 @@
>  #       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 files, then a '%' will be shown next to the branch name.
> +#
>  # To submit patches:
>  #
>  #    *) Read Documentation/SubmittingPatches
> @@ -132,6 +136,7 @@ __git_ps1 ()
>  		local w
>  		local i
>  		local s
> +		local u
>  		local c
>  
>  		if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
> @@ -156,12 +161,18 @@ __git_ps1 ()
>  			if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
>  			        git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
>  			fi
> +
> +			if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
> +			   if [ -n "$(git ls-files --others --exclude-standard)" ]; then
> +			      u="%"
> +			   fi
> +			fi
>  		fi
>  
>  		if [ -n "${1-}" ]; then
> -			printf "$1" "$c${b##refs/heads/}$w$i$s$r"
> +			printf "$1" "$c${b##refs/heads/}$w$i$s$u$r"
>  		else
> -			printf " (%s)" "$c${b##refs/heads/}$w$i$s$r"
> +			printf " (%s)" "$c${b##refs/heads/}$w$i$s$u$r"
>  		fi
>  	fi
>  }
> -- 
> 1.6.2
> 
> 
> -- 
>                                                                                                                                            
>  Daniel Trstenjak         Tel   : +49 (0)7071-9457-264
>  science + computing ag   FAX   : +49 (0)7071-9457-511
>  Hagellocher Weg 73       mailto: Daniel.Trstenjak@xxxxxxxxxxxxxxxxxxxx
>  D-72070 T?bingen         WWW   : http://www.science-computing.de/                                                                      
> -- 
> Vorstand/Board of Management:
> Dr. Bernd Finkbeiner, Dr. Roland Niemeier, 
> Dr. Arno Steitz, Dr. Ingrid Zech
> Vorsitzender des Aufsichtsrats/
> Chairman of the Supervisory Board:
> Michel Lepert
> Sitz/Registered Office: Tuebingen
> Registergericht/Registration Court: Stuttgart
> Registernummer/Commercial Register No.: HRB 382196 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Shawn.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]