Skip to content

Commit fc3e2dc

Browse files
committedAug 24, 2024
Revert "fix: normalise path separators on Windows to fix sub-package tags (#165)"
This reverts commit 6862035.
1 parent 9d87b71 commit fc3e2dc

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed
 

‎main.go

+5-10
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"fmt"
55
"os"
66
"path"
7-
"path/filepath"
87
"runtime/debug"
98
"strings"
109

@@ -54,15 +53,11 @@ func defaults(flag string) string {
5453

5554
cwd, wdErr := os.Getwd()
5655
gitRoot, grErr := git.Root()
57-
if wdErr == nil && grErr == nil {
58-
cwd = filepath.Clean(cwd)
59-
gitRoot = filepath.Clean(gitRoot)
60-
if cwd != gitRoot {
61-
prefix := strings.TrimPrefix(cwd, gitRoot)
62-
prefix = strings.TrimPrefix(prefix, string(os.PathSeparator))
63-
prefix = strings.TrimSuffix(prefix, string(os.PathSeparator))
64-
return path.Join(prefix, pat)
65-
}
56+
if wdErr == nil && grErr == nil && cwd != gitRoot {
57+
prefix := strings.TrimPrefix(cwd, gitRoot)
58+
prefix = strings.TrimPrefix(prefix, string(os.PathSeparator))
59+
prefix = strings.TrimSuffix(prefix, string(os.PathSeparator))
60+
return path.Join(prefix, pat)
6661
}
6762

6863
return def

0 commit comments

Comments
 (0)
Please sign in to comment.