Set the empty digest for empty directories when flattening a tree (#154)

Co-authored-by: jpoole <[email protected]>
bazelbuild · Jul 9, 2020 · bafedfc · bafedfc
1 parent f9b4b0d
commit bafedfc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/go/pkg/tree/tree.go b/go/pkg/tree/tree.go
@@ -268,6 +268,7 @@ func flattenTree(root digest.Digest, rootPath string, dirs map[digest.Digest]*re
 		if len(dir.Files)+len(dir.Directories)+len(dir.Symlinks) == 0 {
 			flatFiles[flatDir.p] = &Output{
 				Path:             flatDir.p,
+				Digest:           digest.Empty,
 				IsEmptyDirectory: true,
 			}
 			continue

diff --git a/go/pkg/tree/tree_test.go b/go/pkg/tree/tree_test.go
@@ -1032,13 +1032,13 @@ func TestFlattenTreeRepeated(t *testing.T) {
 	}
 	wantOutputs := map[string]*Output{
 		"x/baz":     &Output{Digest: bazDigest},
-		"x/a/b/c":   &Output{IsEmptyDirectory: true},
+		"x/a/b/c":   &Output{IsEmptyDirectory: true, Digest: digest.Empty},
 		"x/a/b/foo": &Output{Digest: fooDigest},
 		"x/a/b/bar": &Output{Digest: barDigest, IsExecutable: true},
-		"x/b/c":     &Output{IsEmptyDirectory: true},
+		"x/b/c":     &Output{IsEmptyDirectory: true, Digest: digest.Empty},
 		"x/b/foo":   &Output{Digest: fooDigest},
 		"x/b/bar":   &Output{Digest: barDigest, IsExecutable: true},
-		"x/c":       &Output{IsEmptyDirectory: true},
+		"x/c":       &Output{IsEmptyDirectory: true, Digest: digest.Empty},
 	}
 	if len(outputs) != len(wantOutputs) {
 		t.Errorf("FlattenTree gave wrong number of outputs: want %d, got %d", len(wantOutputs), len(outputs))