public IList<GitItemStatus> GetCombinedDiffFileList(string shaOfMergeCommit)
{
var fileList = RunGitCmd("diff-tree --name-only -z --cc --no-commit-id " + shaOfMergeCommit);
var ret = new List<GitItemStatus>();
if (string.IsNullOrWhiteSpace(fileList))
{
return ret;
}
var files = fileList.Split(new[] { '\0' }, StringSplitOptions.RemoveEmptyEntries);
foreach (var file in files)
{
var item = new GitItemStatus
{
IsChanged = true,
IsConflict = true,
IsTracked = true,
IsDeleted = false,
IsStaged = false,
IsNew = false,
Name = file,
};
ret.Add(item);
}
return ret;
}