From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11136 invoked by alias); 14 Oct 2015 12:36:32 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 36855 Received: (qmail 27004 invoked from network); 14 Oct 2015 12:36:29 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Date: Wed, 14 Oct 2015 14:26:12 +0200 From: Roman Neuhauser To: Frank Terbeck Cc: zsh-workers@zsh.org Subject: Re: [PATCH] vcs_info: Silence an error message with new git versions Message-ID: <20151014122612.GR3670@isis.sigpipe.cz> References: <1444557246-1233-1-git-send-email-ft@bewatermyfriend.org> <87si5hr9by.fsf@ft.bewatermyfriend.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87si5hr9by.fsf@ft.bewatermyfriend.org> User-Agent: Mutt/1.5.23 (2014-03-12) # ft@bewatermyfriend.org / 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