Merge pull request #3 from novaeye/patch-1

try to fix  Duplicate of files in directory (gogs#2254 )

Author: unknwon

tree_entry.go

@@ -109,9 +109,9 @@ func (tes Entries) Sort() {
 }
 
 type commitInfo struct {
-	id    string
-	infos []interface{}
-	err   error
+	entryName string
+	infos     []interface{}
+	err       error
 }
 
 // GetCommitsInfo takes advantages of concurrey to speed up getting information
@@ -128,7 +128,7 @@ func (tes Entries) GetCommitsInfo(commit *Commit, treePath string) ([][]interfac
 	for i := range tes {
 		if tes[i].Type != OBJECT_COMMIT {
 			go func(i int) {
-				cinfo := commitInfo{id: tes[i].ID.String()}
+				cinfo := commitInfo{entryName: tes[i].Name()}
 				c, err := commit.GetCommitByPath(filepath.Join(treePath, tes[i].Name()))
 				if err != nil {
 					cinfo.err = fmt.Errorf("GetCommitByPath (%s/%s): %v", treePath, tes[i].Name(), err)
@@ -142,7 +142,7 @@ func (tes Entries) GetCommitsInfo(commit *Commit, treePath string) ([][]interfac
 
 		// Handle submodule
 		go func(i int) {
-			cinfo := commitInfo{id: tes[i].ID.String()}
+			cinfo := commitInfo{entryName: tes[i].Name()}
 			sm, err := commit.GetSubModule(path.Join(treePath, tes[i].Name()))
 			if err != nil {
 				cinfo.err = fmt.Errorf("GetSubModule (%s/%s): %v", treePath, tes[i].Name(), err)
@@ -171,7 +171,7 @@ func (tes Entries) GetCommitsInfo(commit *Commit, treePath string) ([][]interfac
 			return nil, info.err
 		}
 
-		infoMap[info.id] = info.infos
+		infoMap[info.entryName] = info.infos
 		i++
 		if i == len(tes) {
 			break
@@ -180,7 +180,7 @@ func (tes Entries) GetCommitsInfo(commit *Commit, treePath string) ([][]interfac
 
 	commitsInfo := make([][]interface{}, len(tes))
 	for i := 0; i < len(tes); i++ {
-		commitsInfo[i] = infoMap[tes[i].ID.String()]
+		commitsInfo[i] = infoMap[tes[i].Name()]
 	}
 	return commitsInfo, nil
 }