adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4041 from apjanke/fix-jira-prefix-comment-merge

Browse Source 
Fix jira plugin syntax error due to merge conflict
This commit is contained in:
Robby Russell 2015-07-06 09:33:43 -07:00
commit 3ea3384186
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/jira/jira.plugin.zsh
View File

@ -42,13 +42,6 @@ open_jira_issue () {
$open_cmd "${jira_url}/secure/CreateIssue!default.jspa" $open_cmd "${jira_url}/secure/CreateIssue!default.jspa"
elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then
jira_query $@ 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 else
local addcomment='' local addcomment=''
if [[ "$2" == "m" ]]; then if [[ "$2" == "m" ]]; then
@ -59,9 +52,9 @@ open_jira_issue () {
fi fi
if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
$open_cmd "$jira_url/issues/$1$addcomment" $open_cmd "$jira_url/issues/$jira_prefix$1$addcomment"
else else
$open_cmd "$jira_url/browse/$1$addcomment" $open_cmd "$jira_url/browse/$jira_prefix$1$addcomment"
fi fi
fi fi
} }