fix: incorrect formatting of commits with mixed line endings (#121)

purpleclay · May 16, 2024 · 88b1cc5 · 88b1cc5
1 parent 19d8b8b
commit 88b1cc5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -16,7 +16,7 @@
         devShells.default = mkShell {
           buildInputs = [
             git
-            go_1_22
+            go
             gofumpt
             golangci-lint
             go-task

diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/muesli/roff v0.1.0
 	github.com/muesli/termenv v0.15.2
 	github.com/purpleclay/chomp v0.2.0
-	github.com/purpleclay/gitz v0.8.0
+	github.com/purpleclay/gitz v0.8.1
 	github.com/purpleclay/lipgloss-theme v0.1.0
 	github.com/saracen/walker v0.1.4
 	github.com/spf13/cobra v1.8.0
@@ -33,7 +33,7 @@ require (
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/term v0.8.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	mvdan.cc/sh/v3 v3.7.0 // indirect

diff --git a/go.sum b/go.sum
@@ -46,6 +46,8 @@ github.com/purpleclay/chomp v0.2.0 h1:6HyXhHFrgSq4LVmjAgCKAOyylJxZvreefZn8zWgS6W
 github.com/purpleclay/chomp v0.2.0/go.mod h1:sLfbgCsf5/Z0hf+Xzg2+Qn8Ei5RpP5tidiLklcFOT70=
 github.com/purpleclay/gitz v0.8.0 h1:hScHgk7eOHp7gku9kS168ei706Ydi22SCSdgL/M12F0=
 github.com/purpleclay/gitz v0.8.0/go.mod h1:yDVD7c+yc9PeKMhHy0sTH4maHDrTb+iOOplwNoJB0J8=
+github.com/purpleclay/gitz v0.8.1 h1:khRYDXKJttnVRtRmHl8CEOO7nA9dlbAQGSaarzn8LMM=
+github.com/purpleclay/gitz v0.8.1/go.mod h1:k8LXGzHyf5gt+PQBpsJNN+jGm9qvJn0IELcI7aTZJHA=
 github.com/purpleclay/lipgloss-theme v0.1.0 h1:Y8PHOfwGxOJQfODEPrUT25/8jck7pWTojXpI4jb8BWI=
 github.com/purpleclay/lipgloss-theme v0.1.0/go.mod h1:ndYEFXaLiFWq3xuzg7vCKlwNkEZTrxM9YuS2PgJ3WeI=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -66,8 +68,8 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8
 golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ @@
             devShells.default = mkShell {
               buildInputs = [
                 git
-                go_1_22
+                go
                 gofumpt
                 golangci-lint
                 go-task
@@ Expand Down @@