check EmptySHA in GetFilesChangedSinceCommit

Author: Zettat123

modules/actions/workflows.go

@@ -255,15 +255,7 @@ func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobpa
 				matchTimes++
 			}
 		case "paths":
-			var (
-				filesChanged []string
-				err          error
-			)
-			if pushPayload.Before != git.EmptySHA {
-				filesChanged, err = commit.GetFilesChangedSinceCommit(pushPayload.Before)
-			} else {
-				filesChanged, err = commit.GetFilesChanged()
-			}
+			filesChanged, err := commit.GetFilesChangedSinceCommit(pushPayload.Before)
 			if err != nil {
 				log.Error("GetFilesChanged [commit_sha1: %s]: %v", commit.ID.String(), err)
 			} else {
@@ -276,15 +268,7 @@ func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobpa
 				}
 			}
 		case "paths-ignore":
-			var (
-				filesChanged []string
-				err          error
-			)
-			if pushPayload.Before != git.EmptySHA {
-				filesChanged, err = commit.GetFilesChangedSinceCommit(pushPayload.Before)
-			} else {
-				filesChanged, err = commit.GetFilesChanged()
-			}
+			filesChanged, err := commit.GetFilesChangedSinceCommit(pushPayload.Before)
 			if err != nil {
 				log.Error("GetFilesChanged [commit_sha1: %s]: %v", commit.ID.String(), err)
 			} else {

modules/git/commit.go

@@ -302,12 +302,15 @@ 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)
+	return c.repo.GetCommitFilesChanged(c.ID.String())
 }
 
 // FileChangedSinceCommit Returns true if the file given has changed since the the past commit

modules/git/repo_compare.go

@@ -296,17 +296,22 @@ func (repo *Repository) GetFilesChangedBetween(base, head string) ([]string, err
 }
 
 // GetCommitFilesChanged get the changed file names of the specified commit
-func (repo *Repository) GetCommitFilesChanged(commit *Commit) ([]string, error) {
-	var (
-		stdout string
-		err    error
-	)
+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(commit.ID.String()).RunStdString(&RunOpts{Dir: repo.Path})
+		stdout, _, err = NewCommand(repo.Ctx, "ls-tree", "--name-only", "-r").AddDynamicArguments(commitID).RunStdString(&RunOpts{Dir: repo.Path})
 	} else {
-		stdout, _, err = NewCommand(repo.Ctx, "diff-tree", "--no-commit-id", "--name-only", "-r").AddDynamicArguments(commit.ID.String()).RunStdString(&RunOpts{Dir: repo.Path})
+		stdout, _, err = NewCommand(repo.Ctx, "diff-tree", "--no-commit-id", "--name-only", "-r").AddDynamicArguments(commitID).RunStdString(&RunOpts{Dir: repo.Path})
 	}
 	if err != nil {
 		return nil, err

modules/git/repo_compare_test.go

@@ -149,11 +149,7 @@ func TestGetCommitFilesChanged(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		id, err := repo.ConvertToSHA1(tc.CommitID)
-		assert.NoError(t, err)
-		commit, err := repo.getCommit(id)
-		assert.NoError(t, err)
-		changedFiles, err := repo.GetCommitFilesChanged(commit)
+		changedFiles, err := repo.GetCommitFilesChanged(tc.CommitID)
 		assert.NoError(t, err)
 		assert.ElementsMatch(t, changedFiles, tc.ExpectedFiles)
 	}