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

unposted: vcs_info git: Fix typo in manual.

Browse source
This commit is contained in:
Daniel Shahaf 2017-02-04 05:42:31 +00:00
parent 33c0a10448
commit bb6c08b51a
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2017-02-04 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted: Doc/Zsh/contrib.yo,
Functions/VCS_Info/Backends/VCS_INFO_get_data_git: vcs_info git:
Fix typo in manual.
2017-02-03 Daniel Shahaf <d.s@daniel.shahaf.name> 2017-02-03 Daniel Shahaf <d.s@daniel.shahaf.name>
* 40480: Functions/VCS_Info/Backends/VCS_INFO_get_data_git, * 40480: Functions/VCS_Info/Backends/VCS_INFO_get_data_git,

4
Doc/Zsh/contrib.yo
View file

@ -1279,8 +1279,8 @@ A "misc" replacement. It is at the discretion of the backend to
decide what this replacement expands to. decide what this replacement expands to.
The tt(hg) and tt(git) backends use this expando to display patch information. The tt(hg) and tt(git) backends use this expando to display patch information.
tt(hg) sources patch information from the tt(mq) extensions; tt(git) from the tt(hg) sources patch information from the tt(mq) extensions; tt(git) from in-progress
tt(rebase) command and from the and tt(stgit) extension. The tt(patch-format) tt(rebase) and tt(cherry-pick) operations and from the tt(stgit) extension. The tt(patch-format)
and tt(nopatch-format) styles control the generated string. The former is used and tt(nopatch-format) styles control the generated string. The former is used
when at least one patch from the patch queue has been applied, and the latter when at least one patch from the patch queue has been applied, and the latter
otherwise. otherwise.

1
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -179,6 +179,7 @@ local patchdir=${gitdir}/patches/${gitbranch}
if [[ -d $patchdir ]] && [[ -f $patchdir/applied ]] \ if [[ -d $patchdir ]] && [[ -f $patchdir/applied ]] \
&& [[ -f $patchdir/unapplied ]] && [[ -f $patchdir/unapplied ]]
then then
# stgit
git_patches_applied=(${(f)"$(< "${patchdir}/applied")"}) git_patches_applied=(${(f)"$(< "${patchdir}/applied")"})
git_patches_unapplied=(${(f)"$(< "${patchdir}/unapplied")"}) git_patches_unapplied=(${(f)"$(< "${patchdir}/unapplied")"})
VCS_INFO_git_handle_patches VCS_INFO_git_handle_patches