fix

Author: wxiaoguang

modules/git/commit.go

@@ -302,17 +302,9 @@ func (c *Commit) SearchCommits(opts SearchCommitsOptions) ([]*Commit, error) {
 
 // GetFilesChangedSinceCommit get all changed file names between pastCommit to current revision
 func (c *Commit) GetFilesChangedSinceCommit(pastCommit string) ([]string, error) {
-	if pastCommit == EmptySHA {
-		return c.GetFilesChanged()
-	}
 	return c.repo.GetFilesChangedBetween(pastCommit, c.ID.String())
 }
 
-// GetFilesChanged get the changed file names of the commit
-func (c *Commit) GetFilesChanged() ([]string, error) {
-	return c.repo.GetCommitFilesChanged(c.ID.String())
-}
-
 // FileChangedSinceCommit Returns true if the file given has changed since the the past commit
 // YOU MUST ENSURE THAT pastCommit is a valid commit ID.
 func (c *Commit) FileChangedSinceCommit(filename, pastCommit string) (bool, error) {

modules/git/repo_compare.go

@@ -280,43 +280,19 @@ func (repo *Repository) GetPatch(base, head string, w io.Writer) error {
 }
 
 // GetFilesChangedBetween returns a list of all files that have been changed between the given commits
+// If base is undefined empty SHA (zeros), it only returns the files changed in the head commit
 func (repo *Repository) GetFilesChangedBetween(base, head string) ([]string, error) {
-	stdout, _, err := NewCommand(repo.Ctx, "diff", "--name-only", "-z").AddDynamicArguments(base + ".." + head).RunStdString(&RunOpts{Dir: repo.Path})
-	if err != nil {
-		return nil, err
-	}
-	split := strings.Split(stdout, "\000")
-
-	// Because Git will always emit filenames with a terminal NUL ignore the last entry in the split - which will always be empty.
-	if len(split) > 0 {
-		split = split[:len(split)-1]
-	}
-
-	return split, err
-}
-
-// GetCommitFilesChanged get the changed file names of the specified commit
-func (repo *Repository) GetCommitFilesChanged(commitID string) ([]string, error) {
-	id, err := repo.ConvertToSHA1(commitID)
-	if err != nil {
-		return nil, err
-	}
-	commit, err := repo.getCommit(id)
-	if err != nil {
-		return nil, err
-	}
 	var stdout string
-	if len(commit.Parents) == 0 {
-		// if the commit is the root commit, diff-tree cannot show the changed files
-		// we need to use ls-tree in this case
-		stdout, _, err = NewCommand(repo.Ctx, "ls-tree", "--name-only", "-r").AddDynamicArguments(commitID).RunStdString(&RunOpts{Dir: repo.Path})
+	var err error
+	if base == EmptySHA {
+		stdout, _, err = NewCommand(repo.Ctx, "diff-tree", "--name-only", "--root", "--no-commit-id", "-r", "-z").AddDynamicArguments(head).RunStdString(&RunOpts{Dir: repo.Path})
 	} else {
-		stdout, _, err = NewCommand(repo.Ctx, "diff-tree", "--no-commit-id", "--name-only", "-r").AddDynamicArguments(commitID).RunStdString(&RunOpts{Dir: repo.Path})
+		stdout, _, err = NewCommand(repo.Ctx, "diff", "--name-only", "-z").AddDynamicArguments(base + ".." + head).RunStdString(&RunOpts{Dir: repo.Path})
 	}
 	if err != nil {
 		return nil, err
 	}
-	split := strings.Split(stdout, "\n")
+	split := strings.Split(stdout, "\000")
 
 	// Because Git will always emit filenames with a terminal NUL ignore the last entry in the split - which will always be empty.
 	if len(split) > 0 {

modules/git/repo_compare_test.go

@@ -122,35 +122,34 @@ func TestReadWritePullHead(t *testing.T) {
 
 func TestGetCommitFilesChanged(t *testing.T) {
 	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
-	clonedPath, err := cloneRepo(t, bareRepo1Path)
-	if err != nil {
-		assert.NoError(t, err)
-		return
-	}
-	repo, err := openRepositoryWithDefaultContext(clonedPath)
-	if err != nil {
-		assert.NoError(t, err)
-		return
-	}
+	repo, err := openRepositoryWithDefaultContext(bareRepo1Path)
+	assert.NoError(t, err)
 	defer repo.Close()
 
 	testCases := []struct {
-		CommitID      string
-		ExpectedFiles []string
+		base, head string
+		files      []string
 	}{
 		{
+			EmptySHA,
 			"95bb4d39648ee7e325106df01a621c530863a653",
 			[]string{"file1.txt"},
 		},
 		{
+			EmptySHA,
 			"8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2",
 			[]string{"file2.txt"},
 		},
+		{
+			EmptyTreeSHA,
+			"8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2",
+			[]string{"file1.txt", "file2.txt"},
+		},
 	}
 
 	for _, tc := range testCases {
-		changedFiles, err := repo.GetCommitFilesChanged(tc.CommitID)
+		changedFiles, err := repo.GetFilesChangedBetween(tc.base, tc.head)
 		assert.NoError(t, err)
-		assert.ElementsMatch(t, changedFiles, tc.ExpectedFiles)
+		assert.ElementsMatch(t, tc.files, changedFiles)
 	}
 }

modules/git/sha1.go

@@ -11,10 +11,10 @@ import (
 	"strings"
 )
 
-// EmptySHA defines empty git SHA
+// EmptySHA defines empty git SHA (undefined, non-existent)
 const EmptySHA = "0000000000000000000000000000000000000000"
 
-// EmptyTreeSHA is the SHA of an empty tree
+// EmptyTreeSHA is the SHA of an empty tree, the root of all git repositories
 const EmptyTreeSHA = "4b825dc642cb6eb9a060e54bf8d69288fbee4904"
 
 // SHAFullLength is the full length of a git SHA