mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

40074: vcs_info git: rfc822-unfold rebase-apply patch subjects when msg-clean is unavailable.

Browse source 
Example (in this repository):

    git -c merge.merge-changelog.driver=/bin/false rebase --onto=1955cce^^  1955cce^ 1955cce
This commit is contained in:
Daniel Shahaf 2016-12-03 10:34:46 +00:00
parent af2ab02472
commit d9237ccdbf
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2016-12-04 Daniel Shahaf <d.s@daniel.shahaf.name>
* 40074: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: rfc822-unfold rebase-apply patch subjects when
msg-clean is unavailable.
2016-12-04 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 40088: Test/D04parameter.ztst: attempt to make output from

15
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -237,14 +237,11 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then
if [[ -f "${patchdir}/msg-clean" ]]; then
subject="${$(< "${patchdir}/msg-clean")[(f)1]}"
elif [[ -f "${patchdir}/${(l:4::0:)cur}" ]]; then
local maxlines=10 line
while IFS= read -r line; do
if [[ "$line" == "Subject:"* ]]; then
subject=${line/(#s)Subject: /}
break
fi
(( --maxlines )) || break
done < "${patchdir}/${(l:4::0:)cur}"
() {
local REPLY
VCS_INFO_patch2subject "${patchdir}/${(l:4::0:)cur}"
subject=$REPLY
}
fi
if [[ -f "${patchdir}/original-commit" ]]; then
if [[ -n $subject ]]; then
@ -270,6 +267,7 @@ elif [[ -f "${gitdir}/MERGE_HEAD" ]]; then
# This is 'git merge --no-commit'
local -a heads=( ${(@f)"$(<"${gitdir}/MERGE_HEAD")"} )
local subject;
# TODO: maybe read up to the first blank line
IFS='' read -r subject < "${gitdir}/MERGE_MSG"
# $subject is the subject line of the would-be commit
# Maybe we can get the subject lines of MERGE_HEAD's commits cheaply?
@ -295,6 +293,7 @@ elif [[ -f "${gitdir}/CHERRY_PICK_HEAD" ]]; then
# ### be "1". The %u/%c tuple will assume the values [(1,2), (1,1), (1,0)],
# ### whereas the correct sequence would be [(1,2), (2,1), (3,0)].
local subject
# TODO: maybe read up to the first blank line
IFS='' read -r subject < "${gitdir}/MERGE_MSG"
git_patches_applied=( "$(<${gitdir}/CHERRY_PICK_HEAD) ${subject}" )
if [[ -f "${gitdir}/sequencer/todo" ]]; then