1diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
2index 9e7cf2b880face23a71115c58bbd89e1947a51cb..ed88368cdc41bac6eeb6024fb3351dc95173e829 100644
3--- a/plugins/jira/jira.plugin.zsh
4+++ b/plugins/jira/jira.plugin.zsh
5@@ -63,19 +63,24 @@ function jira() {
6 else
7 # Anything that doesn't match a special action is considered an issue name
8 # but `branch` is a special case that will parse the current git branch
9+ local issue_arg issue
10 if [[ "$action" == "branch" ]]; then
11- local issue_arg=$(git rev-parse --abbrev-ref HEAD)
12- issue_arg=($(echo $issue_arg | cut -d'_' -f1))
13- if [[ $(echo ${issue_arg} | grep ${jira_prefix}) ]]; then
14- local issue="${issue_arg}"
15+ # Get name of the branch
16+ issue_arg=$(git rev-parse --abbrev-ref HEAD)
17+ # Split by _ character and get the first element
18+ issue_arg=(${(s:_:)issue_arg})
19+ issue_arg=${issue_arg[1]}
20+ if [[ "$issue_arg" = ${jira_prefix}* ]]; then
21+ issue="${issue_arg}"
22 else
23- local issue="${jira_prefix}${issue_arg}"
24+ issue="${jira_prefix}${issue_arg}"
25 fi
26 else
27- local issue_arg=${(U)action}
28- local issue="${jira_prefix}${issue_arg}"
29+ issue_arg=${(U)action}
30+ issue="${jira_prefix}${issue_arg}"
31 fi
32- local url_fragment=''
33+
34+ local url_fragment
35 if [[ "$2" == "m" ]]; then
36 url_fragment="#add-comment"
37 echo "Add comment to issue #$issue"