diff --git a/GitTfs/Core/GitRepository.cs b/GitTfs/Core/GitRepository.cs index f5de33dc..3c8248f0 100644 --- a/GitTfs/Core/GitRepository.cs +++ b/GitTfs/Core/GitRepository.cs @@ -663,9 +663,17 @@ namespace Sep.Git.Tfs.Core public IEnumerable FindParentCommits(string @from, string to) { - return _repository.Commits.QueryBy( + var commits = _repository.Commits.QueryBy( new CommitFilter() {Since = @from, Until = to, SortBy = CommitSortStrategies.Reverse, FirstParentOnly = true}) .Select(c=>new GitCommit(c)); + var parent = to; + foreach (var gitCommit in commits) + { + if(!gitCommit.Parents.Any(c=>c.Sha == parent)) + return new List(); + parent = gitCommit.Sha; + } + return commits; } } }