try next level after upper level is included (#1897)

pkg/sync/sync.go

@@ -796,7 +796,11 @@ func matchKey(rules []rule, key string) bool {
 				logger.Fatalf("match %s with %s: %v", rule.pattern, suffix, err)
 			}
 			if ok {
-				return rule.include
+				if rule.include {
+					break // try next level
+				} else {
+					return false
+				}
 			}
 		}
 	}

pkg/sync/sync_test.go

@@ -533,7 +533,7 @@ func TestSuffixForPath(t *testing.T) {
 	}
 	for _, tt := range tests {
 		if got := suffixForPattern(tt.key, tt.pattern); !reflect.DeepEqual(got, tt.want) {
-			t.Errorf("slidingWindowForPath() = %v, want %v", got, tt.want)
+			t.Errorf("suffixForPattern() = %v, want %v", got, tt.want)
 		}
 	}
 }
@@ -562,10 +562,11 @@ func TestMatchObjects(t *testing.T) {
 		{rules: []rule{{pattern: "a.go", include: true}, {pattern: "pkg", include: false}}, key: "a/pkg/c/a.go", want: false},
 		{rules: []rule{{pattern: "a", include: false}, {pattern: "pkg", include: true}}, key: "a/pkg/c/a.go", want: false},
 		{rules: []rule{{pattern: "a.go", include: true}, {pattern: "pkg", include: false}}, key: "", want: true},
+		{rules: []rule{{pattern: "a", include: true}, {pattern: "b/", include: false}, {pattern: "c", include: true}}, key: "a/b/c", want: false},
 	}
 	for _, tt := range tests {
 		if got := matchKey(tt.rules, tt.key); got != tt.want {
-			t.Errorf("includeObject() = %v, want %v", got, tt.want)
+			t.Errorf("matchKey() = %v, want %v", got, tt.want)
 		}
 	}
 }