Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: [PATCH] vcs_info: Silence an error message with new git versions
# ft@xxxxxxxxxxxxxxxxxxx / 2015-10-11 12:25:05 +0200:
> diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
> index 8ecc7c7..dcff616 100644
> --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
> +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
> @@ -224,11 +224,21 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then
> for p in $(seq $(($cur - 1))); do
> git_patches_applied+=("$(printf "%04d" $p) ?")
> done
> + if [[ -f "${patchdir}/msg-clean" ]]; then
> subject="${$(< "${patchdir}/msg-clean")[(f)1]}"
> + fi
> if [[ -f "${patchdir}/original-commit" ]]; then
> + if [[ -n $subject ]]; then
> git_patches_applied+=("$(< ${patchdir}/original-commit) $subject")
> else
> + git_patches_applied+=("$(< ${patchdir}/original-commit)")
> + fi
> + else
> + if [[ -n $subject ]]; then
> git_patches_applied+=("? $subject")
> + else
> + git_patches_applied+=("?")
> + fi
> fi
> git_patches_unapplied=($(seq $cur $(< "${patchdir}/last")))
> fi
declare originalcommit='?'
if [[ -f "${patchdir}/original-commit" ]]; then
originalcommit="$(< ${patchdir}/original-commit)"
fi
git_patches_applied+=("$originalcommit${subject+ $subject}")
--
roman
Messages sorted by:
Reverse Date,
Date,
Thread,
Author