From 68daeec0d899a85735d7ac865251e0a6723280bf Mon Sep 17 00:00:00 2001 From: Caitlin Elfring Date: Sat, 14 May 2022 19:04:22 -0400 Subject: [PATCH] [bugfix] Fix error when running with submodules (#194) * Bump go-get@v5.4.6 Pull in https://github.com/get-woke/go-git/pull/1 which adds including .git/info/exclude automatically * Remove .git/info/exclude from default ignores list since it's already handled by the go-get library --- go.mod | 2 +- go.sum | 4 ++-- pkg/ignore/ignore.go | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 21cc14df..a6bb25d9 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/caitlinelfring/go-env-default v1.0.0 github.com/fatih/color v1.13.0 github.com/get-woke/fastwalk v1.0.0 - github.com/get-woke/go-git/v5 v5.4.5 + github.com/get-woke/go-git/v5 v5.4.6 github.com/go-git/go-billy/v5 v5.3.1 github.com/mattn/go-colorable v0.1.12 github.com/mitchellh/go-homedir v1.1.0 diff --git a/go.sum b/go.sum index 8de84aec..8ef6fe46 100644 --- a/go.sum +++ b/go.sum @@ -99,8 +99,8 @@ github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWp github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/get-woke/fastwalk v1.0.0 h1:Ti8z9nf231TUhLzBuJQV/rh/b5qiuyPunYun4FpEshQ= github.com/get-woke/fastwalk v1.0.0/go.mod h1:WTDsePalrkZGMzdzn5YabupFqFmU/MjxGM2CSSc9sOo= -github.com/get-woke/go-git/v5 v5.4.5 h1:s6fLBDcbOFdCF49TBioH8PeD+TVsLrhYIpZxCLbDo1o= -github.com/get-woke/go-git/v5 v5.4.5/go.mod h1:FjlV7R/wWHBz6ksfGv7Q4r5P7CboJKSxPknWf6FmMf4= +github.com/get-woke/go-git/v5 v5.4.6 h1:A8eJI4lb1y9VYhAoUdbNpZ8B8bYjkNKQmjpgbMnYOz4= +github.com/get-woke/go-git/v5 v5.4.6/go.mod h1:FjlV7R/wWHBz6ksfGv7Q4r5P7CboJKSxPknWf6FmMf4= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= diff --git a/pkg/ignore/ignore.go b/pkg/ignore/ignore.go index 42758f08..6be035de 100644 --- a/pkg/ignore/ignore.go +++ b/pkg/ignore/ignore.go @@ -23,7 +23,6 @@ var defaultIgnoreFiles = []string{ ".gitignore", ".ignore", ".wokeignore", - ".git/info/exclude", } // Given a workingDir (example: /root/proj/subDir/curDir)