Uses git rev-list when no rename follow

Author: Chi-Iroh

modules/git/commit.go

@@ -173,7 +173,15 @@ type CommitsCountOptions struct {
 
 // CommitsCount returns number of total commits of until given revision.
 func CommitsCount(ctx context.Context, opts CommitsCountOptions) (int64, error) {
-	cmd := NewCommand("--no-pager", "log", "--pretty=format:%H")
+	var cmd *Command
+	cmd = nil
+	followRename := len(opts.RelPath) > 0 && opts.FollowRename
+
+	if followRename {
+		cmd = NewCommand("--no-pager", "log", "--pretty=format:%H")
+	} else {
+		cmd = NewCommand("rev-list", "--count")
+	}
 
 	cmd.AddDynamicArguments(opts.Revision...)
 
@@ -192,7 +200,11 @@ func CommitsCount(ctx context.Context, opts CommitsCountOptions) (int64, error)
 	if err != nil {
 		return 0, err
 	}
-	return int64(len(strings.Split(stdout, "\n"))), nil
+	if followRename {
+		return int64(len(strings.Split(stdout, "\n"))), nil
+	} else {
+		return strconv.ParseInt(strings.TrimSpace(stdout), 10, 64)
+	}
 }
 
 // CommitsCount returns number of total commits of until current revision.

modules/git/repo_commit.go

@@ -239,13 +239,18 @@ func (repo *Repository) CommitsByFileAndRange(opts CommitsByFileAndRangeOptions)
 	}()
 	go func() {
 		stderr := strings.Builder{}
-		gitCmd := NewCommand("--no-pager", "log").
-			AddOptionFormat("--pretty=format:%%H").
-			AddOptionFormat("--max-count=%d", setting.Git.CommitsRangeSize).
-			AddOptionFormat("--skip=%d", (opts.Page-1)*setting.Git.CommitsRangeSize)
-		if opts.FollowRename {
-			gitCmd.AddOptionValues("--follow")
+		var gitCmd *Command
+
+		if !opts.FollowRename {
+			gitCmd = NewCommand("rev-list")
+		} else {
+			gitCmd = NewCommand("--no-pager", "log").
+				AddOptionFormat("--pretty=format:%%H").
+				AddOptionFormat("--follow")
 		}
+		gitCmd.AddOptionFormat("--max-count=%d", setting.Git.CommitsRangeSize).
+			AddOptionFormat("--skip=%d", (opts.Page-1)*setting.Git.CommitsRangeSize)
+
 		gitCmd.AddDynamicArguments(opts.Revision)
 
 		if opts.Not != "" {
@@ -264,7 +269,8 @@ func (repo *Repository) CommitsByFileAndRange(opts CommitsByFileAndRangeOptions)
 			Stdout: stdoutWriter,
 			Stderr: &stderr,
 		})
-		if err != nil && err != io.ErrUnexpectedEOF {
+
+		if err != nil && !(opts.FollowRename && err == io.ErrUnexpectedEOF) {
 			_ = stdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String()))
 		} else {
 			_ = stdoutWriter.Close()
@@ -281,7 +287,7 @@ func (repo *Repository) CommitsByFileAndRange(opts CommitsByFileAndRangeOptions)
 	shaline := make([]byte, length+1)
 	for {
 		n, err := io.ReadFull(stdoutReader, shaline)
-		if (err != nil && err != io.ErrUnexpectedEOF) || n < length {
+		if (err != nil && !(opts.FollowRename && err == io.ErrUnexpectedEOF)) || n < length {
 			if err == io.EOF {
 				err = nil
 			}