fix follow not working

Author: christso

GitContentSearch/GitContentSearcher.cs

@@ -185,12 +185,13 @@ public void SearchContentByDate(string filePath, string searchString, DateTime?
 				_logger.WriteLine(""); // Empty line
 			}
 
-			// Get commits for the specified date range
+			// Get commits for the specified date range, following renames
 			var commits = _gitHelper.GetGitCommitsByDate(startDate, endDate, filePath, cancellationToken);
 			commits.Reverse(); // Reverse to get chronological order
 
 			if (commits.Count == 0)
 			{
+				_logger.WriteLine("No commits found containing the specified file within the given date range.");
 				_progress?.Report(1.0);
 				return;
 			}

GitContentSearch/GitHelper.cs

@@ -143,15 +143,19 @@ private List<Commit> GetCommitsWithFollow(string filePath, CancellationToken can
 				return new List<Commit>();
 			}
 
-			var commitLines = result.StandardOutput
-							 .Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)
-							 .ToArray();
+			return ParseGitLogWithNameStatus(result.StandardOutput, filePath, cancellationToken);
+		}
+
+		private List<Commit> ParseGitLogWithNameStatus(string gitLogOutput, string originalFilePath, CancellationToken cancellationToken)
+		{
+			var commitLines = gitLogOutput.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)
+								 .ToArray();
 
 			var commits = new List<Commit>();
 			var processedCommits = new HashSet<string>(); // Track processed commits to avoid duplicates
 			string? currentCommitHash = null;
 			string? currentFilePath = null;
-			string? previousFilePath = filePath;
+			string? previousFilePath = originalFilePath;
 
 			foreach (var line in commitLines)
 			{
@@ -371,26 +375,43 @@ public List<Commit> GetGitCommitsByDate(DateTime? startDate, DateTime? endDate,
 			var filePathArg = string.IsNullOrEmpty(filePath) ? string.Empty : $"-- {FormatFilePathForGit(filePath)}";
 			var startDateArg = startDate.HasValue ? $"--since=\"{startDate.Value:yyyy-MM-dd}\"" : string.Empty;
 			var endDateArg = endDate.HasValue ? $"--until=\"{endDate.Value:yyyy-MM-dd}\"" : string.Empty;
-			var arguments = $"log --pretty=format:%H {startDateArg} {endDateArg} {filePathArg}".Trim();
 
-			var result = RunGitCommand(arguments, null, cancellationToken);
-			if (result == null || result.ExitCode != 0)
+			if (_follow && !string.IsNullOrEmpty(filePath))
 			{
-				_logger?.WriteLine($"Error retrieving git commits: {result?.StandardError}");
-				return new List<Commit>();
+				// When following file renames, we need to use --name-status to track the file path changes
+				var arguments = $"log --name-status --pretty=format:%H --follow {startDateArg} {endDateArg} {filePathArg}".Trim();
+				var result = RunGitCommand(arguments, null, cancellationToken);
+				if (result == null || result.ExitCode != 0)
+				{
+					_logger?.WriteLine($"Error retrieving git commits: {result?.StandardError}");
+					return new List<Commit>();
+				}
+
+				return ParseGitLogWithNameStatus(result.StandardOutput, filePath, cancellationToken);
 			}
+			else
+			{
+				// When not following renames, use the simpler log command
+				var arguments = $"log --pretty=format:%H {startDateArg} {endDateArg} {filePathArg}".Trim();
+				var result = RunGitCommand(arguments, null, cancellationToken);
+				if (result == null || result.ExitCode != 0)
+				{
+					_logger?.WriteLine($"Error retrieving git commits: {result?.StandardError}");
+					return new List<Commit>();
+				}
 
-			var commits = result.StandardOutput
-							 .Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)
-							 .Select(x => new Commit(x, filePath))
-							 .ToList();
+				var commits = result.StandardOutput
+								 .Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)
+								 .Select(x => new Commit(x, filePath))
+								 .ToList();
 
-			if (!commits.Any())
-			{
-				_logger?.WriteLine($"No commits found between {startDate?.ToString("yyyy-MM-dd") ?? "repository start"} and {endDate?.ToString("yyyy-MM-dd") ?? "repository end"}");
-			}
+				if (!commits.Any())
+				{
+					_logger?.WriteLine($"No commits found between {startDate?.ToString("yyyy-MM-dd") ?? "repository start"} and {endDate?.ToString("yyyy-MM-dd") ?? "repository end"}");
+				}
 
-			return commits;
+				return commits;
+			}
 		}
 
 		private void EnsureRepositoryInitialized()

GitContentSearch/Program.cs

@@ -145,12 +145,13 @@ static void Main(string[] args)
 				var gitContentSearcher = new GitContentSearcher(gitHelper, fileSearcher, fileManager, logger);
 
 				// If both commit-based and date-based options are provided, prioritize commit-based
-				if (!string.IsNullOrEmpty(earliestCommit) || !string.IsNullOrEmpty(latestCommit))
+				if (!startDate.HasValue && !endDate.HasValue)
 				{
-					if (startDate.HasValue || endDate.HasValue)
+					if (!string.IsNullOrEmpty(earliestCommit) || !string.IsNullOrEmpty(latestCommit))
 					{
 						logger.WriteLine("Warning: Both commit-based and date-based options provided. Using commit-based options.");
 					}
+						
 					gitContentSearcher.SearchContent(filePath, searchString, earliestCommit, latestCommit);
 				}
 				else