Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 51 additions & 3 deletions tree_entry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func TestEntries_Sort(t *testing.T) {
}

func TestEntries_CommitsInfo(t *testing.T) {
tree, err := testrepo.LsTree("0eedd79eba4394bbef888c804e899731644367fe")
tree, err := testrepo.LsTree("cfc3b2993f74726356887a5ec093de50486dc617")
if err != nil {
t.Fatal(err)
}
Expand All @@ -130,7 +130,7 @@ func TestEntries_CommitsInfo(t *testing.T) {
t.Fatal(err)
}

t.Run("", func(t *testing.T) {
t.Run("general directory", func(t *testing.T) {
es, err := tree.Entries()
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -226,6 +226,13 @@ func TestEntries_CommitsInfo(t *testing.T) {
Commit: &Commit{
ID: MustIDFromString("0eedd79eba4394bbef888c804e899731644367fe"),
},
}, {
Entry: &TreeEntry{
name: "sameSHAs",
},
Commit: &Commit{
ID: MustIDFromString("cfc3b2993f74726356887a5ec093de50486dc617"),
},
}, {
Entry: &TreeEntry{
name: "src",
Expand All @@ -241,7 +248,7 @@ func TestEntries_CommitsInfo(t *testing.T) {
}
})

t.Run("", func(t *testing.T) {
t.Run("directory with submodule", func(t *testing.T) {
subtree, err := tree.Subtree("gogs")
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -274,4 +281,45 @@ func TestEntries_CommitsInfo(t *testing.T) {
assert.Equal(t, expInfos[i].Commit.ID.String(), infos[i].Commit.ID.String(), "idx: %d", i)
}
})

t.Run("direcotry with files have same SHA", func(t *testing.T) {
subtree, err := tree.Subtree("sameSHAs")
if err != nil {
t.Fatal(err)
}

es, err := subtree.Entries()
if err != nil {
t.Fatal(err)
}

infos, err := es.CommitsInfo(c, CommitsInfoOptions{
Path: "sameSHAs",
})
if err != nil {
t.Fatal(err)
}

expInfos := []*EntryCommitInfo{
{
Entry: &TreeEntry{
name: "file1.txt",
},
Commit: &Commit{
ID: MustIDFromString("cfc3b2993f74726356887a5ec093de50486dc617"),
},
}, {
Entry: &TreeEntry{
name: "file2.txt",
},
Commit: &Commit{
ID: MustIDFromString("cfc3b2993f74726356887a5ec093de50486dc617"),
},
},
}
for i := range expInfos {
assert.Equal(t, expInfos[i].Entry.Name(), infos[i].Entry.Name(), "idx: %d", i)
assert.Equal(t, expInfos[i].Commit.ID.String(), infos[i].Commit.ID.String(), "idx: %d", i)
}
})
}