mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-04 10:41:11 +02:00
Code Releases Activity

33147: vcs_info git: detect revert or cherry-pick with multiple commits

Browse source 
When revert or cherry-pick involve many commits the .git/sequencer
directory holds context for the action and no CHERRY_PICK_HEAD exist.
This commit is contained in:
Marc Finet 2014-09-12 23:30:37 +02:00 committed by Frank Terbeck
parent ffd439b69b
commit 5e40996891
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -5,6 +5,9 @@
* 33151: Completion/Unix/Command/_git: completion git: support
aliases when \n exist
* 33147: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: detect revert or cherry-pick with multiple commits
2014-09-12 Barton E. Schaefer <schaefer@zsh.org>
* 33143: Src/init.c: POSIX_ARGZERO more closely matches bash et al.

5
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -62,6 +62,11 @@ VCS_INFO_git_getaction () {
return 0
fi
if [[ -d "${gitdir}/sequencer" ]] ; then
gitaction="cherry-or-revert"
return 0
fi
return 1
}