3ea33841863c4f5f22a27e64ae7950d901b674af
- Author
- Robby Russell <robby@planetargon.com>
- Committer
- Robby Russell <robby@planetargon.com>
- Date
Message
Merge pull request #4041 from apjanke/fix-jira-prefix-comment-merge
Fix jira plugin syntax error due to merge conflict
Diff
1diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
2index 8ad60b8fecdf1da67b2ad5d2f64512a0ec0ee2ce..ca540c84c1229cbea6d0bb0ae721499e2ce41364 100644
3--- a/plugins/jira/jira.plugin.zsh
4+++ b/plugins/jira/jira.plugin.zsh
5@@ -42,13 +42,6 @@ open_jira_issue () {
6 $open_cmd "${jira_url}/secure/CreateIssue!default.jspa"
7 elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then
8 jira_query $@
9- else
10- echo "Opening issue #$1"
11- if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
12- $open_cmd "$jira_url/issues/$jira_prefix$1"
13- else
14- $open_cmd "$jira_url/browse/$jira_prefix$1"
15- fi
16 else
17 local addcomment=''
18 if [[ "$2" == "m" ]]; then
19@@ -59,9 +52,9 @@ open_jira_issue () {
20 fi
21
22 if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
23- $open_cmd "$jira_url/issues/$1$addcomment"
24+ $open_cmd "$jira_url/issues/$jira_prefix$1$addcomment"
25 else
26- $open_cmd "$jira_url/browse/$1$addcomment"
27+ $open_cmd "$jira_url/browse/$jira_prefix$1$addcomment"
28 fi
29 fi
30 }