sec: update git-module (#742)
Carlos Alexandro Becker
created 2 months ago
The regex solution proposed in #737 is not sufficient.
I've added `--end-of-options` to the relevant commands in https://github.com/aymanbagabas/git-module/pull/1
so this reverts changes made in #737 and update git-module to include that fix.
Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
Change summary
go.mod | 16 +++++-----------
go.sum | 4 ++--
pkg/ssh/cmd/commit.go | 7 -------
3 files changed, 7 insertions(+), 20 deletions(-)
Detailed changes
@@ -2,20 +2,10 @@ module github.com/charmbracelet/soft-serve
go 1.23.0
-require (
- github.com/dustin/go-humanize v1.0.1
- github.com/go-git/go-git/v5 v5.16.2
- github.com/matryer/is v1.4.1
- github.com/muesli/reflow v0.3.0
-)
-
require (
github.com/alecthomas/chroma/v2 v2.20.0
github.com/aymanbagabas/bubblezone/v2 v2.0.0-20250319214444-bb232f16d5e3
-)
-
-require (
- github.com/aymanbagabas/git-module v1.8.4-0.20231101154130-8d27204ac6d2
+ github.com/aymanbagabas/git-module v1.8.4-0.20250826192401-1f81c5471e53
github.com/caarlos0/duration v0.0.0-20240108180406-5d492514f3c7
github.com/caarlos0/env/v11 v11.3.1
github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250603123720-56bbc4a1ba66
@@ -29,6 +19,8 @@ require (
github.com/charmbracelet/ssh v0.0.0-20250128164007-98fd5ae11894
github.com/charmbracelet/wish/v2 v2.0.0-20250505151211-5996fc7c1f33
github.com/charmbracelet/x/ansi v0.9.3
+ github.com/dustin/go-humanize v1.0.1
+ github.com/go-git/go-git/v5 v5.16.2
github.com/go-jose/go-jose/v3 v3.0.4
github.com/gobwas/glob v0.2.3
github.com/golang-jwt/jwt/v5 v5.3.0
@@ -39,7 +31,9 @@ require (
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/jmoiron/sqlx v1.4.0
github.com/lib/pq v1.10.9
+ github.com/matryer/is v1.4.1
github.com/muesli/mango-cobra v1.2.0
+ github.com/muesli/reflow v0.3.0
github.com/muesli/roff v0.1.0
github.com/prometheus/client_golang v1.22.0
github.com/robfig/cron/v3 v3.0.1
@@ -12,8 +12,8 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/aymanbagabas/bubblezone/v2 v2.0.0-20250319214444-bb232f16d5e3 h1:1z2ihw0YUYUhNmRaavyXvG9ZU/9Tj0vj6sA3z5DFIJ8=
github.com/aymanbagabas/bubblezone/v2 v2.0.0-20250319214444-bb232f16d5e3/go.mod h1:sJwqZoo/BSKSizmr0pSJ758RuRsnjlkrOaxPtwlWtOs=
-github.com/aymanbagabas/git-module v1.8.4-0.20231101154130-8d27204ac6d2 h1:3w5KT+shE3hzWhORGiu2liVjEoaCEXm9uZP47+Gw4So=
-github.com/aymanbagabas/git-module v1.8.4-0.20231101154130-8d27204ac6d2/go.mod h1:d4gQ7/3/S2sPq4NnKdtAgUOVr6XtLpWFtxyVV5/+76U=
+github.com/aymanbagabas/git-module v1.8.4-0.20250826192401-1f81c5471e53 h1:KfKp+gVsQtuM9qb8Putvkx1jjAWqlvI1vdv5x9hdFoQ=
+github.com/aymanbagabas/git-module v1.8.4-0.20250826192401-1f81c5471e53/go.mod h1:d4gQ7/3/S2sPq4NnKdtAgUOVr6XtLpWFtxyVV5/+76U=
github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8=
github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
@@ -2,7 +2,6 @@ package cmd
import (
"fmt"
- "regexp"
"strings"
"time"
@@ -14,8 +13,6 @@ import (
"github.com/spf13/cobra"
)
-var shaRE = regexp.MustCompile(`^[a-fA-F0-9]{5,40}$`)
-
// commitCommand returns a command that prints the contents of a commit.
func commitCommand() *cobra.Command {
var color bool
@@ -32,10 +29,6 @@ func commitCommand() *cobra.Command {
repoName := args[0]
commitSHA := args[1]
- if !shaRE.MatchString(commitSHA) {
- return fmt.Errorf("invalid commit SHA: %s", commitSHA)
- }
-
rr, err := be.Repository(ctx, repoName)
if err != nil {
return err