Skip to content

Return all changes to a file when using Repository.Commits.QueryBy(path) #1753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Return all changes to a file when using Repository.Commits.QueryBy(path) #1753

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 13 additions & 20 deletions LibGit2Sharp/Core/FileHistory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,34 +120,27 @@ private static IEnumerable<LogEntry> FullHistory(IRepository repo, string path,
var currentPath = map.Keys.Count > 0 ? map[currentCommit] : path;
var currentTreeEntry = currentCommit.Tree[currentPath];

if (currentTreeEntry == null)
{
yield break;
}

var parentCount = currentCommit.Parents.Count();
if (parentCount == 0)
if (parentCount == 0 && currentTreeEntry != null)
{
yield return new LogEntry { Path = currentPath, Commit = currentCommit };
}
else
{
DetermineParentPaths(repo, currentCommit, currentPath, map);

if (parentCount != 1)
{
continue;
}

var parentCommit = currentCommit.Parents.Single();
var parentPath = map[parentCommit];
var parentTreeEntry = parentCommit.Tree[parentPath];

if (parentTreeEntry == null ||
parentTreeEntry.Target.Id != currentTreeEntry.Target.Id ||
parentPath != currentPath)
{
yield return new LogEntry { Path = currentPath, Commit = currentCommit };
foreach(var parentCommit in currentCommit.Parents)
{
var parentPath = map[parentCommit];
var parentTreeEntry = parentCommit.Tree[parentPath];

if (currentTreeEntry != null &&
(parentTreeEntry == null ||
parentTreeEntry.Target.Id != currentTreeEntry.Target.Id ||
parentPath != currentPath))
{
yield return new LogEntry { Path = currentPath, Commit = currentCommit };
}
}
}
}
Expand Down