From b479892563083e234d6e45423603ea1fb639569d Mon Sep 17 00:00:00 2001
From: Rajat Jain <rajatjain.ix@gmail.com>
Date: Thu, 4 Feb 2021 18:02:21 +0530
Subject: [PATCH] Fixed comparison of tags & branches

---
 internal/route/repo/pull.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/internal/route/repo/pull.go b/internal/route/repo/pull.go
index 88c452abf..01ee88ca8 100644
--- a/internal/route/repo/pull.go
+++ b/internal/route/repo/pull.go
@@ -476,7 +476,7 @@ func ParseCompareInfo(c *context.Context) (*db.User, *db.Repository, *git.Reposi
 	c.Repo.PullRequest.SameRepo = isSameRepo
 
 	// Check if base branch is valid.
-	if !c.Repo.GitRepo.HasBranch(baseBranch) {
+	if !c.Repo.GitRepo.HasBranch(baseBranch) && !c.Repo.GitRepo.HasTag(baseBranch) {
 		c.NotFound()
 		return nil, nil, nil, nil, "", ""
 	}
@@ -517,7 +517,7 @@ func ParseCompareInfo(c *context.Context) (*db.User, *db.Repository, *git.Reposi
 	}
 
 	// Check if head branch is valid.
-	if !headGitRepo.HasBranch(headBranch) {
+	if !headGitRepo.HasBranch(headBranch) && !headGitRepo.HasTag(headBranch) {
 		c.NotFound()
 		return nil, nil, nil, nil, "", ""
 	}
@@ -564,8 +564,11 @@ func PrepareCompareDiff(
 
 	headCommitID, err := headGitRepo.BranchCommitID(headBranch)
 	if err != nil {
-		c.Error(err, "get head branch commit ID")
-		return false
+		headCommitID, err = headGitRepo.TagCommitID(headBranch)
+		if err != nil {
+			c.Error(err, "get head branch commit ID")
+			return false
+		}
 	}
 	c.Data["AfterCommitID"] = headCommitID