aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragrn2017-05-20 06:43:43 +0200
committerLunny Xiao2017-05-20 12:43:43 +0800
commit4fd55d87965823b5acc79be43ac7832dc2fab563 (patch)
treee1528dcde27a8abd1be4fc76f81abfb7ca1e8fb6
parentdaaabaa1d9d9a03cc6b6df372eb02b434d920fdb (diff)
Backport bugfixes #1220 and #1393 to v1.1 (#1758)
* Fix "Error: No issue number specified" when pushing * fix wrong log when push to a new branch (#1220) * Removing empty file modules/github/issues.go
-rw-r--r--models/action.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/models/action.go b/models/action.go
index c736fabf3..6f76cbc4e 100644
--- a/models/action.go
+++ b/models/action.go
@@ -360,7 +360,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
issue, err := GetIssueByRef(ref)
if err != nil {
- if IsErrIssueNotExist(err) {
+ if IsErrIssueNotExist(err) || err == errMissingIssueNumber {
continue
}
return err
@@ -398,7 +398,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
issue, err := GetIssueByRef(ref)
if err != nil {
- if IsErrIssueNotExist(err) {
+ if IsErrIssueNotExist(err) || err == errMissingIssueNumber {
continue
}
return err
@@ -438,7 +438,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
issue, err := GetIssueByRef(ref)
if err != nil {
- if IsErrIssueNotExist(err) {
+ if IsErrIssueNotExist(err) || err == errMissingIssueNumber {
continue
}
return err