From 00a2bb65143a328ce61fa59935ba32e56f7f8bf2 Mon Sep 17 00:00:00 2001 From: Iristyle Date: Tue, 25 Jan 2011 10:07:52 -0500 Subject: [PATCH] bugfix - when a TFS user is record in the logs but is no longer a registered TFS user, then GetIdentity returns null --- GitTfs/Core/TfsChangeset.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/GitTfs/Core/TfsChangeset.cs b/GitTfs/Core/TfsChangeset.cs index c8cc63ad..31dc0eb2 100644 --- a/GitTfs/Core/TfsChangeset.cs +++ b/GitTfs/Core/TfsChangeset.cs @@ -193,11 +193,11 @@ namespace Sep.Git.Tfs.Core } private LogEntry MakeNewLogEntry(IChangeset changesetToLog) - { + { var log = new LogEntry(); - var identity = tfs.GetIdentity(changesetToLog.Committer); - log.CommitterName = log.AuthorName = identity.DisplayName ?? "Unknown TFS user"; - log.CommitterEmail = log.AuthorEmail = identity.MailAddress ?? changesetToLog.Committer; + var identity = tfs.GetIdentity(changesetToLog.Committer); + log.CommitterName = log.AuthorName = null != identity ? identity.DisplayName ?? "Unknown TFS user" : changesetToLog.Committer ?? "Unknown TFS user"; + log.CommitterEmail = log.AuthorEmail = null != identity ? identity.MailAddress ?? changesetToLog.Committer : changesetToLog.Committer; log.Date = changesetToLog.CreationDate; log.Log = changesetToLog.Comment + Environment.NewLine; log.ChangesetId = changesetToLog.ChangesetId;