From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH] vcs_info git: Fix current patch's name in several cases.
Date: Sat, 28 Mar 2020 03:40:52 +0000 [thread overview]
Message-ID: <20200328034052.21353-1-danielsh@tarpaulin.shahaf.local2> (raw)
---
Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 2b2040c94..79429c8e0 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -292,9 +292,24 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then
# Set $subject to the info for the current patch
if [[ -f "${patchdir}/msg-clean" ]]; then
subject="${$(< "${patchdir}/msg-clean")[(f)1]}"
+ elif [[ -f "${patchdir}/final-commit" ]]; then
+ # This value is not rfc2047-encoded. It's also available via
+ # "${patchdir}/info".
+ subject="${$(< "${patchdir}/final-commit")[(f)1]}"
elif printf -v this_patch_file "%s/%04d" "${patchdir}" "${cur}"
[[ -f $this_patch_file ]]
then
+ # This branch is last for several reasons:
+ #
+ # - The "Subject" header will be MIME-encoded (rfc2047).
+ #
+ # - If the mail has full rfc822 headers (including "Received" and
+ # so on), we won't find the "Subject:" header, since
+ # VCS_INFO_patch2subject only checks the first few lines.
+ #
+ # - In --scissors mode, we may find the outer "Subject:" header,
+ # whereas the inner one (after the scissors line) will be used,
+ # if present.
() {
local REPLY
VCS_INFO_patch2subject "${this_patch_file}"
reply other threads:[~2020-03-28 3:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20200328034052.21353-1-danielsh@tarpaulin.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--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).