fix(git): clone every branch so commits outside the default branch resolve

.drone.yml

@@ -3,12 +3,12 @@ kind: pipeline
 name: coopcloud.tech/abra
 steps:
   - name: make check
-    image: golang:1.26
+    image: golang:1.27
     commands:
       - make check
 
   - name: xgettext-go
-    image: golang:1.26
+    image: golang:1.27
     environment:
       GOPRIVATE: coopcloud.tech
     commands:
@@ -43,7 +43,7 @@ steps:
           - tag
 
   - name: make test
-    image: golang:1.26
+    image: golang:1.27
     environment:
       ABRA_DIR: /root/.abra_test
     commands:

Dockerfile

@@ -1,5 +1,5 @@
 # Build image
-FROM golang:1.26-alpine AS build
+FROM golang:1.27-alpine AS build
 
 ENV GOPRIVATE=coopcloud.tech
 

go.mod

@@ -6,7 +6,7 @@ require (
 	coopcloud.tech/tagcmp v0.0.0-20260515102403-c26951b55977
 	git.coopcloud.tech/toolshed/godotenv v1.5.2-0.20250103171850-4d0ca41daa5c
 	github.com/AlecAivazis/survey/v2 v2.3.7
-	github.com/charmbracelet/bubbletea/v2 v2.0.9
+	github.com/charmbracelet/bubbletea v1.3.10
 	github.com/charmbracelet/lipgloss v1.1.0
 	github.com/charmbracelet/log v1.0.0
 	github.com/distribution/reference v0.6.0

pkg/git/clone.go

@@ -52,7 +52,6 @@ func Clone(dir, url string) error {
 				URL:           url,
 				Tags:          git.AllTags,
 				ReferenceName: plumbing.ReferenceName("refs/heads/main"),
-				SingleBranch:  true,
 			})
 
 			if err != nil && gitCloneIgnoreErr(err) {
@@ -71,7 +70,6 @@ func Clone(dir, url string) error {
 					URL:           url,
 					Tags:          git.AllTags,
 					ReferenceName: plumbing.ReferenceName("refs/heads/master"),
-					SingleBranch:  true,
 				})
 
 				if err != nil && gitCloneIgnoreErr(err) {

pkg/i18n/locales/abra.pot

@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: \n"
         "Report-Msgid-Bugs-To: EMAIL\n"
-        "POT-Creation-Date: 2026-06-14 17:56+0200\n"
+        "POT-Creation-Date: 2026-08-31 19:21+0000\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -189,7 +189,7 @@ msgstr  ""
 msgid   "%d volumes removed successfully"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:197
+#: ./pkg/recipe/git.go:198
 #, c-format
 msgid   "%s (%s) has locally unstaged changes?"
 msgstr  ""
@@ -419,7 +419,7 @@ msgstr  ""
 msgid   "%s sanitised as %s for new app"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:445
+#: ./pkg/recipe/git.go:451
 #, c-format
 msgid   "%s service is missing image tag?"
 msgstr  ""
@@ -902,7 +902,7 @@ msgstr  ""
 msgid   "Generate the recipe catalogue"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:459
+#: ./pkg/recipe/git.go:465
 #, c-format
 msgid   "GetRecipeVersions encountered error for %s: %s (collected %d versions)"
 msgstr  ""
@@ -1815,7 +1815,7 @@ msgstr  ""
 msgid   "are you sure?"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:162
+#: ./pkg/recipe/git.go:163
 #, c-format
 msgid   "attempting to checkout '%s' as chaos commit"
 msgstr  ""
@@ -1951,7 +1951,7 @@ msgstr  ""
 msgid   "cancelled"
 msgstr  ""
 
-#: ./pkg/catalogue/catalogue.go:59 ./pkg/recipe/git.go:251
+#: ./pkg/catalogue/catalogue.go:59 ./pkg/recipe/git.go:252
 #, c-format
 msgid   "cannot ensure %s is up-to-date, no git remotes configured"
 msgstr  ""
@@ -1966,7 +1966,7 @@ msgstr  ""
 msgid   "cannot get label %s for %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:58
+#: ./pkg/recipe/git.go:59
 #, c-format
 msgid   "cannot redeploy previous chaos version (%s), did you mean to use \"--chaos\"?"
 msgstr  ""
@@ -2118,7 +2118,7 @@ msgstr  ""
 msgid   "cmd"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:470
+#: ./pkg/recipe/git.go:476
 #, c-format
 msgid   "collected %s for %s"
 msgstr  ""
@@ -2456,7 +2456,7 @@ msgstr  ""
 msgid   "destination directory does not exist"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:373
+#: ./pkg/recipe/git.go:379
 #, c-format
 msgid   "detected %s as tags for recipe %s"
 msgstr  ""
@@ -2653,7 +2653,7 @@ msgstr  ""
 msgid   "ensure recipe: %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:56
+#: ./pkg/recipe/git.go:57
 #, c-format
 msgid   "ensuring env version %s"
 msgstr  ""
@@ -2751,12 +2751,12 @@ msgstr  ""
 msgid   "failed to check git status of %s: %s"
 msgstr  ""
 
-#: ./pkg/git/branch.go:95 ./pkg/recipe/git.go:231
+#: ./pkg/git/branch.go:95 ./pkg/recipe/git.go:232
 #, c-format
 msgid   "failed to check out %s in %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:412
+#: ./pkg/recipe/git.go:418
 #, c-format
 msgid   "failed to check out %s in %s: %s"
 msgstr  ""
@@ -2806,7 +2806,7 @@ msgstr  ""
 msgid   "failed to generate random bytes: %w"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:421
+#: ./pkg/recipe/git.go:427
 #, c-format
 msgid   "failed to get compose config for %s: %s"
 msgstr  ""
@@ -2844,7 +2844,7 @@ msgstr  ""
 msgid   "failed to parse image %s, saw: %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:431
+#: ./pkg/recipe/git.go:437
 #, c-format
 msgid   "failed to parse image for %s in %s: %s"
 msgstr  ""
@@ -2952,7 +2952,7 @@ msgstr  ""
 msgid   "fetch all recipes"
 msgstr  ""
 
-#: ./pkg/catalogue/catalogue.go:84 ./pkg/recipe/git.go:284
+#: ./pkg/catalogue/catalogue.go:84 ./pkg/recipe/git.go:290
 #, c-format
 msgid   "fetched latest git changes for %s"
 msgstr  ""
@@ -3070,12 +3070,12 @@ msgstr  ""
 msgid   "git changes pushed"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:417
+#: ./pkg/recipe/git.go:423
 #, c-format
 msgid   "git checkout: %s in %s"
 msgstr  ""
 
-#: ./pkg/git/clone.go:64 ./pkg/git/clone.go:102
+#: ./pkg/git/clone.go:63 ./pkg/git/clone.go:100
 #, c-format
 msgid   "git clone %s: cancelled due to interrupt"
 msgstr  ""
@@ -3085,17 +3085,17 @@ msgstr  ""
 msgid   "git clone: %s"
 msgstr  ""
 
-#: ./pkg/git/clone.go:89
+#: ./pkg/git/clone.go:87
 #, c-format
 msgid   "git clone: %s already exists"
 msgstr  ""
 
-#: ./pkg/git/clone.go:59 ./pkg/git/clone.go:78 ./pkg/git/clone.go:87
+#: ./pkg/git/clone.go:58 ./pkg/git/clone.go:76 ./pkg/git/clone.go:85
 #, c-format
 msgid   "git clone: %s cloned successfully"
 msgstr  ""
 
-#: ./pkg/git/clone.go:68
+#: ./pkg/git/clone.go:67
 msgid   "git clone: main branch failed, attempting master branch"
 msgstr  ""
 
@@ -3150,7 +3150,7 @@ msgstr  ""
 msgid   "git.coopcloud.tech repo exists"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:384
+#: ./pkg/recipe/git.go:390
 #, c-format
 msgid   "git: opening repository in %s"
 msgstr  ""
@@ -4061,7 +4061,7 @@ msgstr  ""
 msgid   "proceed?"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:404
+#: ./pkg/recipe/git.go:410
 #, c-format
 msgid   "processing %s for %s"
 msgstr  ""
@@ -4129,7 +4129,7 @@ msgstr  ""
 msgid   "re"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:157
+#: ./pkg/recipe/git.go:158
 #, c-format
 msgid   "read %s as tags for recipe %s"
 msgstr  ""
@@ -4865,17 +4865,17 @@ msgstr  ""
 msgid   "skipping secret (because it already exists) on %s: %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:413
+#: ./pkg/recipe/git.go:419
 #, c-format
 msgid   "skipping tag %s: checkout failed: %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:422
+#: ./pkg/recipe/git.go:428
 #, c-format
 msgid   "skipping tag %s: invalid compose config: %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:432
+#: ./pkg/recipe/git.go:438
 #, c-format
 msgid   "skipping tag %s: invalid image reference in service %s: %s"
 msgstr  ""
@@ -4978,7 +4978,7 @@ msgstr  ""
 msgid   "succeeded"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:184
+#: ./pkg/recipe/git.go:185
 #, c-format
 msgid   "successfully checked %s out to %s in %s"
 msgstr  ""
@@ -5138,17 +5138,17 @@ msgstr  ""
 msgid   "un"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:193
+#: ./pkg/recipe/git.go:194
 #, c-format
 msgid   "unable to check git clean status in %s: %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:262
+#: ./pkg/recipe/git.go:263
 #, c-format
 msgid   "unable to check out default branch in %s: %s"
 msgstr  ""
 
-#: ./pkg/git/clone.go:100
+#: ./pkg/git/clone.go:98
 #, c-format
 msgid   "unable to clean up git clone of %s: %s"
 msgstr  ""
@@ -5222,7 +5222,7 @@ msgstr  ""
 msgid   "unable to discover SSH remote for %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:268
+#: ./pkg/recipe/git.go:274
 #, c-format
 msgid   "unable to fetch tags in %s: %s"
 msgstr  ""
@@ -5232,7 +5232,7 @@ msgstr  ""
 msgid   "unable to get container matching %s: %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:280
+#: ./pkg/recipe/git.go:286
 #, c-format
 msgid   "unable to git pull in %s: %s"
 msgstr  ""
@@ -5261,12 +5261,12 @@ msgstr  ""
 msgid   "unable to look up server context for %s: %s"
 msgstr  ""
 
-#: ./cli/recipe/fetch.go:77 ./pkg/git/read.go:26 ./pkg/lint/recipe.go:491 ./pkg/recipe/git.go:242
+#: ./cli/recipe/fetch.go:77 ./pkg/git/read.go:26 ./pkg/lint/recipe.go:491 ./pkg/recipe/git.go:243
 #, c-format
 msgid   "unable to open %s: %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:257
+#: ./pkg/recipe/git.go:258
 #, c-format
 msgid   "unable to open git work tree in %s: %s"
 msgstr  ""
@@ -5326,7 +5326,7 @@ msgstr  ""
 msgid   "unable to read new env %s: %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:247
+#: ./pkg/recipe/git.go:248
 #, c-format
 msgid   "unable to read remotes in %s: %s"
 msgstr  ""
@@ -5361,7 +5361,7 @@ msgstr  ""
 msgid   "unable to reset commit after failed release attempt: %s"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:166
+#: ./pkg/recipe/git.go:167
 #, c-format
 msgid   "unable to resolve '%s': %s"
 msgstr  ""

pkg/recipe/git.go

@@ -16,6 +16,7 @@ import (
 	"coopcloud.tech/tagcmp"
 	"github.com/distribution/reference"
 	"github.com/go-git/go-git/v5"
+	gitCfg "github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
 )
 
@@ -262,7 +263,12 @@ func (r Recipe) EnsureUpToDate() error {
 		return errors.New(i18n.G("unable to check out default branch in %s: %s", r.Dir, err))
 	}
 
-	fetchOpts := &git.FetchOptions{Tags: git.AllTags}
+	// the refspec is passed explicitly, because a repository cloned by an older abra has a
+	// single-branch refspec stored in its config and would otherwise never see other branches
+	fetchOpts := &git.FetchOptions{
+		Tags:     git.AllTags,
+		RefSpecs: []gitCfg.RefSpec{"+refs/heads/*:refs/remotes/origin/*"},
+	}
 	if err := repo.Fetch(fetchOpts); err != nil {
 		if !strings.Contains(err.Error(), "already up-to-date") {
 			return errors.New(i18n.G("unable to fetch tags in %s: %s", r.Dir, err))

pkg/secret/testdir/compose.yaml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: nginx:1.31.3
+    image: nginx:1.31.4
     secrets:
       - test_pass_one
       - test_pass_two

tests/resources/test_recipe/compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: nginx:1.31.3
+    image: nginx:1.31.4
     networks:
       - proxy
     deploy:

vendor/coopcloud.tech/tagcmp/.drone.yml

@@ -3,16 +3,16 @@ kind: pipeline
 name: coopcloud.tech/tagcmp
 steps:
   - name: gofmt
-    image: golang:1.26
+    image: golang:1.27
     commands:
       - test -z "$(gofmt -l .)"
 
   - name: go build
-    image: golang:1.26
+    image: golang:1.27
     commands:
       - go build -v .
 
   - name: go test
-    image: golang:1.26
+    image: golang:1.27
     commands:
       - go test . -cover

vendor/github.com/pjbgf/sha1cd/Dockerfile.arm

@@ -1,4 +1,4 @@
-FROM golang:1.26@sha256:0d1d3a794be25f809dd2cb3160d8c73276c4056a9f8242a138e908ddeee7b6b6
+FROM golang:1.27@sha256:eb37f58646a901dc7727cf448cae36daaefaba79de33b5058dab79aa4c04aefb
 
 ENV GOOS=linux
 ENV GOARCH=arm

vendor/github.com/pjbgf/sha1cd/Dockerfile.arm64

@@ -1,4 +1,4 @@
-FROM golang:1.26@sha256:0d1d3a794be25f809dd2cb3160d8c73276c4056a9f8242a138e908ddeee7b6b6
+FROM golang:1.27@sha256:eb37f58646a901dc7727cf448cae36daaefaba79de33b5058dab79aa4c04aefb
 
 ENV GOOS=linux
 ENV GOARCH=arm64