diff options
Diffstat (limited to 'plugins/git4idea/src/git4idea/reset/GitNewResetDialog.java')
-rw-r--r-- | plugins/git4idea/src/git4idea/reset/GitNewResetDialog.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/git4idea/src/git4idea/reset/GitNewResetDialog.java b/plugins/git4idea/src/git4idea/reset/GitNewResetDialog.java index 5e2cb18e7c7e..58363b917992 100644 --- a/plugins/git4idea/src/git4idea/reset/GitNewResetDialog.java +++ b/plugins/git4idea/src/git4idea/reset/GitNewResetDialog.java @@ -15,6 +15,7 @@ */ package git4idea.reset; +import com.intellij.dvcs.DvcsUtil; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; @@ -26,7 +27,6 @@ import com.intellij.util.ui.RadioButtonEnumModel; import com.intellij.util.ui.UIUtil; import com.intellij.vcs.log.VcsFullCommitDetails; import com.intellij.xml.util.XmlStringUtil; -import git4idea.GitUtil; import git4idea.repo.GitRepository; import git4idea.repo.GitRepositoryManager; import org.jetbrains.annotations.NotNull; @@ -117,7 +117,7 @@ public class GitNewResetDialog extends DialogWrapper { @NotNull private static String getTargetText(@NotNull VcsFullCommitDetails commit) { - String commitMessage = StringUtil.shortenTextWithEllipsis(commit.getSubject(), 20, 0); + String commitMessage = StringUtil.escapeXml(StringUtil.shortenTextWithEllipsis(commit.getSubject(), 20, 0)); return String.format("<code><b>%s</b> \"%s\"</code> by <code>%s</code>", commit.getId().toShortString(), commitMessage, commit.getAuthor().getName()); } @@ -127,7 +127,7 @@ public class GitNewResetDialog extends DialogWrapper { String currentRevision = repository.getCurrentRevision(); assert currentRevision != null; String text = repository.getCurrentBranch() == null ? - "HEAD (" + GitUtil.getShortHash(currentRevision) + ")" : + "HEAD (" + DvcsUtil.getShortHash(currentRevision) + ")" : repository.getCurrentBranch().getName(); return "<b>" + text + "</b>"; } |