Merge pull request #96 from geniass/master

list: traverse nested dir symlinks
odeke-em · Mar 12, 2015 · 1b3779a · 1b3779a
2 parents 7f7dea5 + b41f959
commit 1b3779a
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/push.go b/src/push.go
@@ -410,13 +410,12 @@ func list(context *config.Context, p string, hidden bool, ignore *regexp.Regexp)
 
 			symlink := (file.Mode() & os.ModeSymlink) != 0
 			if symlink {
-				fChan, cErr := list(context, gopath.Join(p, file.Name()), hidden, ignore)
-				if cErr != nil {
-					continue
-				}
-				for child := range fChan {
-					fileChan <- child
-				}
+				symAbsPath := gopath.Join(absPath, file.Name())
+				var symInfo string
+				symInfo, err = filepath.EvalSymlinks(symAbsPath)
+				var symFile os.FileInfo
+				symFile, err = os.Stat(symInfo)
+				fileChan <- NewLocalFile(symAbsPath, symFile)
 			}
 		}
 		close(fileChan)