uid: fix cmd for persistent flag

Author: rsteube

pkg/uid/uid.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sync"
 
 	"github.com/carapace-sh/carapace/internal/pflagfork"
 	"github.com/spf13/cobra"
@@ -38,8 +39,17 @@ func reverse(s []string) {
 	}
 }
 
+var flagMutex sync.RWMutex
+
 // Flag creates a uid for given flag.
 func Flag(cmd *cobra.Command, flag *pflagfork.Flag) *url.URL {
+	// TODO dirty quickfix to avoid concurrent map write when modifying the `formal` map in FlagSet.AddFlag
+	flagMutex.Lock()
+	defer flagMutex.Unlock()
+
+	if cmd.LocalFlags().Lookup(flag.Name) == nil && cmd.HasParent() {
+		return Flag(cmd.Parent(), flag)
+	}
 	uid := Command(cmd)
 	values := uid.Query()
 	values.Set("flag", flag.Name)