From 6cb9ce136701e6429b95590639ee19da16b15e75 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Sun, 13 Oct 2019 18:23:43 +0100
Subject: [PATCH] IsBranchExist: return false if provided name is empty (#8485)
 (#8492)

* IsBranchExist: return false if provided name is empty

* Ensure that the reference returned is actually of a valid type
---
 modules/git/repo_branch.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/git/repo_branch.go b/modules/git/repo_branch.go
index 3e1261d294c..a2bf9ac973e 100644
--- a/modules/git/repo_branch.go
+++ b/modules/git/repo_branch.go
@@ -28,8 +28,14 @@ func IsBranchExist(repoPath, name string) bool {
 
 // IsBranchExist returns true if given branch exists in current repository.
 func (repo *Repository) IsBranchExist(name string) bool {
-	_, err := repo.gogitRepo.Reference(plumbing.ReferenceName(BranchPrefix+name), true)
-	return err == nil
+	if name == "" {
+		return false
+	}
+	reference, err := repo.gogitRepo.Reference(plumbing.ReferenceName(BranchPrefix+name), true)
+	if err != nil {
+		return false
+	}
+	return reference.Type() != plumbing.InvalidReference
 }
 
 // Branch represents a Git branch.