diff options
| author | Robby Russell <robby@planetargon.com> | 2015-07-06 09:33:43 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2015-07-06 09:33:43 -0700 |
| commit | 3ea33841863c4f5f22a27e64ae7950d901b674af (patch) | |
| tree | d6961ad00c8a94b852aa62c5c12e632229c497b4 /plugins/jira/jira.plugin.zsh | |
| parent | c968346e1793d64ea19f7e494d9fea391843823c (diff) | |
| parent | d0670aa2bd5186357961dd90c4a97c2c3842f728 (diff) | |
| download | zsh-3ea33841863c4f5f22a27e64ae7950d901b674af.tar.gz zsh-3ea33841863c4f5f22a27e64ae7950d901b674af.tar.bz2 zsh-3ea33841863c4f5f22a27e64ae7950d901b674af.zip | |
Merge pull request #4041 from apjanke/fix-jira-prefix-comment-merge
Fix jira plugin syntax error due to merge conflict
Diffstat (limited to 'plugins/jira/jira.plugin.zsh')
| -rw-r--r-- | plugins/jira/jira.plugin.zsh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh index 8ad60b8fe..ca540c84c 100644 --- a/plugins/jira/jira.plugin.zsh +++ b/plugins/jira/jira.plugin.zsh @@ -42,13 +42,6 @@ open_jira_issue () { $open_cmd "${jira_url}/secure/CreateIssue!default.jspa" elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then jira_query $@ - else - echo "Opening issue #$1" - if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then - $open_cmd "$jira_url/issues/$jira_prefix$1" - else - $open_cmd "$jira_url/browse/$jira_prefix$1" - fi else local addcomment='' if [[ "$2" == "m" ]]; then @@ -59,9 +52,9 @@ open_jira_issue () { fi if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then - $open_cmd "$jira_url/issues/$1$addcomment" + $open_cmd "$jira_url/issues/$jira_prefix$1$addcomment" else - $open_cmd "$jira_url/browse/$1$addcomment" + $open_cmd "$jira_url/browse/$jira_prefix$1$addcomment" fi fi } |