From 529a12fac857efbfa749998ed872d668ff51d15d Mon Sep 17 00:00:00 2001
From: Jarryd Tilbrook <jrad.tilbrook@gmail.com>
Date: Wed, 1 Nov 2017 21:04:41 +0800
Subject: Add shortcut for opening current branch in Jira (#6366)

---
 plugins/jira/_jira           |  1 +
 plugins/jira/jira.plugin.zsh | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'plugins/jira')

diff --git a/plugins/jira/_jira b/plugins/jira/_jira
index 03fe6a499..890f97f4c 100644
--- a/plugins/jira/_jira
+++ b/plugins/jira/_jira
@@ -7,6 +7,7 @@ _1st_arguments=(
   'dashboard:open the dashboard'
   'reported:search for issues reported by a user'
   'assigned:search for issues assigned to a user'
+  'br:open the issue named after the git branch of the current directory'
   'dumpconfig:display effective jira configuration'
 )
 
diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 67c989457..fe1772cd8 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -51,8 +51,14 @@ function jira() {
     echo "JIRA_DEFAULT_ACTION=$JIRA_DEFAULT_ACTION"
   else
     # Anything that doesn't match a special action is considered an issue name
-    local issue_arg=$action
-    local issue="${jira_prefix}${issue_arg}"
+    # but `branch` is a special case that will parse the current git branch
+    if [[ "$action" == "br" ]]; then
+      local issue_arg=$(git rev-parse --abbrev-ref HEAD)
+      local issue="${jira_prefix}${issue_arg}"
+    else
+      local issue_arg=$action
+      local issue="${jira_prefix}${issue_arg}"
+    fi
     local url_fragment=''
     if [[ "$2" == "m" ]]; then
       url_fragment="#add-comment"
-- 
cgit v1.2.3-70-g09d2


From 6d5b1f1e3be483bb09315d22a2175d1c97998167 Mon Sep 17 00:00:00 2001
From: Jarryd Tilbrook <jrad.tilbrook@gmail.com>
Date: Wed, 1 Nov 2017 21:09:10 +0800
Subject: Allow jira default action file based setting (#6367)

---
 plugins/jira/jira.plugin.zsh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'plugins/jira')

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index fe1772cd8..7d4e5b921 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -2,13 +2,19 @@
 #
 # See README.md for details
 
-: ${JIRA_DEFAULT_ACTION:=new}
-
 function jira() {
   emulate -L zsh
-  local action=${1:=$JIRA_DEFAULT_ACTION}
+  local action jira_url jira_prefix
+  if [[ -f .jira-default-action ]]; then
+    action=$(cat .jira-default-action)
+  elif [[ -f ~/.jira-default-action ]]; then
+    action=$(cat ~/.jira-default-action)
+  elif [[ -n "${JIRA_DEFAULT_ACTION}" ]]; then
+    action=${JIRA_DEFAULT_ACTION}
+  else
+    action="new"
+  fi
 
-  local jira_url jira_prefix
   if [[ -f .jira-url ]]; then
     jira_url=$(cat .jira-url)
   elif [[ -f ~/.jira-url ]]; then
-- 
cgit v1.2.3-70-g09d2


From 93120c4151b0bbc831ce29f5386f8d9dcf313573 Mon Sep 17 00:00:00 2001
From: ramanduh <ramanduh@users.noreply.github.com>
Date: Sat, 4 Nov 2017 18:31:42 +0100
Subject: jira plugin: take into account action argument (fix #6388) (#6393)

---
 plugins/jira/jira.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins/jira')

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 7d4e5b921..0340dd7f4 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -5,7 +5,9 @@
 function jira() {
   emulate -L zsh
   local action jira_url jira_prefix
-  if [[ -f .jira-default-action ]]; then
+  if [[ -n "$1" ]]; then
+    action=$1
+  elif [[ -f .jira-default-action ]]; then
     action=$(cat .jira-default-action)
   elif [[ -f ~/.jira-default-action ]]; then
     action=$(cat ~/.jira-default-action)
-- 
cgit v1.2.3-70-g09d2