Fix merge conflict for jira-prefix and jira add comment

This commit is contained in:
Andrew Janke 2015-06-15 16:55:25 -04:00
parent ab18795f3c
commit d0670aa2bd

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
} }