626b30b2a3d99a03058fea167281163d8d96d6f9

Message

Update git-flow-avh to 0.6.0 (#6498)

This updates the git-flow-avh plugin to the latest version
from https://github.com/petervanderdoes/git-flow-completion
(0.6.0 at the time of this commit).

This mainly adds support for the "git flow bugfix" command.

This PR replaces #4626 as well as #4705, both of which adds support for the bugfix command but doesn't use the official version from https://github.com/petervanderdoes/git-flow-completion

Fixes #4705
Fixes #4626
Fixes #5903

Diff

This diff is truncated to protect this page.

  1diff --git a/plugins/git-flow-avh/git-flow-avh.plugin.zsh b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
  2old mode 100644
  3new mode 100755
  4index ba98fff0104d1d61e311ef1f2a10b5e8b21adfa4..1f3fa1e28b2c8eae37be49b7e12ec0deb6c3f8c4
  5--- a/plugins/git-flow-avh/git-flow-avh.plugin.zsh
  6+++ b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
  7@@ -22,398 +22,527 @@
  8 
  9 _git-flow ()
 10 {
 11-	local curcontext="$curcontext" state line
 12-	typeset -A opt_args
 13-
 14-	_arguments -C \
 15-		':command:->command' \
 16-		'*::options:->options'
 17-
 18-	case $state in
 19-		(command)
 20-
 21-			local -a subcommands
 22-			subcommands=(
 23-				'init:Initialize a new git repo with support for the branching model.'
 24-				'feature:Manage your feature branches.'
 25-				'config:Manage your configuration.'
 26-				'release:Manage your release branches.'
 27-				'hotfix:Manage your hotfix branches.'
 28-				'support:Manage your support branches.'
 29-				'version:Shows version information.'
 30-				'finish:Finish the branch you are currently on.'
 31-				'delete:Delete the branch you are currently on.'
 32-				'publish:Publish the branch you are currently on.'
 33-			)
 34-			_describe -t commands 'git flow' subcommands
 35-		;;
 36-
 37-		(options)
 38-			case $line[1] in
 39-
 40-				(init)
 41-					_arguments \
 42-						-f'[Force setting of gitflow branches, even if already configured]'
 43-					;;
 44-
 45-					(version)
 46-					;;
 47-
 48-					(hotfix)
 49-						__git-flow-hotfix
 50-					;;
 51-
 52-					(release)
 53-						__git-flow-release
 54-					;;
 55-
 56-					(feature)
 57-						__git-flow-feature
 58-					;;
 59-					(config)
 60-					__git-flow-config
 61-					;;
 62-
 63-			esac
 64-		;;
 65-	esac
 66+    local curcontext="$curcontext" state line
 67+    typeset -A opt_args
 68+
 69+    _arguments -C \
 70+        ':command:->command' \
 71+        '*::options:->options'
 72+
 73+    case $state in
 74+        (command)
 75+
 76+            local -a subcommands
 77+            subcommands=(
 78+                'init:Initialize a new git repo with support for the branching model.'
 79+                'feature:Manage your feature branches.'
 80+                'bugfix:Manage your bugfix branches.'
 81+                'config:Manage your configuration.'
 82+                'release:Manage your release branches.'
 83+                'hotfix:Manage your hotfix branches.'
 84+                'support:Manage your support branches.'
 85+                'version:Shows version information.'
 86+                'finish:Finish the branch you are currently on.'
 87+                'delete:Delete the branch you are currently on.'
 88+                'publish:Publish the branch you are currently on.'
 89+                'rebase:Rebase the branch you are currently on.'
 90+            )
 91+            _describe -t commands 'git flow' subcommands
 92+        ;;
 93+
 94+        (options)
 95+            case $line[1] in
 96+
 97+                (init)
 98+                    _arguments \
 99+                        -f'[Force setting of gitflow branches, even if already configured]'
100+                    ;;
101+
102+                    (version)
103+                    ;;
104+
105+                    (hotfix)
106+                        __git-flow-hotfix