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

51313: fix "git rerere forget" completion

Browse source
This commit is contained in:
Bart Schaefer 2023-01-21 19:21:30 -08:00
parent f93ad02b94
commit 37569049f0
2 changed files with 5 additions and 3 deletions
ChangeLog
Completion/Unix/Command
_git

2
ChangeLog
View file

@ -1,5 +1,7 @@
2023-01-21 Bart Schaefer <schaefer@zsh.org>
* 51313: Completion/Unix/Command/_git: fix "git rerere forget"
* 51310: Src/Zle/zle_main.c: zle -F handlers preserve LASTWIDGET
2023-01-16 Peter Stephenson <p.stephenson@samsung.com>

6
Completion/Unix/Command/_git
View file

@ -4259,14 +4259,14 @@ _git-rerere () {
_arguments -C -S -s $endopt \
'--rerere-autoupdate[register clean resolutions in index]' \
': :->command' && ret=0
': :->command' \
'*: :{ [[ $words[CURRENT-1] = forget ]] && __git_cached_files }' && ret=0
case $state in
(command)
# TODO: This isn't optimal, as forget get confused.
_values command \
'clear[reset metadata used by rerere]' \
'forget[resets metadata used by rerere for specific conflict]: :__git_cached_files' \
'forget[resets metadata used by rerere for specific conflict]' \
'diff[output diffs for the current state of the resolution]' \
'status[print paths with conflicts whose merge resolution rerere will record]' \
'remaining[print paths with conflicts that have not been autoresolved by rerere]' \