Remove NoFollow

Remove NoFollow added in fsnotify#631 / 53b06a8, as it's not really possible to
implement this correctly on all kqueue platforms.

Author: arp242

backend_inotify.go

@@ -193,9 +193,6 @@ func (w *inotify) AddWith(path string, opts ...addOpt) error {
 
 	add := func(path string, with withOpts, wf watchFlag) error {
 		var flags uint32
-		if with.noFollow {
-			flags |= unix.IN_DONT_FOLLOW
-		}
 		if with.op.Has(Create) {
 			flags |= unix.IN_CREATE
 		}

fsnotify.go

@@ -410,7 +410,6 @@ type (
 	withOpts struct {
 		bufsize    int
 		op         Op
-		noFollow   bool
 		sendCreate bool
 	}
 )
@@ -469,12 +468,6 @@ func withOps(op Op) addOpt {
 	return func(opt *withOpts) { opt.op = op }
 }
 
-// WithNoFollow disables following symlinks, so the symlinks themselves are
-// watched.
-func withNoFollow() addOpt {
-	return func(opt *withOpts) { opt.noFollow = true }
-}
-
 // "Internal" option for recursive watches on inotify.
 func withCreate() addOpt {
 	return func(opt *withOpts) { opt.sendCreate = true }

helpers_test.go

@@ -671,15 +671,6 @@ func supportsRename() bool {
 	}
 }
 
-func supportsNofollow(t *testing.T) {
-	switch runtime.GOOS {
-	case "linux":
-		// Run test.
-	default:
-		t.Skip("withNoFollow() not yet supported on " + runtime.GOOS)
-	}
-}
-
 func tmppath(tmp, s string) string {
 	if len(s) == 0 {
 		return ""
@@ -823,8 +814,6 @@ loop:
 				supportsRecurse(t)
 			case "filter":
 				supportsFilter(t)
-			case "nofollow":
-				supportsNofollow(t)
 			case "windows":
 				if runtime.GOOS == "windows" {
 					t.Skip("Skipping on Windows")
@@ -871,15 +860,6 @@ loop:
 				continue
 			}
 
-			var follow addOpt
-			for i := range c.args {
-				if c.args[i] == "nofollow" || c.args[i] == "no-follow" {
-					c.args = append(c.args[:i], c.args[i+1:]...)
-					follow = withNoFollow()
-					break
-				}
-			}
-
 			var op Op
 			for _, o := range c.args[1:] {
 				switch strings.ToLower(o) {
@@ -909,7 +889,7 @@ loop:
 			}
 			do = append(do, func() {
 				p := tmppath(tmp, c.args[0])
-				err := w.w.AddWith(p, withOps(op), follow)
+				err := w.w.AddWith(p, withOps(op))
 				if err != nil {
 					t.Fatalf("line %d: addWatch(%q): %s", c.line+1, p, err)
 				}