Skip to content

Commit 439d8ae

Browse files
nervghalexey-igrychev
authored andcommitted
fix(giterminism): resolve naming confusion about dot git
Signed-off-by: Alexandr Zaytsev <alexandr.zaytsev@flant.com>
1 parent 03e435a commit 439d8ae

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pkg/true_git/work_tree.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,21 +178,21 @@ func verifyWorkTreeConsistency(ctx context.Context, repoDir, workTreeDir string)
178178
return false, err
179179
}
180180

181-
resolvedGitDir, err := resolveDotGitFile(ctx, dotGitFilePath)
181+
resolvedGitFile, err := resolveDotGitFile(ctx, dotGitFilePath)
182182
if err != nil {
183183
return false, fmt.Errorf("unable to resolve dot-git file %q: %w", filepath.Join(workTreeDir, ".git"), err)
184184
}
185185

186-
if !util.IsSubpathOfBasePath(repoDir, resolvedGitDir) {
186+
if !util.IsSubpathOfBasePath(repoDir, resolvedGitFile) {
187187
return false, nil
188188
}
189189

190-
_, err = os.Stat(resolvedGitDir)
190+
_, err = os.Stat(resolvedGitFile)
191191
switch {
192192
case os.IsNotExist(err):
193193
return false, nil
194194
case err != nil:
195-
return false, fmt.Errorf("error accessing resolved dot git dir %q: %w", resolvedGitDir, err)
195+
return false, fmt.Errorf("error accessing resolved dot git file %q: %w", resolvedGitFile, err)
196196
}
197197

198198
return true, nil

0 commit comments

Comments
 (0)