From 87c3c8172a8596d903e9c6ab6c9619e84dcf6413 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Sun, 25 Oct 2015 18:35:27 -0400
Subject: [PATCH] #1711 try to indicate sqlite session issue when merge

---
 conf/gitignore/Clojure.gitignore |  1 -
 conf/gitignore/Fortran.gitignore |  1 -
 models/pull.go                   | 12 ++++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 120000 conf/gitignore/Clojure.gitignore
 delete mode 120000 conf/gitignore/Fortran.gitignore

diff --git a/conf/gitignore/Clojure.gitignore b/conf/gitignore/Clojure.gitignore
deleted file mode 120000
index 7657a270c..000000000
--- a/conf/gitignore/Clojure.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Leiningen.gitignore
\ No newline at end of file
diff --git a/conf/gitignore/Fortran.gitignore b/conf/gitignore/Fortran.gitignore
deleted file mode 120000
index 5daba98a3..000000000
--- a/conf/gitignore/Fortran.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-C++.gitignore
\ No newline at end of file
diff --git a/models/pull.go b/models/pull.go
index 7ef0901cc..fc8a70345 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -73,14 +73,18 @@ func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) {
 	}
 }
 
-func (pr *PullRequest) GetHeadRepo() (err error) {
-	pr.HeadRepo, err = GetRepositoryByID(pr.HeadRepoID)
+func (pr *PullRequest) getHeadRepo(e Engine) (err error) {
+	pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
 	if err != nil && !IsErrRepoNotExist(err) {
 		return fmt.Errorf("GetRepositoryByID (head): %v", err)
 	}
 	return nil
 }
 
+func (pr *PullRequest) GetHeadRepo() (err error) {
+	return pr.getHeadRepo(x)
+}
+
 func (pr *PullRequest) GetBaseRepo() (err error) {
 	if pr.BaseRepo != nil {
 		return nil
@@ -130,8 +134,8 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
 		return fmt.Errorf("Issue.changeStatus: %v", err)
 	}
 
-	if err = pr.GetHeadRepo(); err != nil {
-		return fmt.Errorf("GetHeadRepo: %v", err)
+	if err = pr.getHeadRepo(sess); err != nil {
+		return fmt.Errorf("getHeadRepo: %v", err)
 	}
 
 	headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)