diff options
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | gitignore.go | 4 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | sync.go | 3 | ||||
| -rw-r--r-- | watcher.go | 8 |
5 files changed, 12 insertions, 7 deletions
@@ -1,4 +1,4 @@ -FROM golang:1.22-alpine AS builder +FROM golang:1.24-alpine AS builder WORKDIR /src COPY go.mod go.sum ./ RUN go mod download diff --git a/gitignore.go b/gitignore.go index 569e191..2c9fc4b 100644 --- a/gitignore.go +++ b/gitignore.go @@ -50,8 +50,8 @@ func (s *GitignoreStack) IsIgnored(relPath string) bool { continue } - posMatch := layer.posRules != nil && layer.posRules.MatchesPath(childRel) - negMatch := layer.negRules != nil && layer.negRules.MatchesPath(childRel) + posMatch := layer.posRules != nil && (layer.posRules.MatchesPath(childRel) || layer.posRules.MatchesPath(childRel+"/")) + negMatch := layer.negRules != nil && (layer.negRules.MatchesPath(childRel) || layer.negRules.MatchesPath(childRel+"/")) if negMatch { result = false @@ -1,6 +1,6 @@ module sourcewatch -go 1.26.4 +go 1.24 require ( github.com/fsnotify/fsnotify v1.10.1 @@ -5,11 +5,13 @@ import ( "log" "os" "path/filepath" + "time" ) type FileMeta struct { Size int64 Mode os.FileMode + ModTime time.Time Symlink string } @@ -65,6 +67,7 @@ func initialSync(hostDir, dataDir string, stack *GitignoreStack, dryRun bool) (* meta := FileMeta{ Size: info.Size(), Mode: info.Mode(), + ModTime: info.ModTime(), Symlink: linkTarget, } manifest.Files[relPath] = meta @@ -127,6 +127,7 @@ func syncCreate(srcPath, destPath, relPath string, manifest *Manifest, stack *Gi meta := FileMeta{ Size: info.Size(), Mode: info.Mode(), + ModTime: info.ModTime(), Symlink: linkTarget, } manifest.Files[relPath] = meta @@ -161,13 +162,14 @@ func syncWrite(srcPath, destPath, relPath string, manifest *Manifest, dryRun, ve } meta, exists := manifest.Files[relPath] - if exists && meta.Size == info.Size() && meta.Mode == info.Mode() { + if exists && meta.Size == info.Size() && meta.Mode == info.Mode() && meta.ModTime.Equal(info.ModTime()) { return } manifest.Files[relPath] = FileMeta{ - Size: info.Size(), - Mode: info.Mode(), + Size: info.Size(), + Mode: info.Mode(), + ModTime: info.ModTime(), } if dryRun { |
