From ac19bd5e7a1791af621dfd04d98f627817bbefc9 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Thu, 19 Mar 2026 16:00:19 +0000
Subject: [PATCH] feature/featuretags: skip TestAllOmitBuildTagsDeclared when
 not in a git repo

This test was failing on Alpine's CI which had 'git' but wasn't in a git repo:

https://github.com/tailscale/tailscale/commit/036b6a12621306da8368b167deb9858d4a8d6ce9#commitcomment-180001647

Updates #12614

Change-Id: Ic1b8856aaf020788a2a57e48738851e13ea85a93
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
---
 feature/featuretags/featuretags_test.go | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/feature/featuretags/featuretags_test.go b/feature/featuretags/featuretags_test.go
index 19c9722a6..c8a9f77ae 100644
--- a/feature/featuretags/featuretags_test.go
+++ b/feature/featuretags/featuretags_test.go
@@ -5,9 +5,7 @@
 
 import (
 	"maps"
-	"os"
 	"os/exec"
-	"path/filepath"
 	"regexp"
 	"slices"
 	"strings"
@@ -91,19 +89,18 @@ func TestRequiredBy(t *testing.T) {
 
 // Verify that all "ts_omit_foo" build tags are declared in featuretags.go
 func TestAllOmitBuildTagsDeclared(t *testing.T) {
-	dir, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
+	if _, err := exec.LookPath("git"); err != nil {
+		t.Skipf("git not found in PATH; skipping test")
+	}
+	root, err := exec.Command("git", "rev-parse", "--show-toplevel").Output()
+	if err != nil {
+		t.Skipf("not in a git repository; skipping test")
 	}
-	root := filepath.Join(dir, "..", "..")
 
 	cmd := exec.Command("git", "grep", "ts_omit_")
-	cmd.Dir = root
+	cmd.Dir = strings.TrimSpace(string(root))
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		if _, err := exec.LookPath("git"); err != nil {
-			t.Skipf("git not found in PATH; skipping test")
-		}
 		t.Fatalf("git grep failed: %v\nOutput:\n%s", err, out)
 	}
 	rx := regexp.MustCompile(`\bts_omit_[\w_]+\b`)