From 31eb5216f1f6e407586f1106565b4620935712b6 Mon Sep 17 00:00:00 2001
From: mmdoogie <24367033+mmdoogie@users.noreply.github.com>
Date: Wed, 26 Jan 2022 20:38:30 -0600
Subject: [PATCH 1/2] Ignore branch name when parsing response in IsEmpty

---
 modules/git/repo.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/git/repo.go b/modules/git/repo.go
index 663e13dc18fff..7b53d6d178a49 100644
--- a/modules/git/repo.go
+++ b/modules/git/repo.go
@@ -82,7 +82,8 @@ func (repo *Repository) IsEmpty() (bool, error) {
 	var errbuf strings.Builder
 	if err := NewCommandContext(repo.Ctx, "log", "-1").RunInDirPipeline(repo.Path, nil, &errbuf); err != nil {
 		if strings.Contains(errbuf.String(), "fatal: bad default revision 'HEAD'") ||
-			strings.Contains(errbuf.String(), "fatal: your current branch 'master' does not have any commits yet") {
+			(strings.Contains(errbuf.String(), "fatal: your current branch '") &&
+				strings.Contains(errbuf.String(), "' does not have any commits yet")) {
 			return true, nil
 		}
 		return true, fmt.Errorf("check empty: %v - %s", err, errbuf.String())

From 90841f07664e9eb315bb6895066072c67d5f9b80 Mon Sep 17 00:00:00 2001
From: mmdoogie <24367033+mmdoogie@users.noreply.github.com>
Date: Wed, 26 Jan 2022 21:03:19 -0600
Subject: [PATCH 2/2] Update TestRepoIsEmpty test to use alternate branch name

---
 modules/git/tests/repos/repo2_empty/HEAD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/git/tests/repos/repo2_empty/HEAD b/modules/git/tests/repos/repo2_empty/HEAD
index cb089cd89a7d7..a64f363ee42c9 100644
--- a/modules/git/tests/repos/repo2_empty/HEAD
+++ b/modules/git/tests/repos/repo2_empty/HEAD
@@ -1 +1 @@
-ref: refs/heads/master
+ref: refs/heads/unicorn