zsh-workers
 help / color / mirror / code / Atom feed
From: Roman Neuhauser <neuhauser@sigpipe.cz>
To: Frank Terbeck <ft@bewatermyfriend.org>
Cc: zsh-workers@zsh.org
Subject: Re: [PATCH] vcs_info: Silence an error message with new git versions
Date: Wed, 14 Oct 2015 14:26:12 +0200	[thread overview]
Message-ID: <20151014122612.GR3670@isis.sigpipe.cz> (raw)
In-Reply-To: <87si5hr9by.fsf@ft.bewatermyfriend.org>

# 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


      reply	other threads:[~2015-10-14 12:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-11  9:54 Frank Terbeck
2015-10-11 10:25 ` Frank Terbeck
2015-10-14 12:26   ` Roman Neuhauser [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151014122612.GR3670@isis.sigpipe.cz \
    --to=neuhauser@sigpipe.cz \
    --cc=ft@bewatermyfriend.org \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).