From 59b68f979417158013df1f8f13f5076a80e56b1f Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 6 Jul 2025 15:43:24 +0200 Subject: [PATCH 1/2] Clean up .gitignore Globally ignoring all dot files and then making exceptions as needed to pull files back in again is very error prone. It's better to explicitly exclude everything we want to hide. This can be seen in the vendor directory, where we omitted a lot of files accidentally (we'll fix that in the next commit). None of these were important, so no harm done, but still. The reason why this came up is that I tried to look at the git history of one of the files in .github/workflows/ using lazygit's path filtering feature, but it didn't show up in the list of suggestions. It took me a while to realize that that's because this list doesn't show git-ignored files. Now, .github/workflows/ wasn't really git-ignored because it was brought back by an exclamation mark entry in the Exceptions section; but maybe the library we are using to get the files doesn't handle these properly or something (I didn't further research this). --- .gitignore | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index b45afa96f..e9c93214f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,6 @@ # Logs *.log -# Hidden -.* -!.codespellrc - # Notes *.notes @@ -14,24 +10,14 @@ test/repos/repo coverage.txt +# JetBrains stuff +.idea/ + # Binaries +.bin/ lazygit lazygit.exe -# Exceptions -!.gitignore -!.gitattributes -!.goreleaser.yml -!.golangci.yml -!.circleci/ -!.github/ -!.vscode/ -!.devcontainer/ - -# these are for our integration tests -!.git_keep -!.gitmodules_keep - test/git_server/data test/_results/** From f8865c418298be6c9750bd1cf8d69736f905984d Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 6 Jul 2025 15:44:18 +0200 Subject: [PATCH 2/2] Bring back files from vendor directory that we accidentally excluded --- vendor/dario.cat/mergo/.deepsource.toml | 12 +++++++++ vendor/dario.cat/mergo/.travis.yml | 12 +++++++++ .../github.com/atotto/clipboard/.travis.yml | 22 ++++++++++++++++ .../github.com/buger/jsonparser/.travis.yml | 11 ++++++++ .../cloudfoundry/jibber_jabber/.travis.yml | 11 ++++++++ .../github.com/gdamore/encoding/.appveyor.yml | 13 ++++++++++ .../github.com/gdamore/tcell/v2/.appveyor.yml | 13 ++++++++++ .../github.com/gdamore/tcell/v2/.travis.yml | 18 +++++++++++++ .../github.com/go-errors/errors/.travis.yml | 7 +++++ .../github.com/go-logfmt/logfmt/.travis.yml | 18 +++++++++++++ vendor/github.com/gobwas/glob/.travis.yml | 9 +++++++ vendor/github.com/integrii/flaggy/.travis.yml | 7 +++++ .../github.com/kevinburke/ssh_config/.mailmap | 1 + vendor/github.com/mitchellh/go-ps/.travis.yml | 4 +++ vendor/github.com/sahilm/fuzzy/.editorconfig | 18 +++++++++++++ vendor/github.com/sahilm/fuzzy/.travis.yml | 5 ++++ vendor/github.com/samber/lo/.travis.yml | 7 +++++ .../github.com/sanity-io/litter/.travis.yml | 7 +++++ .../sasha-s/go-deadlock/.travis.yml | 26 +++++++++++++++++++ vendor/github.com/sirupsen/logrus/.travis.yml | 15 +++++++++++ vendor/github.com/spkg/bom/.travis.yml | 16 ++++++++++++ 21 files changed, 252 insertions(+) create mode 100644 vendor/dario.cat/mergo/.deepsource.toml create mode 100644 vendor/dario.cat/mergo/.travis.yml create mode 100644 vendor/github.com/atotto/clipboard/.travis.yml create mode 100644 vendor/github.com/buger/jsonparser/.travis.yml create mode 100644 vendor/github.com/cloudfoundry/jibber_jabber/.travis.yml create mode 100644 vendor/github.com/gdamore/encoding/.appveyor.yml create mode 100644 vendor/github.com/gdamore/tcell/v2/.appveyor.yml create mode 100644 vendor/github.com/gdamore/tcell/v2/.travis.yml create mode 100644 vendor/github.com/go-errors/errors/.travis.yml create mode 100644 vendor/github.com/go-logfmt/logfmt/.travis.yml create mode 100644 vendor/github.com/gobwas/glob/.travis.yml create mode 100644 vendor/github.com/integrii/flaggy/.travis.yml create mode 100644 vendor/github.com/kevinburke/ssh_config/.mailmap create mode 100644 vendor/github.com/mitchellh/go-ps/.travis.yml create mode 100644 vendor/github.com/sahilm/fuzzy/.editorconfig create mode 100644 vendor/github.com/sahilm/fuzzy/.travis.yml create mode 100644 vendor/github.com/samber/lo/.travis.yml create mode 100644 vendor/github.com/sanity-io/litter/.travis.yml create mode 100644 vendor/github.com/sasha-s/go-deadlock/.travis.yml create mode 100644 vendor/github.com/sirupsen/logrus/.travis.yml create mode 100644 vendor/github.com/spkg/bom/.travis.yml diff --git a/vendor/dario.cat/mergo/.deepsource.toml b/vendor/dario.cat/mergo/.deepsource.toml new file mode 100644 index 000000000..a8bc979e0 --- /dev/null +++ b/vendor/dario.cat/mergo/.deepsource.toml @@ -0,0 +1,12 @@ +version = 1 + +test_patterns = [ + "*_test.go" +] + +[[analyzers]] +name = "go" +enabled = true + + [analyzers.meta] + import_path = "dario.cat/mergo" \ No newline at end of file diff --git a/vendor/dario.cat/mergo/.travis.yml b/vendor/dario.cat/mergo/.travis.yml new file mode 100644 index 000000000..d324c43ba --- /dev/null +++ b/vendor/dario.cat/mergo/.travis.yml @@ -0,0 +1,12 @@ +language: go +arch: + - amd64 + - ppc64le +install: + - go get -t + - go get golang.org/x/tools/cmd/cover + - go get github.com/mattn/goveralls +script: + - go test -race -v ./... +after_script: + - $HOME/gopath/bin/goveralls -service=travis-ci -repotoken $COVERALLS_TOKEN diff --git a/vendor/github.com/atotto/clipboard/.travis.yml b/vendor/github.com/atotto/clipboard/.travis.yml new file mode 100644 index 000000000..23f21d836 --- /dev/null +++ b/vendor/github.com/atotto/clipboard/.travis.yml @@ -0,0 +1,22 @@ +language: go + +os: + - linux + - osx + - windows + +go: + - go1.13.x + - go1.x + +services: + - xvfb + +before_install: + - export DISPLAY=:99.0 + +script: + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install xsel; fi + - go test -v . + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install xclip; fi + - go test -v . diff --git a/vendor/github.com/buger/jsonparser/.travis.yml b/vendor/github.com/buger/jsonparser/.travis.yml new file mode 100644 index 000000000..dbfb7cf98 --- /dev/null +++ b/vendor/github.com/buger/jsonparser/.travis.yml @@ -0,0 +1,11 @@ +language: go +arch: + - amd64 + - ppc64le +go: + - 1.7.x + - 1.8.x + - 1.9.x + - 1.10.x + - 1.11.x +script: go test -v ./. diff --git a/vendor/github.com/cloudfoundry/jibber_jabber/.travis.yml b/vendor/github.com/cloudfoundry/jibber_jabber/.travis.yml new file mode 100644 index 000000000..b19c2e535 --- /dev/null +++ b/vendor/github.com/cloudfoundry/jibber_jabber/.travis.yml @@ -0,0 +1,11 @@ +language: go +go: + - 1.2 +before_install: +- go get github.com/onsi/ginkgo/... +- go get github.com/onsi/gomega/... +- go install github.com/onsi/ginkgo/ginkgo +script: PATH=$PATH:$HOME/gopath/bin ginkgo -r . +branches: + only: + - master diff --git a/vendor/github.com/gdamore/encoding/.appveyor.yml b/vendor/github.com/gdamore/encoding/.appveyor.yml new file mode 100644 index 000000000..19a4c5ddf --- /dev/null +++ b/vendor/github.com/gdamore/encoding/.appveyor.yml @@ -0,0 +1,13 @@ +version: 1.0.{build} +clone_folder: c:\gopath\src\github.com\gdamore\encoding +environment: + GOPATH: c:\gopath +build_script: +- go version +- go env +- SET PATH=%LOCALAPPDATA%\atom\bin;%GOPATH%\bin;%PATH% +- go get -t ./... +- go build +- go install ./... +test_script: +- go test ./... diff --git a/vendor/github.com/gdamore/tcell/v2/.appveyor.yml b/vendor/github.com/gdamore/tcell/v2/.appveyor.yml new file mode 100644 index 000000000..435dfe3a8 --- /dev/null +++ b/vendor/github.com/gdamore/tcell/v2/.appveyor.yml @@ -0,0 +1,13 @@ +version: 1.0.{build} +clone_folder: c:\gopath\src\github.com\gdamore\tcell +environment: + GOPATH: c:\gopath +build_script: +- go version +- go env +- SET PATH=%LOCALAPPDATA%\atom\bin;%GOPATH%\bin;%PATH% +- go get -t ./... +- go build +- go install ./... +test_script: +- go test ./... diff --git a/vendor/github.com/gdamore/tcell/v2/.travis.yml b/vendor/github.com/gdamore/tcell/v2/.travis.yml new file mode 100644 index 000000000..967b5b335 --- /dev/null +++ b/vendor/github.com/gdamore/tcell/v2/.travis.yml @@ -0,0 +1,18 @@ +language: go + +go: + - 1.15.x + - master + +arch: + - amd64 + - ppc64le + +before_install: + - go get -t -v ./... + +script: + - go test -race -coverprofile=coverage.txt -covermode=atomic + +after_success: + - bash <(curl -s https://codecov.io/bash) diff --git a/vendor/github.com/go-errors/errors/.travis.yml b/vendor/github.com/go-errors/errors/.travis.yml new file mode 100644 index 000000000..1dc296026 --- /dev/null +++ b/vendor/github.com/go-errors/errors/.travis.yml @@ -0,0 +1,7 @@ +language: go + +go: + - "1.8.x" + - "1.11.x" + - "1.16.x" + - "1.21.x" diff --git a/vendor/github.com/go-logfmt/logfmt/.travis.yml b/vendor/github.com/go-logfmt/logfmt/.travis.yml new file mode 100644 index 000000000..513930989 --- /dev/null +++ b/vendor/github.com/go-logfmt/logfmt/.travis.yml @@ -0,0 +1,18 @@ +language: go +sudo: false +go: + - "1.7.x" + - "1.8.x" + - "1.9.x" + - "1.10.x" + - "1.11.x" + - "1.12.x" + - "1.13.x" + - "tip" + +before_install: + - go get github.com/mattn/goveralls + - go get golang.org/x/tools/cmd/cover + +script: + - goveralls -service=travis-ci diff --git a/vendor/github.com/gobwas/glob/.travis.yml b/vendor/github.com/gobwas/glob/.travis.yml new file mode 100644 index 000000000..e8a276826 --- /dev/null +++ b/vendor/github.com/gobwas/glob/.travis.yml @@ -0,0 +1,9 @@ +sudo: false + +language: go + +go: + - 1.5.3 + +script: + - go test -v ./... diff --git a/vendor/github.com/integrii/flaggy/.travis.yml b/vendor/github.com/integrii/flaggy/.travis.yml new file mode 100644 index 000000000..4e0d644fa --- /dev/null +++ b/vendor/github.com/integrii/flaggy/.travis.yml @@ -0,0 +1,7 @@ +{ + "language": "go", + "os": "linux", + "group": "stable", + "dist": "trusty", + "script": "go get -v && go test -v" +} diff --git a/vendor/github.com/kevinburke/ssh_config/.mailmap b/vendor/github.com/kevinburke/ssh_config/.mailmap new file mode 100644 index 000000000..253406b1c --- /dev/null +++ b/vendor/github.com/kevinburke/ssh_config/.mailmap @@ -0,0 +1 @@ +Kevin Burke Kevin Burke diff --git a/vendor/github.com/mitchellh/go-ps/.travis.yml b/vendor/github.com/mitchellh/go-ps/.travis.yml new file mode 100644 index 000000000..8f794f71d --- /dev/null +++ b/vendor/github.com/mitchellh/go-ps/.travis.yml @@ -0,0 +1,4 @@ +language: go + +go: + - 1.2.1 diff --git a/vendor/github.com/sahilm/fuzzy/.editorconfig b/vendor/github.com/sahilm/fuzzy/.editorconfig new file mode 100644 index 000000000..8a8f6a579 --- /dev/null +++ b/vendor/github.com/sahilm/fuzzy/.editorconfig @@ -0,0 +1,18 @@ +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +indent_style = space +indent_size = 2 + +[*.sh] +indent_size = 4 + +[Makefile] +indent_style = tab +indent_size = 4 + +[*.go] +indent_style = tab +indent_size = 4 diff --git a/vendor/github.com/sahilm/fuzzy/.travis.yml b/vendor/github.com/sahilm/fuzzy/.travis.yml new file mode 100644 index 000000000..6756d8009 --- /dev/null +++ b/vendor/github.com/sahilm/fuzzy/.travis.yml @@ -0,0 +1,5 @@ +language: go +go: + - 1.x +script: + - make diff --git a/vendor/github.com/samber/lo/.travis.yml b/vendor/github.com/samber/lo/.travis.yml new file mode 100644 index 000000000..f0de7f51c --- /dev/null +++ b/vendor/github.com/samber/lo/.travis.yml @@ -0,0 +1,7 @@ +language: go +before_install: + - go mod download + - make tools +go: + - "1.18" +script: make test diff --git a/vendor/github.com/sanity-io/litter/.travis.yml b/vendor/github.com/sanity-io/litter/.travis.yml new file mode 100644 index 000000000..ec9381c95 --- /dev/null +++ b/vendor/github.com/sanity-io/litter/.travis.yml @@ -0,0 +1,7 @@ +arch: +- amd64 +- ppc64le + +language: go +go: +- 1.14.x diff --git a/vendor/github.com/sasha-s/go-deadlock/.travis.yml b/vendor/github.com/sasha-s/go-deadlock/.travis.yml new file mode 100644 index 000000000..5180de6ad --- /dev/null +++ b/vendor/github.com/sasha-s/go-deadlock/.travis.yml @@ -0,0 +1,26 @@ +arch: + - amd64 + - ppc64le +language: go +sudo: false +go: + - 1.9.x + - 1.10.x + - 1.11.x + - 1.12.x + - 1.13.x + - 1.14.x + - 1.15.x + - 1.16.x + - master + - tip + +before_install: + - go get golang.org/x/tools/cmd/cover + - go get -t -v ./... + +script: + - ./test.sh + +after_success: + - bash <(curl -s https://codecov.io/bash) diff --git a/vendor/github.com/sirupsen/logrus/.travis.yml b/vendor/github.com/sirupsen/logrus/.travis.yml new file mode 100644 index 000000000..c1dbd5a3a --- /dev/null +++ b/vendor/github.com/sirupsen/logrus/.travis.yml @@ -0,0 +1,15 @@ +language: go +go_import_path: github.com/sirupsen/logrus +git: + depth: 1 +env: + - GO111MODULE=on +go: 1.15.x +os: linux +install: + - ./travis/install.sh +script: + - cd ci + - go run mage.go -v -w ../ crossBuild + - go run mage.go -v -w ../ lint + - go run mage.go -v -w ../ test diff --git a/vendor/github.com/spkg/bom/.travis.yml b/vendor/github.com/spkg/bom/.travis.yml new file mode 100644 index 000000000..561da2ccf --- /dev/null +++ b/vendor/github.com/spkg/bom/.travis.yml @@ -0,0 +1,16 @@ +language: go +go: + - 1.6 + - 1.5 + - 1.4 + - 1.3 + +install: + - go get github.com/stretchr/testify/assert + - go get golang.org/x/tools/cmd/cover + - go get github.com/mattn/goveralls + +script: + - go test -v -covermode=count -coverprofile=coverage.out + - $(go env GOPATH | awk 'BEGIN{FS=":"} {print $1}')/bin/goveralls -coverprofile=coverage.out -service=travis-ci +