aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2020-10-24 22:19:56 +0200
committerMichael Muré <batolettre@gmail.com>2020-10-24 22:19:56 +0200
commit064a96f808d0affc3240ab28036df69d95496335 (patch)
tree4051458c179580ad8ff25d6483883c6481f4b487
parent88126f9a64d05d17d193197cf237c6ce4e300899 (diff)
downloadgit-bug-064a96f808d0affc3240ab28036df69d95496335.tar.gz
repository: fix incorrect git dir on the git CLI implementation
-rw-r--r--go.sum2
-rw-r--r--repository/git.go2
2 files changed, 3 insertions, 1 deletions
diff --git a/go.sum b/go.sum
index 006336f9..f33b62eb 100644
--- a/go.sum
+++ b/go.sum
@@ -138,6 +138,7 @@ github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428 h1:Mo9W14pwbO9VfRe+y
github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428/go.mod h1:uhpZMVGznybq1itEKXj6RYw9I71qK4kH+OGMjRC4KEo=
github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
@@ -379,6 +380,7 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/repository/git.go b/repository/git.go
index dba2d29d..504cdd89 100644
--- a/repository/git.go
+++ b/repository/git.go
@@ -45,7 +45,7 @@ func NewGitRepo(path string, clockLoaders []ClockLoader) (*GitRepo, error) {
}
// Check the repo and retrieve the root path
- stdout, err := repo.runGitCommand("rev-parse", "--git-dir")
+ stdout, err := repo.runGitCommand("rev-parse", "--absolute-git-dir")
// Now dir is fetched with "git rev-parse --git-dir". May be it can
// still return nothing in some cases. Then empty stdout check is