Fix merge mistakes

Author: Chi-Iroh

modules/git/repo_commit.go

@@ -251,8 +251,16 @@ func (repo *Repository) CommitsByFileAndRange(opts CommitsByFileAndRangeOptions)
 	}()
 	go func() {
 		stderr := strings.Builder{}
-		gitCmd := gitcmd.NewCommand("rev-list").
-			AddOptionFormat("--max-count=%d", setting.Git.CommitsRangeSize).
+		var gitCmd *gitcmd.Command
+
+		if !opts.FollowRename {
+			gitCmd = gitcmd.NewCommand("rev-list")
+		} else {
+			gitCmd = gitcmd.NewCommand("--no-pager", "log").
+				AddOptionFormat("--pretty=tformat:%%H").
+				AddOptionFormat("--follow")
+		}
+		gitCmd = gitCmd.AddOptionFormat("--max-count=%d", setting.Git.CommitsRangeSize).
 			AddOptionFormat("--skip=%d", (opts.Page-1)*setting.Git.CommitsRangeSize)
 
 		gitCmd.AddDynamicArguments(opts.Revision)

web_src/js/index-domready.ts

@@ -22,7 +22,7 @@ import {initMarkupContent} from './markup/content.ts';
 import {initRepoFileView} from './features/file-view.ts';
 import {initUserAuthOauth2, initUserCheckAppUrl} from './features/user-auth.ts';
 import {initRepoPullRequestAllowMaintainerEdit, initRepoPullRequestReview, initRepoIssueSidebarDependency, initRepoIssueFilterItemLabel} from './features/repo-issue.ts';
-import {initRepoEllipsisButton, initCommitStatuses} from './features/repo-commit.ts';
+import {initRepoEllipsisButton, initCommitStatuses, initCommitFileHistoryFollowRename} from './features/repo-commit.ts';
 import {initRepoTopicBar} from './features/repo-home.ts';
 import {initAdminCommon} from './features/admin/common.ts';
 import {initRepoCodeView} from './features/repo-code.ts';
@@ -147,6 +147,7 @@ const initPerformanceTracer = callInitFunctions([
   initRepoRecentCommits,
 
   initCommitStatuses,
+  initCommitFileHistoryFollowRename,
   initCaptcha,
 
   initUserCheckAppUrl,