mirror of
git://git.code.sf.net/p/zsh/code
synced 2024-05-26 09:56:05 +02:00
45644: vcs_info git: Fix current patch's name in several cases.
This commit is contained in:
parent
5e55e3eaf8
commit
2f2aa360bc
|
@ -1,5 +1,8 @@
|
||||||
2020-03-28 Daniel Shahaf <d.s@daniel.shahaf.name>
|
2020-03-28 Daniel Shahaf <d.s@daniel.shahaf.name>
|
||||||
|
|
||||||
|
* 45644: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
|
||||||
|
vcs_info git: Fix current patch's name in several cases.
|
||||||
|
|
||||||
* unposted: Test/V07pcre.ztst: Fix syntax error introduced
|
* unposted: Test/V07pcre.ztst: Fix syntax error introduced
|
||||||
in 45591.
|
in 45591.
|
||||||
|
|
||||||
|
|
|
@ -292,9 +292,24 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then
|
||||||
# Set $subject to the info for the current patch
|
# Set $subject to the info for the current patch
|
||||||
if [[ -f "${patchdir}/msg-clean" ]]; then
|
if [[ -f "${patchdir}/msg-clean" ]]; then
|
||||||
subject="${$(< "${patchdir}/msg-clean")[(f)1]}"
|
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}"
|
elif printf -v this_patch_file "%s/%04d" "${patchdir}" "${cur}"
|
||||||
[[ -f $this_patch_file ]]
|
[[ -f $this_patch_file ]]
|
||||||
then
|
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
|
local REPLY
|
||||||
VCS_INFO_patch2subject "${this_patch_file}"
|
VCS_INFO_patch2subject "${this_patch_file}"
|
||||||
|
|
Loading…
Reference in New Issue