Merge branch 'dpb587-pivotal-patch-2'

doublestar.go

@@ -208,6 +208,12 @@ func doGlob(basedir string, components, matches []string) (m []string, e error)
   if components[patIdx] == "**" {
     // if the current component is a doublestar, we'll try depth-first
     for _, file := range files {
+      // if symlink, we may want to follow
+      if file.Mode() & os.ModeSymlink != 0 {
+        file, err = os.Stat(filepath.Join(basedir, file.Name()))
+        if err != nil { continue }
+      }
+
       if file.IsDir() {
         if lastComponent {
           m = append(m, filepath.Join(basedir, file.Name()))

doublestar_test.go

@@ -86,6 +86,7 @@ var matchTests = []MatchTest{
   {"broken-symlink", "broken-symlink", true, nil, true},
   {"working-symlink/c/*", "working-symlink/c/d", true, nil, true},
   {"working-sym*/*", "working-symlink/c", true, nil, true},
+  {"b/**/f", "b/symlink-dir/f", true, nil, true},
 }
 
 func TestMatch(t *testing.T) {

test/b/symlink-dir

@@ -0,0 +1 @@
+../axbxcxdxe/