Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: [PATCH] [RFC] Get subject of current patch in rebase-apply mode
- X-seq: zsh-workers 40006
- From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
- To: Daniel Hahler <genml+zsh-workers@xxxxxxxxxx>
- Subject: Re: [PATCH] [RFC] Get subject of current patch in rebase-apply mode
- Date: Tue, 22 Nov 2016 04:13:48 +0000
- Cc: zsh-workers@xxxxxxx
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= mesmtp; bh=mMTp8iQInK2OQphG+5hZptbtNWw=; b=d6vcb/Ww2Adv21ZG52CI2 GeiV5yTAc8qznPi0nMdebwAJvdUVyit5/zZf3VhGaokYS2GAloHAvoE/MmUo4ofU 3YpQnsgtWZ9Z698BMQ7F1EEd0u4eNzWhu2E3c0Nphdzqxuko1Clc/LaBTbdeqFVP OawXsc/BeFNFiGsgGyVR08=
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= smtpout; bh=mMTp8iQInK2OQphG+5hZptbtNWw=; b=oa1DXEryVlDfnLdyRAbs Xi4ltR/ygErJ3JCLwSEijejJg1FMdMLjj995A2Ik5VHOwGcmDLU/3McuJvTbGtVU NzmMLJr9W0feDzC/FuNroS9+gWDUboAHhjW3FUggMu0hgYMjc06Zg4WicykQqX3B 5taHVQ3TL/GEc+jAdwSQ4hM=
- In-reply-to: <20161120013325.12113-2-genml+zsh-workers@thequod.de>
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
- References: <20161120013325.12113-1-genml+zsh-workers@thequod.de> <20161120013325.12113-2-genml+zsh-workers@thequod.de>
Daniel Hahler wrote on Sun, Nov 20, 2016 at 02:33:25 +0100:
> From: Daniel Hahler <git@xxxxxxxxxx>
>
> ---
> Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
> index 18ba89a..93172fc 100644
> --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
> +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
> @@ -236,6 +236,15 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then
> done
> if [[ -f "${patchdir}/msg-clean" ]]; then
> subject="${$(< "${patchdir}/msg-clean")[(f)1]}"
I use an older version of git that still creates msg-clean files (see
36830), so I rm'd the msg-clean file by hand to test your patch.
> + else
> + local maxlines=10
> + while IFS='\n' read -r; do
Change '\n' to $'\n'. (But read the last paragraph first.)
> + if [[ "$REPLY" == "Subject:"* ]]; then
> + subject=${REPLY/(#s)Subject: /}
> + break
> + fi
> + (( --maxlines )) || break
> + done < "${patchdir}/$(printf "%04d" $cur)"
I'm not an expert on git internal data structures, but I see two failure
modes to this patch: the file "$patchdir/${(l:4::0:)cur}" might not
exist, or might correspond to a different commit than $cur. The former
case could be addressed by adding a [[ -f ]] existence check, as
elsewhere in the file. The latter would cause information for a wrong
commit to be printed instead of a commit hash. That would be a bug, but
it seems unlikely enough.
So I would suggest two code changes: use «${(l:4::0:)cur}» or the new
'printf -v' instead of a command substitution to save a fork on Cygwin,
and consider adding a [[ -f ]] check to prevent error messages.
One last thing I'd suggest is to consider using VCS_INFO_quilt-patch2subject,
since it implements rfc822 unfolding of long subject lines.
Cheers,
Daniel
> fi
> if [[ -f "${patchdir}/original-commit" ]]; then
> if [[ -n $subject ]]; then
> --
> 2.10.2
>
>
Messages sorted by:
Reverse Date,
Date,
Thread,
Author